From 207ce8799512384d69829f6fc01a7fb13c0de3ed Mon Sep 17 00:00:00 2001 From: Thomas Wood Date: Fri, 4 May 2007 17:11:12 +0000 Subject: [PATCH] Remove WID() macro, which has an incompatible definition in 2007-05-04 Thomas Wood * appearance-desktop.c: (wp_add_images), (wp_dragged_image), (desktop_init): * appearance-main.c: (main): * appearance-themes.c: (themes_init): * appearance-ui.c: (set_toolbar_style), (set_have_icons), (ui_init): * appearance.h: Remove WID() macro, which has an incompatible definition in capplet-utils.h svn path=/trunk/; revision=7549 --- capplets/appearance/ChangeLog | 11 +++++++++++ capplets/appearance/appearance-desktop.c | 22 +++++++++++----------- capplets/appearance/appearance-main.c | 2 +- capplets/appearance/appearance-themes.c | 10 +++++----- capplets/appearance/appearance-ui.c | 18 +++++++++--------- capplets/appearance/appearance.h | 2 -- 6 files changed, 37 insertions(+), 28 deletions(-) diff --git a/capplets/appearance/ChangeLog b/capplets/appearance/ChangeLog index e4ec23f0d..d8ab3fddc 100644 --- a/capplets/appearance/ChangeLog +++ b/capplets/appearance/ChangeLog @@ -1,3 +1,14 @@ +2007-05-04 Thomas Wood + + * appearance-desktop.c: (wp_add_images), (wp_dragged_image), + (desktop_init): + * appearance-main.c: (main): + * appearance-themes.c: (themes_init): + * appearance-ui.c: (set_toolbar_style), (set_have_icons), + (ui_init): + * appearance.h: + Remove WID() macro, which has an incompatible definition in capplet-utils.h + 2007-05-04 Thomas Wood * appearance-themes.c: (themes_init): Use readable name rather than file name diff --git a/capplets/appearance/appearance-desktop.c b/capplets/appearance/appearance-desktop.c index 16d233ef6..0e4056fd6 100644 --- a/capplets/appearance/appearance-desktop.c +++ b/capplets/appearance/appearance-desktop.c @@ -155,7 +155,7 @@ wp_add_images (AppearanceData *data, GdkCursor *cursor; GnomeWPItem *item; - window = (WID ("appearance_window"))->window; + window = (glade_xml_get_widget (data->xml, "appearance_window"))->window; item = NULL; cursor = gdk_cursor_new_for_display (gdk_display_get_default (), @@ -789,7 +789,7 @@ wp_dragged_image (GtkWidget *widget, GdkWindow *window; GdkCursor *cursor; - window = (WID ("appearance_window"))->window; + window = (glade_xml_get_widget (data->xml, "appearance_window"))->window; cursor = gdk_cursor_new_for_display (gdk_display_get_default (), GDK_WATCH); @@ -1012,10 +1012,10 @@ desktop_init (AppearanceData *data) G_TYPE_STRING, G_TYPE_STRING)); - g_signal_connect_after (G_OBJECT (WID ("appearance_window")), "delete-event", + g_signal_connect_after (G_OBJECT (glade_xml_get_widget (data->xml, "appearance_window")), "delete-event", G_CALLBACK (wp_tree_delete_event), data); - data->wp_tree = GTK_TREE_VIEW (WID ("wp_tree")); + data->wp_tree = GTK_TREE_VIEW (glade_xml_get_widget (data->xml, "wp_tree")); gtk_tree_view_set_model (data->wp_tree, data->wp_model); column = gtk_tree_view_column_new (); @@ -1047,7 +1047,7 @@ desktop_init (AppearanceData *data) g_signal_connect (G_OBJECT (data->wp_tree), "drag_data_received", G_CALLBACK (wp_dragged_image), data); - data->wp_style_menu = WID ("wp_style_menu"); + data->wp_style_menu = glade_xml_get_widget (data->xml, "wp_style_menu"); gtk_combo_box_append_text (GTK_COMBO_BOX (data->wp_style_menu), _("Centered")); gtk_combo_box_append_text (GTK_COMBO_BOX (data->wp_style_menu), _("Fill Screen")); @@ -1058,7 +1058,7 @@ desktop_init (AppearanceData *data) g_signal_connect (G_OBJECT (data->wp_style_menu), "changed", G_CALLBACK (wp_scale_type_changed), data); - data->wp_color_menu = WID ("wp_color_menu"); + data->wp_color_menu = glade_xml_get_widget (data->xml, "wp_color_menu"); gtk_combo_box_append_text (GTK_COMBO_BOX (data->wp_color_menu), _("Solid Color")); gtk_combo_box_append_text (GTK_COMBO_BOX (data->wp_color_menu), _("Horizontal Gradient")); @@ -1067,22 +1067,22 @@ desktop_init (AppearanceData *data) g_signal_connect (G_OBJECT (data->wp_color_menu), "changed", G_CALLBACK (wp_shade_type_changed), data); - data->wp_scpicker = WID ("wp_scpicker"); + data->wp_scpicker = glade_xml_get_widget (data->xml, "wp_scpicker"); g_signal_connect (G_OBJECT (data->wp_scpicker), "color-set", G_CALLBACK (wp_scolor_changed), data); - data->wp_pcpicker = WID ("wp_pcpicker"); + data->wp_pcpicker = glade_xml_get_widget (data->xml, "wp_pcpicker"); g_signal_connect (G_OBJECT (data->wp_pcpicker), "color-set", G_CALLBACK (wp_scolor_changed), data); - data->wp_rem_button = WID ("wp_rem_button"); + data->wp_rem_button = glade_xml_get_widget (data->xml, "wp_rem_button"); g_signal_connect (G_OBJECT (data->wp_rem_button), "clicked", G_CALLBACK (wp_remove_wallpaper), data); - g_signal_connect (G_OBJECT (WID ("wp_add_button")), "clicked", + g_signal_connect (G_OBJECT (glade_xml_get_widget (data->xml, "wp_add_button")), "clicked", G_CALLBACK (wp_file_open_dialog), data); g_idle_add (wp_load_stuffs, data); @@ -1094,7 +1094,7 @@ desktop_init (AppearanceData *data) wp_set_sensitivities (data); data->wp_filesel = gtk_file_chooser_dialog_new_with_backend (_("Add Wallpaper"), - GTK_WINDOW (WID ("appearance_window")), + GTK_WINDOW (glade_xml_get_widget (data->xml, "appearance_window")), GTK_FILE_CHOOSER_ACTION_OPEN, "gtk+", GTK_STOCK_CANCEL, diff --git a/capplets/appearance/appearance-main.c b/capplets/appearance/appearance-main.c index 010edd5a7..410a6b9d4 100644 --- a/capplets/appearance/appearance-main.c +++ b/capplets/appearance/appearance-main.c @@ -91,7 +91,7 @@ main (int argc, char **argv) */ /* prepare the main window */ - w = WID ("appearance_window"); + w = glade_xml_get_widget (data->xml, "appearance_window"); gtk_widget_show_all (w); g_signal_connect (G_OBJECT (w), "delete-event", (GCallback) gtk_main_quit, NULL); diff --git a/capplets/appearance/appearance-themes.c b/capplets/appearance/appearance-themes.c index 370344537..9d80d376a 100644 --- a/capplets/appearance/appearance-themes.c +++ b/capplets/appearance/appearance-themes.c @@ -50,12 +50,12 @@ themes_init (AppearanceData *data) gnome_wm_manager_init (); /* connect button signals */ - g_signal_connect (G_OBJECT (WID ("theme_save")), "clicked", (GCallback) theme_save_cb, data); - g_signal_connect (G_OBJECT (WID ("theme_open")), "clicked", (GCallback) theme_open_cb, data); - g_signal_connect (G_OBJECT (WID ("theme_delete")), "clicked", (GCallback) theme_delete_cb, data); + g_signal_connect (G_OBJECT (glade_xml_get_widget (data->xml, "theme_save")), "clicked", (GCallback) theme_save_cb, data); + g_signal_connect (G_OBJECT (glade_xml_get_widget (data->xml, "theme_open")), "clicked", (GCallback) theme_open_cb, data); + g_signal_connect (G_OBJECT (glade_xml_get_widget (data->xml, "theme_delete")), "clicked", (GCallback) theme_delete_cb, data); /* connect theme list signals */ - g_signal_connect (G_OBJECT (WID ("theme_list")), "item-activated", (GCallback) theme_activated_cb, data); + g_signal_connect (G_OBJECT (glade_xml_get_widget (data->xml, "theme_list")), "item-activated", (GCallback) theme_activated_cb, data); /* set up theme list */ theme_store = gtk_list_store_new (2, G_TYPE_STRING, GDK_TYPE_PIXBUF); @@ -78,7 +78,7 @@ themes_init (AppearanceData *data) } } - w = WID ("theme_list"); + w = glade_xml_get_widget (data->xml, "theme_list"); gtk_icon_view_set_model (GTK_ICON_VIEW (w), GTK_TREE_MODEL (theme_store)); } diff --git a/capplets/appearance/appearance-ui.c b/capplets/appearance/appearance-ui.c index d2bb01dc4..298c40dee 100644 --- a/capplets/appearance/appearance-ui.c +++ b/capplets/appearance/appearance-ui.c @@ -35,9 +35,9 @@ static GConfEnumStringPair toolbar_style_enums[] = { static void show_handlebar (AppearanceData *data, gboolean show) { - GtkWidget *handlebox = WID ("toolbar_handlebox"); - GtkWidget *toolbar = WID ("toolbar_toolbar"); - GtkWidget *align = WID ("toolbar_align"); + GtkWidget *handlebox = glade_xml_get_widget (data->xml, "toolbar_handlebox"); + GtkWidget *toolbar = glade_xml_get_widget (data->xml, "toolbar_toolbar"); + GtkWidget *align = glade_xml_get_widget (data->xml, "toolbar_align"); g_object_ref (handlebox); g_object_ref (toolbar); @@ -70,7 +70,7 @@ set_toolbar_style (AppearanceData *data, const char *value) if (!gconf_string_to_enum (toolbar_style_enums, value, &enum_val)) enum_val = 0; - gtk_toolbar_set_style (GTK_TOOLBAR (WID("toolbar_toolbar")), + gtk_toolbar_set_style (GTK_TOOLBAR (glade_xml_get_widget (data->xml, "toolbar_toolbar")), gtk_toolbar_styles[enum_val]); } @@ -92,7 +92,7 @@ set_have_icons (AppearanceData *data, gboolean value) const char **name; for (name = menu_item_names; *name != NULL; name++) { - GtkImageMenuItem *item = GTK_IMAGE_MENU_ITEM (WID (*name)); + GtkImageMenuItem *item = GTK_IMAGE_MENU_ITEM (glade_xml_get_widget (data->xml, *name)); GtkWidget *image; if (value) { @@ -193,11 +193,11 @@ ui_init (AppearanceData *data) peditor = gconf_peditor_new_boolean (NULL, "/desktop/gnome/interface/can_change_accels", - WID ("menu_accel_toggle"), NULL); + glade_xml_get_widget (data->xml, "menu_accel_toggle"), NULL); peditor = gconf_peditor_new_boolean (NULL, "/desktop/gnome/interface/menus_have_icons", - WID ("menu_icons_toggle"), NULL); + glade_xml_get_widget (data->xml, "menu_icons_toggle"), NULL); g_signal_connect (peditor, "value_changed", G_CALLBACK (menus_have_icons_cb), data); @@ -208,14 +208,14 @@ ui_init (AppearanceData *data) peditor = gconf_peditor_new_combo_box (NULL, "/desktop/gnome/interface/toolbar_style", - WID ("toolbar_style_select"), + glade_xml_get_widget (data->xml, "toolbar_style_select"), "conv-to-widget-cb", toolbar_to_widget, "conv-from-widget-cb", toolbar_from_widget, NULL); g_signal_connect (peditor, "value_changed", G_CALLBACK (toolbar_style_cb), data); - g_signal_connect (G_OBJECT (WID ("toolbar_handlebox")), + g_signal_connect (G_OBJECT (glade_xml_get_widget (data->xml, "toolbar_handlebox")), "button_press_event", G_CALLBACK (button_press_block_cb), NULL); diff --git a/capplets/appearance/appearance.h b/capplets/appearance/appearance.h index e342c1a24..f3d555a29 100644 --- a/capplets/appearance/appearance.h +++ b/capplets/appearance/appearance.h @@ -27,8 +27,6 @@ #include #include -#define WID(x) (glade_xml_get_widget (data->xml, x)) - typedef struct { GConfClient *client; int argc;