Mercurial Mercurial > mcabber-isbear-patches / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
modularize-extcmd.diff
changeset 88 0a87df8ad9c1
parent 87 78238d26911a
child 92 66f7e2aa040c 
--- a/modularize-extcmd.diff	Wed Nov 12 23:04:36 2014 +0200
+++ b/modularize-extcmd.diff	Sat Nov 07 17:39:49 2015 +0200
@@ -1,8 +1,10 @@
+# HG changeset patch
+# Parent  d4d77c56d8da7c9771579efe469440eb25947271
 Convert extcmd into a module
 
-diff -r 17f90f8dc463 mcabber/configure.ac
---- a/mcabber/configure.ac	Wed Nov 12 22:24:18 2014 +0200
-+++ b/mcabber/configure.ac	Wed Nov 12 22:25:42 2014 +0200
+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 @@
                   modules/beep/Makefile
                   modules/xttitle/Makefile
@@ -11,9 +13,9 @@
                   modules/urlregex/Makefile
                   doc/Makefile
                   doc/guide/Makefile
-diff -r 17f90f8dc463 mcabber/mcabber/Makefile.am
---- a/mcabber/mcabber/Makefile.am	Wed Nov 12 22:24:18 2014 +0200
-+++ b/mcabber/mcabber/Makefile.am	Wed Nov 12 22:25:42 2014 +0200
+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
 @@ -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 \
@@ -33,9 +35,9 @@
  endif
  
  #SUBDIRS =
-diff -r 17f90f8dc463 mcabber/mcabber/hooks.c
---- a/mcabber/mcabber/hooks.c	Wed Nov 12 22:24:18 2014 +0200
-+++ b/mcabber/mcabber/hooks.c	Wed Nov 12 22:25:42 2014 +0200
+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 @@
  #include "utf8.h"
  #include "commands.h"
@@ -58,7 +60,7 @@
    int message_flags = 0;
    guint rtype = ROSTER_TYPE_USER;
    char *wmsg = NULL, *bmsg = NULL, *mmsg = NULL;
-@@ -399,6 +404,7 @@
+@@ -402,6 +407,7 @@
    }
  #endif
  
@@ -66,7 +68,7 @@
    if (settings_opt_get_int("events_ignore_active_window") &&
        current_buddy && scr_get_chatmode()) {
      gpointer bud = BUDDATA(current_buddy);
-@@ -417,6 +423,7 @@
+@@ -420,6 +426,7 @@
      hk_ext_cmd(bjid, EXT_CMD_TYPE_MESSAGE,
                 is_groupchat ? EXT_CMD_INFO_GROUPCHAT : EXT_CMD_INFO_RECEIVED,
                 wmsg);
@@ -74,7 +76,7 @@
  
    // Beep, if enabled:
    // - if it's a private message
-@@ -493,8 +500,10 @@
+@@ -500,8 +507,10 @@
    }
  #endif
  
@@ -85,7 +87,7 @@
  
    g_free(bmsg);
    g_free(mmsg);
-@@ -580,9 +589,11 @@
+@@ -587,9 +596,11 @@
    }
  #endif
  
@@ -97,7 +99,7 @@
  }
  
  void hk_mystatuschange(time_t timestamp, enum imstatus old_status,
-@@ -704,11 +715,13 @@
+@@ -711,11 +722,13 @@
    prev_muc_unread    = muc_unread;
    prev_muc_attention = muc_attention;
  
@@ -111,10 +113,10 @@
  }
  
  //  hk_presence_subscription_request(jid, message)
-diff -r 17f90f8dc463 mcabber/mcabber/main.c
---- a/mcabber/mcabber/main.c	Wed Nov 12 22:24:18 2014 +0200
-+++ b/mcabber/mcabber/main.c	Wed Nov 12 22:25:42 2014 +0200
-@@ -49,9 +49,9 @@
+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 @@
  #include "help.h"
  #include "events.h"
  #include "compl.h"
@@ -125,7 +127,7 @@
  # include "fifo.h"
  #endif
  
-@@ -436,9 +436,11 @@
+@@ -509,9 +509,11 @@
    }
  #endif
  
@@ -137,20 +139,20 @@
  
    optstring = settings_opt_get("roster_display_filter");
    if (optstring)
-diff -r 17f90f8dc463 mcabber/modules/Makefile.am
---- a/mcabber/modules/Makefile.am	Wed Nov 12 22:24:18 2014 +0200
-+++ b/mcabber/modules/Makefile.am	Wed Nov 12 22:25:42 2014 +0200
+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
 @@ -1,1 +1,1 @@
 -SUBDIRS = beep xttitle fifo urlregex
 +SUBDIRS = beep xttitle fifo eventcmd urlregex
-diff -r 17f90f8dc463 mcabber/modules/eventcmd/Makefile.am
+diff -r d4d77c56d8da mcabber/modules/eventcmd/Makefile.am
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/mcabber/modules/eventcmd/Makefile.am	Wed Nov 12 22:25:42 2014 +0200
++++ b/mcabber/modules/eventcmd/Makefile.am	Sat Nov 07 17:38:46 2015 +0200
 @@ -0,0 +1,13 @@
 +
 +if INSTALL_HEADERS
 +pkglib_LTLIBRARIES = libeventcmd.la
-+libeventcmd_la_SOURCES = eventcmd.c $(top_srcdir)/mcabber/extcmd.c $(top_srcdir)/mcabber/extcmd.h
++libeventcmd_la_SOURCES = eventcmd.c ../mcabber/extcmd.c ../mcabber/extcmd.h
 +libeventcmd_la_LDFLAGS = -module -avoid-version -shared
 +
 +LDADD = $(GLIB_LIBS)
@@ -160,9 +162,9 @@
 +				$(ENCHANT_CFLAGS)
 +endif
 +
-diff -r 17f90f8dc463 mcabber/modules/eventcmd/eventcmd.c
+diff -r d4d77c56d8da mcabber/modules/eventcmd/eventcmd.c
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/mcabber/modules/eventcmd/eventcmd.c	Wed Nov 12 22:25:42 2014 +0200
++++ b/mcabber/modules/eventcmd/eventcmd.c	Sat Nov 07 17:38:46 2015 +0200
 @@ -0,0 +1,221 @@
 +
 +/* Copyright 2009 Myhailo Danylenko
mcabber-isbear-patches