[Goodies-commits] r4965 - in xfce4-screenshooter-plugin/trunk: . src

[Jerome Guelfucci]

Author: jeromeg
Date: 2008-06-18 16:13:44 +0000 (Wed, 18 Jun 2008)
New Revision: 4965

Modified:
   xfce4-screenshooter-plugin/trunk/ChangeLog
   xfce4-screenshooter-plugin/trunk/NEWS
   xfce4-screenshooter-plugin/trunk/src/screenshooter-plugin.c
Log:
Remove some useless code.

Modified: xfce4-screenshooter-plugin/trunk/ChangeLog
===================================================================
--- xfce4-screenshooter-plugin/trunk/ChangeLog	2008-06-18 15:09:18 UTC (rev 4964)
+++ xfce4-screenshooter-plugin/trunk/ChangeLog	2008-06-18 16:13:44 UTC (rev 4965)
@@ -1,3 +1,9 @@
+2008-06-18 18:12 jeromeg
+
+	* src/screenshooter-plugin.c: remove some code that seems to
+	  be useless.
+	* NEWS: updated.
+
 2008-06-18 17:08 jeromeg
 
 	* src/xfce4-screenshooter.1: add manpage (thanks to Debian).

Modified: xfce4-screenshooter-plugin/trunk/NEWS
===================================================================
--- xfce4-screenshooter-plugin/trunk/NEWS	2008-06-18 15:09:18 UTC (rev 4964)
+++ xfce4-screenshooter-plugin/trunk/NEWS	2008-06-18 16:13:44 UTC (rev 4965)
@@ -1,3 +1,7 @@
+=== Version 1.2.0 ===
+	* Fix gcc-4.3 warnings.
+	* Add manpage taken from Debian package.
+
 === Version 1.1.0 ===
 	* Delay now works.
 	* Canceling save now works.

Modified: xfce4-screenshooter-plugin/trunk/src/screenshooter-plugin.c
===================================================================
--- xfce4-screenshooter-plugin/trunk/src/screenshooter-plugin.c	2008-06-18 15:09:18 UTC (rev 4964)
+++ xfce4-screenshooter-plugin/trunk/src/screenshooter-plugin.c	2008-06-18 16:13:44 UTC (rev 4965)
@@ -63,9 +63,6 @@
 
     gint counter;
 
-    NetkScreen *screen;
-    int netk_id;
-    int screen_id;
     int style_id;
 }
 ScreenshotData;
@@ -98,19 +95,13 @@
 static void
 screenshot_free_data (XfcePanelPlugin * plugin, ScreenshotData * sd)
 {
-    if (sd->netk_id)
-        g_signal_handler_disconnect (sd->screen, sd->netk_id);
+  if (sd->style_id)
+  	g_signal_handler_disconnect (plugin, sd->style_id);
 
-    if (sd->screen_id)
-        g_signal_handler_disconnect (plugin, sd->screen_id);
-
-    if (sd->style_id)
-        g_signal_handler_disconnect (plugin, sd->style_id);
-
-    sd->netk_id = sd->screen_id = sd->style_id = 0;
-    gtk_object_sink (GTK_OBJECT (sd->tooltips));
-    gtk_widget_destroy (sd->chooser);
-    g_free (sd);
+  sd->style_id = 0;
+  gtk_object_sink (GTK_OBJECT (sd->tooltips));
+  gtk_widget_destroy (sd->chooser);
+  g_free (sd);
 }
 
 static void