modularize-extcmd.diff
changeset 92 66f7e2aa040c
parent 88 0a87df8ad9c1
--- a/modularize-extcmd.diff	Fri Mar 04 15:57:04 2016 +0200
+++ b/modularize-extcmd.diff	Fri Dec 09 02:12:34 2016 +0200
@@ -1,11 +1,11 @@
 # HG changeset patch
-# Parent  d4d77c56d8da7c9771579efe469440eb25947271
+# Parent  86cf5edde8624b3992557f29b5576388a57965ab
 Convert extcmd into a module
 
-diff -r d4d77c56d8da mcabber/configure.ac
---- a/mcabber/configure.ac	Sat Nov 07 17:28:17 2015 +0200
-+++ b/mcabber/configure.ac	Sat Nov 07 17:38:46 2015 +0200
-@@ -295,6 +295,7 @@
+diff -r 86cf5edde862 mcabber/configure.ac
+--- a/mcabber/configure.ac	Fri Dec 09 01:38:29 2016 +0200
++++ b/mcabber/configure.ac	Fri Dec 09 01:48:48 2016 +0200
+@@ -308,6 +308,7 @@
                   modules/beep/Makefile
                   modules/xttitle/Makefile
                   modules/fifo/Makefile
@@ -13,9 +13,9 @@
                   modules/urlregex/Makefile
                   doc/Makefile
                   doc/guide/Makefile
-diff -r d4d77c56d8da mcabber/mcabber/Makefile.am
---- a/mcabber/mcabber/Makefile.am	Sat Nov 07 17:28:17 2015 +0200
-+++ b/mcabber/mcabber/Makefile.am	Sat Nov 07 17:38:46 2015 +0200
+diff -r 86cf5edde862 mcabber/mcabber/Makefile.am
+--- a/mcabber/mcabber/Makefile.am	Fri Dec 09 01:38:29 2016 +0200
++++ b/mcabber/mcabber/Makefile.am	Fri Dec 09 01:48:48 2016 +0200
 @@ -7,8 +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 \
@@ -35,10 +35,10 @@
  endif
  
  #SUBDIRS =
-diff -r d4d77c56d8da mcabber/mcabber/hooks.c
---- a/mcabber/mcabber/hooks.c	Sat Nov 07 17:28:17 2015 +0200
-+++ b/mcabber/mcabber/hooks.c	Sat Nov 07 17:38:46 2015 +0200
-@@ -36,7 +36,10 @@
+diff -r 86cf5edde862 mcabber/mcabber/hooks.c
+--- a/mcabber/mcabber/hooks.c	Fri Dec 09 01:38:29 2016 +0200
++++ b/mcabber/mcabber/hooks.c	Fri Dec 09 01:48:48 2016 +0200
+@@ -34,7 +34,10 @@
  #include "utf8.h"
  #include "commands.h"
  #include "main.h"
@@ -87,7 +87,7 @@
  
    g_free(bmsg);
    g_free(mmsg);
-@@ -587,9 +596,11 @@
+@@ -586,9 +595,11 @@
    }
  #endif
  
@@ -99,7 +99,7 @@
  }
  
  void hk_mystatuschange(time_t timestamp, enum imstatus old_status,
-@@ -711,11 +722,13 @@
+@@ -710,11 +721,13 @@
    prev_muc_unread    = muc_unread;
    prev_muc_attention = muc_attention;
  
@@ -113,10 +113,10 @@
  }
  
  //  hk_presence_subscription_request(jid, message)
-diff -r d4d77c56d8da mcabber/mcabber/main.c
---- a/mcabber/mcabber/main.c	Sat Nov 07 17:28:17 2015 +0200
-+++ b/mcabber/mcabber/main.c	Sat Nov 07 17:38:46 2015 +0200
-@@ -50,9 +50,9 @@
+diff -r 86cf5edde862 mcabber/mcabber/main.c
+--- a/mcabber/mcabber/main.c	Fri Dec 09 01:38:29 2016 +0200
++++ b/mcabber/mcabber/main.c	Fri Dec 09 01:48:48 2016 +0200
+@@ -49,9 +49,9 @@
  #include "help.h"
  #include "events.h"
  #include "compl.h"
@@ -127,7 +127,7 @@
  # include "fifo.h"
  #endif
  
-@@ -509,9 +509,11 @@
+@@ -526,9 +526,11 @@
    }
  #endif
  
@@ -139,15 +139,15 @@
  
    optstring = settings_opt_get("roster_display_filter");
    if (optstring)
-diff -r d4d77c56d8da mcabber/modules/Makefile.am
---- a/mcabber/modules/Makefile.am	Sat Nov 07 17:28:17 2015 +0200
-+++ b/mcabber/modules/Makefile.am	Sat Nov 07 17:38:46 2015 +0200
+diff -r 86cf5edde862 mcabber/modules/Makefile.am
+--- a/mcabber/modules/Makefile.am	Fri Dec 09 01:38:29 2016 +0200
++++ b/mcabber/modules/Makefile.am	Fri Dec 09 01:48:48 2016 +0200
 @@ -1,1 +1,1 @@
 -SUBDIRS = beep xttitle fifo urlregex
 +SUBDIRS = beep xttitle fifo eventcmd urlregex
-diff -r d4d77c56d8da mcabber/modules/eventcmd/Makefile.am
+diff -r 86cf5edde862 mcabber/modules/eventcmd/Makefile.am
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/mcabber/modules/eventcmd/Makefile.am	Sat Nov 07 17:38:46 2015 +0200
++++ b/mcabber/modules/eventcmd/Makefile.am	Fri Dec 09 01:48:48 2016 +0200
 @@ -0,0 +1,13 @@
 +
 +if INSTALL_HEADERS
@@ -162,9 +162,9 @@
 +				$(ENCHANT_CFLAGS)
 +endif
 +
-diff -r d4d77c56d8da mcabber/modules/eventcmd/eventcmd.c
+diff -r 86cf5edde862 mcabber/modules/eventcmd/eventcmd.c
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/mcabber/modules/eventcmd/eventcmd.c	Sat Nov 07 17:38:46 2015 +0200
++++ b/mcabber/modules/eventcmd/eventcmd.c	Fri Dec 09 01:48:48 2016 +0200
 @@ -0,0 +1,221 @@
 +
 +/* Copyright 2009 Myhailo Danylenko