[Commits] [SCM] claws branch, master, updated. 3.11.1-79-gde6f188

[holger at claws-mail.org]

The branch, master has been updated
       via  de6f18826fe06f2592e2436b70a340cb20241df0 (commit)
       via  f793a3ae68b75afdc9c866480e3e45dc92b567e2 (commit)
      from  c310c6b9412613d7751b55f681f1748a22c42da3 (commit)

Summary of changes:
 src/plugins/notification/gtkhotkey/gtk-hotkey-x11-listener.c |    5 +----
 src/plugins/python/python_plugin.c                           |   10 +++++++++-
 2 files changed, 10 insertions(+), 5 deletions(-)


- Log -----------------------------------------------------------------
commit de6f18826fe06f2592e2436b70a340cb20241df0
Author: Holger Berndt <hb at claws-mail.org>
Date:   Sun Mar 15 21:24:29 2015 +0100

    Python plugin: Silence parasite glib warnings

diff --git a/src/plugins/python/python_plugin.c b/src/plugins/python/python_plugin.c
index 69d7e58..2ce32f3 100644
--- a/src/plugins/python/python_plugin.c
+++ b/src/plugins/python/python_plugin.c
@@ -637,9 +637,14 @@ done:
   return retval ? retval : g_strdup("Unspecified error occured");
 }
 
+static void log_func(const gchar *log_domain, GLogLevelFlags log_level, const gchar *message, gpointer user_data)
+{
+}
 
 gint plugin_init(gchar **error)
 {
+  guint log_handler;
+  int parasite_retval;
   PyObject *inst_StringIO = NULL;
 
   /* Version check */
@@ -678,7 +683,10 @@ gint plugin_init(gchar **error)
   }
 
   /* initialize python interactive shell */
-  if(!parasite_python_init(error)) {
+  log_handler = g_log_set_handler(NULL, G_LOG_LEVEL_WARNING | G_LOG_LEVEL_MESSAGE | G_LOG_LEVEL_INFO, log_func, NULL);
+  parasite_retval = parasite_python_init(error);
+  g_log_remove_handler(NULL, log_handler);
+  if(!parasite_retval) {
     goto err;
   }
 

commit f793a3ae68b75afdc9c866480e3e45dc92b567e2
Author: Holger Berndt <hb at claws-mail.org>
Date:   Sun Mar 15 20:55:59 2015 +0100

    Notification plugin: Remove spurious warning

diff --git a/src/plugins/notification/gtkhotkey/gtk-hotkey-x11-listener.c b/src/plugins/notification/gtkhotkey/gtk-hotkey-x11-listener.c
index 9701ef3..02bf334 100644
--- a/src/plugins/notification/gtkhotkey/gtk-hotkey-x11-listener.c
+++ b/src/plugins/notification/gtkhotkey/gtk-hotkey-x11-listener.c
@@ -134,10 +134,7 @@ gtk_hotkey_x11_listener_real_unbind_hotkey (GtkHotkeyListener   *base,
 											G_SIGNAL_MATCH_DATA | G_SIGNAL_MATCH_FUNC,
 											0, 0, NULL, gtk_hotkey_info_activated,
 											hotkey);
-	if (handler == 0) {
-		g_warning ("Failed to disconnect signal handler for hotkey '%s'",
-				   gtk_hotkey_info_get_key_id (hotkey));
-	} else {
+	if (handler != 0) {
 		g_signal_handler_disconnect (self, handler);
 	}
 	

-----------------------------------------------------------------------


hooks/post-receive
-- 
Claws Mail