Mercurial Mercurial > mcabber-isbear-patches / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Push bugfix patches to upstream
authorMyhailo Danylenko <isbear@ukrpost.net>
Sat, 28 Jul 2012 22:38:18 +0300
changeset 37 fbbcfc54d4d3
parent 36 b8854e2fe147
child 38 dfd761c2ef62
Push bugfix patches to upstream
fix-module-messages.diff file | annotate | diff | comparison | revisions
fix-typo.diff file | annotate | diff | comparison | revisions
series file | annotate | diff | comparison | revisions
update-pc.diff file | annotate | diff | comparison | revisions
warning-fixes.diff file | annotate | diff | comparison | revisions 
--- a/fix-module-messages.diff	Sat Jul 28 19:42:13 2012 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,31 +0,0 @@
-# HG changeset patch
-# Parent 8e120e293a253ab7c0cbfb85ac74ab12428cf0f7
-
-diff -r 8e120e293a25 mcabber/mcabber/commands.c
---- a/mcabber/mcabber/commands.c	Sat Jul 28 18:45:45 2012 +0300
-+++ b/mcabber/mcabber/commands.c	Sat Jul 28 19:00:28 2012 +0300
-@@ -3251,16 +3251,18 @@
-         ++name;
-     }
- 
--    if (!strcmp(args[0], "load"))
-+    if (!strcmp(args[0], "load")) {
-       error = module_load(name, TRUE, force);
--    else if (!strcmp(args[0], "unload"))
-+      if (error)
-+        scr_log_print(LPRINT_LOGNORM, "Module '%s' loading error: %s", name, error);
-+    } else if (!strcmp(args[0], "unload")) {
-       error = module_unload(name, TRUE, force);
--    else if (!strcmp(args[0], "info"))
-+      if (error)
-+        scr_log_print(LPRINT_LOGNORM, "Module '%s' unloading error: %s", name, error);
-+    } else if (!strcmp(args[0], "info"))
-       module_info_print(name);
-     else
--      error = "Unknown subcommand";
--    if (error)
--      scr_LogPrint(LPRINT_LOGNORM, "Error: %s.",  error);
-+      scr_log_print(LPRINT_LOGNORM, "Error: module: Unknown subcommand.");
-   }
-   free_arg_lst(args);
- #else
--- a/fix-typo.diff	Sat Jul 28 19:42:13 2012 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,52 +0,0 @@
-# HG changeset patch
-# Parent e9b6e168a45e12200f486929e5786ffd64ac143e
-s/Copyrigth/Copyright/ and so on
-
-diff -r e9b6e168a45e mcabber/mcabber/events.c
---- a/mcabber/mcabber/events.c	Wed Jul 18 00:24:13 2012 +0200
-+++ b/mcabber/mcabber/events.c	Wed Jul 18 08:31:55 2012 +0300
-@@ -2,7 +2,7 @@
-  * events.c     -- Events fonctions
-  *
-  * Copyright (C) 2006-2010 Mikael Berthe <mikael@lilotux.net>
-- * Copyrigth (C) 2010      Myhailo Danylenko <isbear@ukrposte.net>
-+ * Copyright (C) 2010      Myhailo Danylenko <isbear@ukrpost.net>
-  *
-  * This program is free software; you can redistribute it and/or modify
-  * it under the terms of the GNU General Public License as published by
-diff -r e9b6e168a45e mcabber/mcabber/fifo.c
---- a/mcabber/mcabber/fifo.c	Wed Jul 18 00:24:13 2012 +0200
-+++ b/mcabber/mcabber/fifo.c	Wed Jul 18 08:31:55 2012 +0300
-@@ -2,7 +2,7 @@
-  * fifo.c       -- Read commands from a named pipe
-  *
-  * Copyright (C) 2008,2009 Mikael Berthe <mikael@lilotux.net>
-- * Copyrigth (C) 2009      Myhailo Danylenko <isbear@ukrpost.net>
-+ * Copyright (C) 2009      Myhailo Danylenko <isbear@ukrpost.net>
-  *
-  * This program is free software; you can redistribute it and/or modify
-  * it under the terms of the GNU General Public License as published by
-diff -r e9b6e168a45e mcabber/mcabber/help.c
---- a/mcabber/mcabber/help.c	Wed Jul 18 00:24:13 2012 +0200
-+++ b/mcabber/mcabber/help.c	Wed Jul 18 08:31:55 2012 +0300
-@@ -2,7 +2,7 @@
-  * help.c       -- Help command
-  *
-  * Copyright (C) 2006-2010 Mikael Berthe <mikael@lilotux.net>
-- * Copyrigth (C) 2009      Myhailo Danylenko <isbear@ukrpost.net>
-+ * Copyright (C) 2009      Myhailo Danylenko <isbear@ukrpost.net>
-  *
-  * This program is free software; you can redistribute it and/or modify
-  * it under the terms of the GNU General Public License as published by
-diff -r e9b6e168a45e mcabber/mcabber/xmpp_muc.c
---- a/mcabber/mcabber/xmpp_muc.c	Wed Jul 18 00:24:13 2012 +0200
-+++ b/mcabber/mcabber/xmpp_muc.c	Wed Jul 18 08:31:55 2012 +0300
-@@ -3,7 +3,7 @@
-  *
-  * Copyright (C) 2008-2010 Frank Zschockelt <mcabber@freakysoft.de>
-  * Copyright (C) 2005-2010 Mikael Berthe <mikael@lilotux.net>
-- * Copyrigth (C) 2010      Myhailo Danylenko <isbear@ukrposte.net>
-+ * Copyright (C) 2010      Myhailo Danylenko <isbear@ukrpost.net>
-  *
-  * This program is free software; you can redistribute it and/or modify
-  * it under the terms of the GNU General Public License as published by
--- a/series	Sat Jul 28 19:42:13 2012 +0300
+++ b/series	Sat Jul 28 22:38:18 2012 +0300
@@ -1,8 +1,4 @@
-fix-typo.diff
 fix-receipts.diff
-update-pc.diff
-warning-fixes.diff
-fix-module-messages.diff
 switch-to-experimental.diff
 separate-extcmd.diff
 modularize-extcmd.diff
--- a/update-pc.diff	Sat Jul 28 19:42:13 2012 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
-# HG changeset patch
-# Parent ec1520e78aae04d3516b09c694ca6f3c2d4967de
-Make linking with mcabber deps optional
-
-diff -r ec1520e78aae -r 9d2c1bf277e5 mcabber/mcabber.pc.in
---- a/mcabber/mcabber.pc.in	Thu Jul 19 08:01:36 2012 +0300
-+++ b/mcabber/mcabber.pc.in	Thu Jul 19 08:01:53 2012 +0300
-@@ -5,7 +5,8 @@
- 
- Name: MCabber
- Description: Modular XMPP client
--Requires: glib-2.0 gmodule-2.0 loudmouth-1.0
-+URL: http://mcabber.com
-+Requires.private: glib-2.0 gmodule-2.0 loudmouth-1.0
- Version: @VERSION@
- Libs: 
- Cflags: -I${includedir} @LIBOTR_CFLAGS@ @GPGME_CFLAGS@
--- a/warning-fixes.diff	Sat Jul 28 19:42:13 2012 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,41 +0,0 @@
-# HG changeset patch
-# Parent b5ea7efbf1f97502016888c5c7f463bae703c13e
-Fix some compiler warnings
-
-diff -r b5ea7efbf1f9 mcabber/mcabber/commands.c
---- a/mcabber/mcabber/commands.c	Thu Jul 19 08:03:37 2012 +0300
-+++ b/mcabber/mcabber/commands.c	Thu Jul 19 08:04:52 2012 +0300
-@@ -1949,13 +1949,11 @@
-       enum imstatus rstatus;
-       const char *rst_msg;
-       time_t rst_time;
--      struct pgp_data *rpgp;
- 
-       rprio   = buddy_getresourceprio(bud, p_res->data);
-       rstatus = buddy_getstatus(bud, p_res->data);
-       rst_msg = buddy_getstatusmsg(bud, p_res->data);
-       rst_time = buddy_getstatustime(bud, p_res->data);
--      rpgp = buddy_resource_pgp(bud, p_res->data);
- 
-       snprintf(buffer, 4095, "Resource: [%c] (%d) %s", imstatus2char[rstatus],
-                rprio, (char*)p_res->data);
-@@ -1974,6 +1972,8 @@
-                                  0, HBB_PREFIX_INFO | HBB_PREFIX_CONT, 0);
-       }
- #ifdef HAVE_GPGME
-+      struct pgp_data *rpgp = buddy_resource_pgp(bud, p_res->data);
-+
-       if (rpgp && rpgp->sign_keyid) {
-         snprintf(buffer, 4095, "PGP key id: %s", rpgp->sign_keyid);
-         scr_WriteIncomingMessage(bjid, buffer,
-diff -r b5ea7efbf1f9 mcabber/mcabber/xmpp_helper.c
---- a/mcabber/mcabber/xmpp_helper.c	Thu Jul 19 08:03:37 2012 +0300
-+++ b/mcabber/mcabber/xmpp_helper.c	Thu Jul 19 08:04:52 2012 +0300
-@@ -22,6 +22,7 @@
- 
- #include <string.h>
- #include <stdlib.h>
-+#include <stdio.h>   // snprintf
- 
- #include "xmpp_helper.h"
- #include "settings.h"
mcabber-isbear-patches