changeset 1512:56f1f0f7437d trunk

[svn] - refinements for the notify plugin
author giacomo
date Sun, 06 Aug 2006 15:13:01 -0700
parents 543e37d18997
children 1b5f5a995838
files ChangeLog Plugins/General/notify/notify.c
diffstat 2 files changed, 20 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Sun Aug 06 06:24:06 2006 -0700
+++ b/ChangeLog	Sun Aug 06 15:13:01 2006 -0700
@@ -1,3 +1,12 @@
+2006-08-06 13:24:06 +0000  Tony Vroon <chainsaw@gentoo.org>
+  revision [1936]
+  Remove 15 instrument magic at offset 1080 because of false positive resulting in decoder segfault. Closes bug #543.
+
+  Changes:        Modified:
+  +0 -4           trunk/Plugins/Input/modplug/modplugbmp.cpp  
+  +0 -1           trunk/Plugins/Input/modplug/modplugbmp.h  
+
+
 2006-08-06 12:45:48 +0000  Giacomo Lozito <james@develia.org>
   revision [1934]
   - a couple of fixes for notify plugin (removed some deprecated gtk+1 functions and ensure that the timeout is removed only if it actually exists)
--- a/Plugins/General/notify/notify.c	Sun Aug 06 06:24:06 2006 -0700
+++ b/Plugins/General/notify/notify.c	Sun Aug 06 15:13:01 2006 -0700
@@ -35,7 +35,7 @@
         init,
         NULL,
         NULL,
-        cleanup,
+        cleanup
 };
 
 GeneralPlugin *get_gplugin_info(void)
@@ -46,6 +46,9 @@
 
 static void init(void) 
 {
+	/* Initialise libnotify */
+	notify_init(PACKAGE);
+
 	/* 
 	TODO: I assume 100 means 100ms checking interval? Why not 200? 
 	It would be twice as efficient and the user shouldn't notice any difference.
@@ -56,13 +59,20 @@
 static void cleanup(void)
 {
    if ( timeout_tag > 0 )
+   {
 	  g_source_remove(timeout_tag);
+	  timeout_tag = 0;
+	}
 
 	if (previous_title != NULL)
 	{
 		g_free(previous_title);
 		previous_title = NULL;
 	}
+
+	/* Uninitialise libnotify */
+	if ( notify_is_initted() == TRUE )
+	  notify_uninit();
 }
 
 static gboolean watchdog_func(gpointer unused)
@@ -125,9 +135,6 @@
 	NotifyNotification *n;  
 	gint ret;
 
-	/* Initialise libnotify if we haven't done so yet. */
-	notify_init(PACKAGE);
-
 	n = notify_notification_new(summary, 
  	                            message,
         	                    NULL, NULL);