Updating branch refs/heads/devel to 6ef48f28a70ad61f485fce916a3227fb144c9548 (commit) from 4c95fb9005e0faac648c0993f9c92a9e5bf7c887 (commit)
commit 6ef48f28a70ad61f485fce916a3227fb144c9548 Author: Nick Schermer <n...@xfce.org> Date: Thu Dec 11 19:58:36 2008 +0100 * Move #define to a more suitable place. panel/panel-preferences-dialog.c | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-) diff --git a/panel/panel-preferences-dialog.c b/panel/panel-preferences-dialog.c index d4bc045..cdf0b74 100644 --- a/panel/panel-preferences-dialog.c +++ b/panel/panel-preferences-dialog.c @@ -116,10 +116,7 @@ panel_preferences_dialog_class_init (PanelPreferencesDialogClass *klass) gobject_class->finalize = panel_preferences_dialog_finalize; } -#define connect_signal(name,detail_signal,c_handler) \ - object = gtk_builder_get_object (GTK_BUILDER (dialog), name); \ - panel_return_if_fail (G_IS_OBJECT (object)); \ - g_signal_connect (G_OBJECT (object), detail_signal, G_CALLBACK (c_handler), dialog); + static void panel_preferences_dialog_init (PanelPreferencesDialog *dialog) @@ -146,6 +143,11 @@ panel_preferences_dialog_init (PanelPreferencesDialog *dialog) window = gtk_builder_get_object (GTK_BUILDER (dialog), "dialog"); panel_application_take_dialog (dialog->application, GTK_WINDOW (window)); g_signal_connect (G_OBJECT (window), "response", G_CALLBACK (panel_preferences_dialog_response), dialog); + +#define connect_signal(name,detail_signal,c_handler) \ + object = gtk_builder_get_object (GTK_BUILDER (dialog), name); \ + panel_return_if_fail (G_IS_OBJECT (object)); \ + g_signal_connect (G_OBJECT (object), detail_signal, G_CALLBACK (c_handler), dialog); /* panel selector buttons and combobox */ connect_signal ("panel-add", "clicked", panel_preferences_dialog_panel_add); @@ -232,7 +234,7 @@ panel_preferences_dialog_response (GtkWidget *window, { GError *error = NULL; GdkScreen *screen; - + panel_return_if_fail (GTK_IS_DIALOG (window)); panel_return_if_fail (PANEL_IS_PREFERENCES_DIALOG (dialog)); _______________________________________________ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits