[Xfce4-commits] <xfce4-screenshooter:master> Use G_CALLBACK instead of casting to a GCallback.

[Jérôme Guelfucci]

Updating branch refs/heads/master
         to 1c5210763715c03f1db9846b1a37dfc7431ed9c5 (commit)
       from d0f9e8981961efaf661d43bb9c5c8cbd6a8261ea (commit)

commit 1c5210763715c03f1db9846b1a37dfc7431ed9c5
Author: Jérôme Guelfucci <jeromeg at xfce.org>
Date:   Sat Dec 26 12:45:59 2009 +0100

    Use G_CALLBACK instead of casting to a GCallback.

 lib/screenshooter-actions.c         |    4 ++--
 lib/screenshooter-capture.c         |   10 +++++-----
 lib/screenshooter-zimagez.c         |   10 +++++-----
 panel-plugin/screenshooter-plugin.c |   12 ++++++------
 src/main.c                          |    4 ++--
 5 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/lib/screenshooter-actions.c b/lib/screenshooter-actions.c
index d70d6ff..f9c694b 100644
--- a/lib/screenshooter-actions.c
+++ b/lib/screenshooter-actions.c
@@ -60,9 +60,9 @@ gboolean screenshooter_action_idle (ScreenshotData *sd)
       gint response;
 
       g_signal_connect (dialog, "response",
-                        (GCallback) cb_help_response, NULL);
+                        G_CALLBACK (cb_help_response), NULL);
       g_signal_connect (dialog, "key-press-event",
-                        (GCallback) screenshooter_f1_key, NULL);
+                        G_CALLBACK (screenshooter_f1_key), NULL);
 
       response = gtk_dialog_run (GTK_DIALOG (dialog));
 
diff --git a/lib/screenshooter-capture.c b/lib/screenshooter-capture.c
index 8b8b831..e93a35a 100644
--- a/lib/screenshooter-capture.c
+++ b/lib/screenshooter-capture.c
@@ -606,15 +606,15 @@ static GdkPixbuf
 
   /* Connect to the interesting signals */
   g_signal_connect (window, "key-press-event",
-                    (GCallback) cb_key_pressed, &cancelled);
+                    G_CALLBACK (cb_key_pressed), &cancelled);
   g_signal_connect (window, "expose-event",
-                    (GCallback) cb_expose, &rbdata);
+                    G_CALLBACK (cb_expose), &rbdata);
   g_signal_connect (window, "button-press-event",
-                    (GCallback) cb_button_pressed, &rbdata);
+                    G_CALLBACK (cb_button_pressed), &rbdata);
   g_signal_connect (window, "button-release-event",
-                    (GCallback) cb_button_released, &rbdata);
+                    G_CALLBACK (cb_button_released), &rbdata);
   g_signal_connect (window, "motion-notify-event",
-                    (GCallback) cb_motion_notify, &rbdata);
+                    G_CALLBACK (cb_motion_notify), &rbdata);
 
   /* This window is not managed by the window manager, we have to set everything
    * ourselves */
diff --git a/lib/screenshooter-zimagez.c b/lib/screenshooter-zimagez.c
index 3a3e60e..c2bc37e 100644
--- a/lib/screenshooter-zimagez.c
+++ b/lib/screenshooter-zimagez.c
@@ -1219,11 +1219,11 @@ void screenshooter_upload_to_zimagez (const gchar  *image_path,
 
   job = zimagez_upload_to_zimagez (image_path, last_user, title);
 
-  g_signal_connect (job, "ask", (GCallback) cb_ask_for_information, NULL);
-  g_signal_connect (job, "image-uploaded", (GCallback) cb_image_uploaded, new_last_user);
-  g_signal_connect (job, "error", (GCallback) cb_error, NULL);
-  g_signal_connect (job, "finished", (GCallback) cb_finished, dialog);
-  g_signal_connect (job, "info-message", (GCallback) cb_update_info, label);
+  g_signal_connect (job, "ask", G_CALLBACK (cb_ask_for_information), NULL);
+  g_signal_connect (job, "image-uploaded", G_CALLBACK (cb_image_uploaded), new_last_user);
+  g_signal_connect (job, "error", G_CALLBACK (cb_error), NULL);
+  g_signal_connect (job, "finished", G_CALLBACK (cb_finished), dialog);
+  g_signal_connect (job, "info-message", G_CALLBACK (cb_update_info), label);
 
   gtk_dialog_run (GTK_DIALOG (dialog));
 }
diff --git a/panel-plugin/screenshooter-plugin.c b/panel-plugin/screenshooter-plugin.c
index 5d6bd60..19fa13c 100644
--- a/panel-plugin/screenshooter-plugin.c
+++ b/panel-plugin/screenshooter-plugin.c
@@ -382,20 +382,20 @@ screenshooter_plugin_construct (XfcePanelPlugin *plugin)
 
   /* Set the callbacks */
   g_signal_connect (pd->button, "clicked",
-                    (GCallback) cb_button_clicked, pd);
+                    G_CALLBACK (cb_button_clicked), pd);
   g_signal_connect (pd->button, "scroll-event",
-                    (GCallback) cb_button_scrolled, pd);
+                    G_CALLBACK (cb_button_scrolled), pd);
   g_signal_connect (plugin, "free-data",
-                    (GCallback) cb_free_data, pd);
+                    G_CALLBACK (cb_free_data), pd);
   g_signal_connect (plugin, "size-changed",
-                    (GCallback) cb_set_size, pd);
+                    G_CALLBACK (cb_set_size), pd);
 
   pd->style_id = g_signal_connect (plugin, "style-set",
-                                   (GCallback) cb_style_set, pd);
+                                   G_CALLBACK (cb_style_set), pd);
 
   /* Set the configuration menu */
   xfce_panel_plugin_menu_show_configure (plugin);
   g_signal_connect (plugin, "configure-plugin",
-                    (GCallback) cb_properties_dialog, pd);
+                    G_CALLBACK (cb_properties_dialog), pd);
 }
 XFCE_PANEL_PLUGIN_REGISTER_EXTERNAL (screenshooter_plugin_construct);
diff --git a/src/main.c b/src/main.c
index 0aa4232..2c5b0ef 100644
--- a/src/main.c
+++ b/src/main.c
@@ -301,9 +301,9 @@ int main (int argc, char **argv)
       /* Set the dialog up */
       dialog = screenshooter_region_dialog_new (sd, FALSE);
       g_signal_connect (dialog, "response",
-                        (GCallback) cb_dialog_response, sd);
+                        G_CALLBACK (cb_dialog_response), sd);
       g_signal_connect (dialog, "key-press-event",
-                        (GCallback) screenshooter_f1_key, NULL);
+                        G_CALLBACK (screenshooter_f1_key), NULL);
       gtk_widget_show (dialog);
     }