modularize-extcmd
changeset 26 65d81aec6691
parent 24 7bb7fb2c1822
child 29 335662766a88
--- a/modularize-extcmd	Tue May 01 02:07:34 2012 +0300
+++ b/modularize-extcmd	Tue May 01 02:09:34 2012 +0300
@@ -1,6 +1,6 @@
-diff -r fb4288983f04 mcabber/configure.ac
---- a/mcabber/configure.ac	Sun Jul 17 23:26:30 2011 +0300
-+++ b/mcabber/configure.ac	Sun Jul 17 23:26:31 2011 +0300
+diff -r 27d19b6bc194 mcabber/configure.ac
+--- a/mcabber/configure.ac	Mon Apr 30 23:36:55 2012 +0300
++++ b/mcabber/configure.ac	Mon Apr 30 23:37:25 2012 +0300
 @@ -283,6 +283,7 @@
                   modules/beep/Makefile
                   modules/xttitle/Makefile
@@ -9,9 +9,9 @@
                   modules/urlregex/Makefile
                   doc/Makefile
                   doc/guide/Makefile
-diff -r fb4288983f04 mcabber/mcabber/Makefile.am
---- a/mcabber/mcabber/Makefile.am	Sun Jul 17 23:26:30 2011 +0300
-+++ b/mcabber/mcabber/Makefile.am	Sun Jul 17 23:26:31 2011 +0300
+diff -r 27d19b6bc194 mcabber/mcabber/Makefile.am
+--- a/mcabber/mcabber/Makefile.am	Mon Apr 30 23:36:55 2012 +0300
++++ b/mcabber/mcabber/Makefile.am	Mon Apr 30 23:37:25 2012 +0300
 @@ -7,7 +7,7 @@
  		  xmpp.c xmpp.h xmpp_helper.c xmpp_helper.h xmpp_defines.h \
  		  xmpp_iq.c xmpp_iq.h xmpp_iqrequest.c xmpp_iqrequest.h \
@@ -30,9 +30,9 @@
  endif
  
  #SUBDIRS =
-diff -r fb4288983f04 mcabber/mcabber/hooks.c
---- a/mcabber/mcabber/hooks.c	Sun Jul 17 23:26:30 2011 +0300
-+++ b/mcabber/mcabber/hooks.c	Sun Jul 17 23:26:31 2011 +0300
+diff -r 27d19b6bc194 mcabber/mcabber/hooks.c
+--- a/mcabber/mcabber/hooks.c	Mon Apr 30 23:36:55 2012 +0300
++++ b/mcabber/mcabber/hooks.c	Mon Apr 30 23:37:25 2012 +0300
 @@ -36,7 +36,10 @@
  #include "utf8.h"
  #include "commands.h"
@@ -55,7 +55,7 @@
    int message_flags = 0;
    guint rtype = ROSTER_TYPE_USER;
    char *wmsg = NULL, *bmsg = NULL, *mmsg = NULL;
-@@ -394,6 +399,7 @@
+@@ -397,6 +402,7 @@
    }
  #endif
  
@@ -63,7 +63,7 @@
    if (settings_opt_get_int("events_ignore_active_window") &&
        current_buddy && scr_get_chatmode()) {
      gpointer bud = BUDDATA(current_buddy);
-@@ -412,6 +418,7 @@
+@@ -415,6 +421,7 @@
      hk_ext_cmd(bjid, EXT_CMD_TYPE_MESSAGE,
                 is_groupchat ? EXT_CMD_INFO_GROUPCHAT : EXT_CMD_INFO_RECEIVED,
                 wmsg);
@@ -71,7 +71,7 @@
  
    // Beep, if enabled:
    // - if it's a private message
-@@ -488,8 +495,10 @@
+@@ -491,8 +498,10 @@
    }
  #endif
  
@@ -82,7 +82,7 @@
  
    g_free(bmsg);
    g_free(mmsg);
-@@ -575,9 +584,11 @@
+@@ -578,9 +587,11 @@
    }
  #endif
  
@@ -94,7 +94,7 @@
  }
  
  void hk_mystatuschange(time_t timestamp, enum imstatus old_status,
-@@ -701,11 +712,13 @@
+@@ -704,11 +715,13 @@
    prev_muc_unread    = muc_unread;
    prev_muc_attention = muc_attention;
  
@@ -108,9 +108,9 @@
  }
  
  //  hk_presence_subscription_request(jid, message)
-diff -r fb4288983f04 mcabber/mcabber/main.c
---- a/mcabber/mcabber/main.c	Sun Jul 17 23:26:30 2011 +0300
-+++ b/mcabber/mcabber/main.c	Sun Jul 17 23:26:31 2011 +0300
+diff -r 27d19b6bc194 mcabber/mcabber/main.c
+--- a/mcabber/mcabber/main.c	Mon Apr 30 23:36:55 2012 +0300
++++ b/mcabber/mcabber/main.c	Mon Apr 30 23:37:25 2012 +0300
 @@ -44,7 +44,10 @@
  #include "xmpp.h"
  #include "help.h"
@@ -135,15 +135,15 @@
  
    optstring = settings_opt_get("roster_display_filter");
    if (optstring)
-diff -r fb4288983f04 mcabber/modules/Makefile.am
---- a/mcabber/modules/Makefile.am	Sun Jul 17 23:26:30 2011 +0300
-+++ b/mcabber/modules/Makefile.am	Sun Jul 17 23:26:31 2011 +0300
+diff -r 27d19b6bc194 mcabber/modules/Makefile.am
+--- a/mcabber/modules/Makefile.am	Mon Apr 30 23:36:55 2012 +0300
++++ b/mcabber/modules/Makefile.am	Mon Apr 30 23:37:25 2012 +0300
 @@ -1,1 +1,1 @@
 -SUBDIRS = beep xttitle fifo urlregex
 +SUBDIRS = beep xttitle fifo eventcmd urlregex
-diff -r fb4288983f04 mcabber/modules/eventcmd/Makefile.am
+diff -r 27d19b6bc194 mcabber/modules/eventcmd/Makefile.am
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/mcabber/modules/eventcmd/Makefile.am	Sun Jul 17 23:26:31 2011 +0300
++++ b/mcabber/modules/eventcmd/Makefile.am	Mon Apr 30 23:37:25 2012 +0300
 @@ -0,0 +1,12 @@
 +
 +if INSTALL_HEADERS
@@ -157,9 +157,9 @@
 +				$(ENCHANT_CFLAGS)
 +endif
 +
-diff -r fb4288983f04 mcabber/modules/eventcmd/eventcmd.c
+diff -r 27d19b6bc194 mcabber/modules/eventcmd/eventcmd.c
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/mcabber/modules/eventcmd/eventcmd.c	Sun Jul 17 23:26:31 2011 +0300
++++ b/mcabber/modules/eventcmd/eventcmd.c	Mon Apr 30 23:37:25 2012 +0300
 @@ -0,0 +1,221 @@
 +
 +/* Copyright 2009 Myhailo Danylenko