[Goodies-commits] r7358 - in xfce4-screenshooter/trunk: . lib

[Jerome Guelfucci]

Author: jeromeg
Date: 2009-05-17 16:22:32 +0000 (Sun, 17 May 2009)
New Revision: 7358

Modified:
   xfce4-screenshooter/trunk/ChangeLog
   xfce4-screenshooter/trunk/lib/screenshooter-zimagez.c
Log:
	* lib/screenshooter-zimagez.c:
	  - (zimagez_upload_job) remove a useless cancel check before the loop.
	  - (cb_ask_for_information) do not disconnect handlers before
	    cancelling the job, only before destroying it.


Modified: xfce4-screenshooter/trunk/ChangeLog
===================================================================
--- xfce4-screenshooter/trunk/ChangeLog	2009-05-17 16:05:33 UTC (rev 7357)
+++ xfce4-screenshooter/trunk/ChangeLog	2009-05-17 16:22:32 UTC (rev 7358)
@@ -1,5 +1,12 @@
 2009-05-17 jeromeg
 
+	* lib/screenshooter-zimagez.c:
+	  - (zimagez_upload_job) remove a useless cancel check before the loop.
+	  - (cb_ask_for_information) do not disconnect handlers before
+	    cancelling the job, only before destroying it.
+
+2009-05-17 jeromeg
+
 	* lib/screenshooter-utils.{c,h}: use a constant in
 	  (screenshooter_read_rc_file) and (screenshooter_write_rc_file).
 	* src/main.c:

Modified: xfce4-screenshooter/trunk/lib/screenshooter-zimagez.c
===================================================================
--- xfce4-screenshooter/trunk/lib/screenshooter-zimagez.c	2009-05-17 16:05:33 UTC (rev 7357)
+++ xfce4-screenshooter/trunk/lib/screenshooter-zimagez.c	2009-05-17 16:22:32 UTC (rev 7358)
@@ -244,16 +244,6 @@
     }
   while (gtk_tree_model_iter_next (GTK_TREE_MODEL (liststore), &iter));
 
-  if (exo_job_set_error_if_cancelled (EXO_JOB (job), error))
-    {
-      xmlrpc_env_clean (&env);
-      xmlrpc_client_cleanup ();
-
-      TRACE ("The upload job was cancelled.");
-
-      return FALSE;
-    }
-
   while (!response)
     {
       gboolean empty_field = FALSE;
@@ -792,36 +782,6 @@
 
   if (response == GTK_RESPONSE_CANCEL)
     {
-      g_signal_handlers_disconnect_matched (job,
-                                            G_SIGNAL_MATCH_FUNC,
-                                            0, 0, NULL,
-                                            cb_image_uploaded,
-                                            NULL);
-
-      g_signal_handlers_disconnect_matched (job,
-                                            G_SIGNAL_MATCH_FUNC,
-                                            0, 0, NULL,
-                                            cb_error,
-                                            NULL);
-
-      g_signal_handlers_disconnect_matched (job,
-                                            G_SIGNAL_MATCH_FUNC,
-                                            0, 0, NULL,
-                                            cb_ask_for_information,
-                                            NULL);
-
-      g_signal_handlers_disconnect_matched (job,
-                                            G_SIGNAL_MATCH_FUNC,
-                                            0, 0, NULL,
-                                            cb_update_info,
-                                            NULL);
-
-      g_signal_handlers_disconnect_matched (job,
-                                            G_SIGNAL_MATCH_FUNC,
-                                            0, 0, NULL,
-                                            cb_finished,
-                                            NULL);
-
       exo_job_cancel (EXO_JOB (job));
     }
   else if (response == GTK_RESPONSE_OK)