From 1eef9d7561b8db1ca2cc4a06f679d4a46fbd96e1 Mon Sep 17 00:00:00 2001 From: Lauris Kaplinski Date: Wed, 13 Feb 2002 16:52:18 +0000 Subject: [PATCH] Replaced all deprecated methods except 2 GtkCTree instances with gnome-2 alternatives. --- capplets/background/ChangeLog | 5 ++ .../background-properties-capplet.c | 4 +- capplets/common/ChangeLog | 4 ++ capplets/common/gconf-property-editor.c | 3 +- control-center/ChangeLog | 13 ++++ control-center/capplet-dir-view-tree.c | 4 ++ control-center/capplet-dir-view.c | 24 +++++--- control-center/preferences.c | 40 +++++++++--- gnome-settings-daemon/ChangeLog | 4 ++ .../gnome-settings-xsettings.c | 1 + libbackground/ChangeLog | 15 +++++ libbackground/applier.c | 61 ++++++++++++------- libbackground/preferences.c | 5 ++ 13 files changed, 145 insertions(+), 38 deletions(-) diff --git a/capplets/background/ChangeLog b/capplets/background/ChangeLog index a2625d2cb..2a59659f1 100644 --- a/capplets/background/ChangeLog +++ b/capplets/background/ChangeLog @@ -1,3 +1,8 @@ +2002-02-12 Lauris Kaplinski + + * background-properties-capplet.c (dialog_button_clicked_cb): Use + GtkDialog instead of GnomeDialog + 2002-02-06 Seth Nickell * background-properties-capplet.c: (drag_motion_cb), diff --git a/capplets/background/background-properties-capplet.c b/capplets/background/background-properties-capplet.c index 572767d55..4ff15acb8 100644 --- a/capplets/background/background-properties-capplet.c +++ b/capplets/background/background-properties-capplet.c @@ -26,6 +26,8 @@ # include #endif +#include + #include #include #include @@ -263,7 +265,7 @@ create_dialog (BGApplier *bg_applier) /* Callback issued when a button is clicked on the dialog */ static void -dialog_button_clicked_cb (GnomeDialog *dialog, gint response_id, GConfChangeSet *changeset) +dialog_button_clicked_cb (GtkDialog *dialog, gint response_id, GConfChangeSet *changeset) { switch (response_id) { case GTK_RESPONSE_APPLY: diff --git a/capplets/common/ChangeLog b/capplets/common/ChangeLog index 4980672e0..1271bb684 100644 --- a/capplets/common/ChangeLog +++ b/capplets/common/ChangeLog @@ -1,3 +1,7 @@ +2002-02-12 Lauris Kaplinski + + * gconf-property-editor.c (peditor_font_value_changed): Kill warning + 2002-02-10 Richard Hestilow * gconf-property-editor.[ch]: Added font editor. diff --git a/capplets/common/gconf-property-editor.c b/capplets/common/gconf-property-editor.c index fc8137022..78e4af712 100644 --- a/capplets/common/gconf-property-editor.c +++ b/capplets/common/gconf-property-editor.c @@ -25,6 +25,7 @@ # include "config.h" #endif +#include #include #include "gconf-property-editor.h" @@ -899,7 +900,7 @@ peditor_font_value_changed (GConfClient *client, value = gconf_entry_get_value (entry); if (value != NULL) { - gchar *font_name; + const gchar *font_name; value_wid = peditor->p->conv_to_widget_cb (value); font_name = gconf_value_get_string (value_wid); diff --git a/control-center/ChangeLog b/control-center/ChangeLog index bc33bef77..5230131eb 100644 --- a/control-center/ChangeLog +++ b/control-center/ChangeLog @@ -1,3 +1,16 @@ +2002-02-12 Lauris Kaplinski + + * preferences.c (prefs_dialog_ok_cb): Destroy widget instead of + gnome_dialog_close + (prefs_dialog_cancel_cb): Ditto + (prefs_dialog_response): Common button click handler + (gnomecc_preferences_get_config_dialog): Connect GtkDialog 'response' signal + + * capplet-dir-view.c (capplet_dir_view_load_dir): Replace deprecated methods, + use gdk_pixbuf/gtk_image instead of gnome_pixmap + (prefs_changed_cb): Use g_object_set + (option_menu_activate): Use g_object_set_data + 2002-02-08 Richard Hestilow * main.c (main): Ignore nautilus if run with --use-shell. diff --git a/control-center/capplet-dir-view-tree.c b/control-center/capplet-dir-view-tree.c index 241bf7beb..c0b34d658 100644 --- a/control-center/capplet-dir-view-tree.c +++ b/control-center/capplet-dir-view-tree.c @@ -22,6 +22,10 @@ * 02111-1307, USA. */ +#ifdef GTK_DISABLE_DEPRECATED +#undef GTK_DISABLE_DEPRECATED +#endif + #include #include "capplet-dir-view.h" diff --git a/control-center/capplet-dir-view.c b/control-center/capplet-dir-view.c index 3862bcabc..65530387c 100644 --- a/control-center/capplet-dir-view.c +++ b/control-center/capplet-dir-view.c @@ -414,7 +414,7 @@ option_menu_activate (GtkWidget *w, CappletDirEntry *entry) { CappletDirView *view; - view = gtk_object_get_user_data (GTK_OBJECT (w)); + view = g_object_get_data (G_OBJECT (w), "user_data"); if (!IS_CAPPLET_DIR_VIEW (view)) return; @@ -449,10 +449,20 @@ capplet_dir_view_load_dir (CappletDirView *view, CappletDir *dir) menu = gtk_menu_new (); for (entry = CAPPLET_DIR_ENTRY (dir); entry; entry = CAPPLET_DIR_ENTRY (entry->dir), parents++) { + GdkPixbuf *pb, *pbs; + menuitem = gtk_menu_item_new (); hbox = gtk_hbox_new (FALSE, GNOME_PAD_SMALL); +#if 0 w = gnome_pixmap_new_from_file_at_size (entry->icon, 16, 16); +#else + pb = gdk_pixbuf_new_from_file (entry->icon, NULL); + pbs = gdk_pixbuf_scale_simple (pb, 16, 16, GDK_INTERP_HYPER); + w = gtk_image_new_from_pixbuf (pb); + g_object_unref (pbs); + g_object_unref (pb); +#endif gtk_box_pack_start (GTK_BOX (hbox), w, FALSE, FALSE, 0); @@ -463,13 +473,13 @@ capplet_dir_view_load_dir (CappletDirView *view, CappletDir *dir) gtk_container_add (GTK_CONTAINER (menuitem), hbox); if (entry != CAPPLET_DIR_ENTRY (dir)) { - gtk_object_set_user_data (GTK_OBJECT (menuitem), view); - gtk_signal_connect (GTK_OBJECT (menuitem), "activate", - GTK_SIGNAL_FUNC (option_menu_activate), - entry); + g_object_set_data (G_OBJECT (menuitem), "user_data", view); + g_signal_connect (G_OBJECT (menuitem), "activate", + (GCallback) option_menu_activate, + entry); } - gtk_menu_prepend (GTK_MENU (menu), menuitem); + gtk_menu_shell_prepend (GTK_MENU_SHELL (menu), menuitem); } gtk_widget_show_all (menu); } @@ -516,7 +526,7 @@ prefs_changed_cb (GnomeCCPreferences *prefs) GList *node; for (node = window_list; node; node = node->next) - gtk_object_set (GTK_OBJECT (node->data), "layout", prefs->layout, NULL); + g_object_set (G_OBJECT (node->data), "layout", prefs->layout, NULL); } void diff --git a/control-center/preferences.c b/control-center/preferences.c index 1c8c07d93..4ccd78e37 100644 --- a/control-center/preferences.c +++ b/control-center/preferences.c @@ -233,7 +233,7 @@ prefs_dialog_ok_cb (GtkWidget *widget, GladeXML *data) prefs = g_object_get_data (G_OBJECT (data), "prefs_struct"); read_preferences (data, prefs); - gnome_dialog_close (GNOME_DIALOG (prefs_dialog)); + gtk_widget_destroy (GTK_WIDGET (prefs_dialog)); prefs_dialog = NULL; prefs_dialog_data = NULL; } @@ -243,7 +243,7 @@ prefs_dialog_apply_cb (GtkWidget *widget, GladeXML *data) { GnomeCCPreferences *prefs; - prefs = gtk_object_get_data (GTK_OBJECT (data), "prefs_struct"); + prefs = g_object_get_data (G_OBJECT (data), "prefs_struct"); read_preferences (data, prefs); } @@ -252,12 +252,12 @@ prefs_dialog_cancel_cb (GtkWidget *widget, GladeXML *data) { GnomeCCPreferences *prefs; - prefs = gtk_object_get_data (GTK_OBJECT (data), "prefs_struct"); + prefs = g_object_get_data (G_OBJECT (data), "prefs_struct"); gnomecc_preferences_copy (prefs, old_prefs); - gtk_signal_emit (GTK_OBJECT (prefs), - gnomecc_preferences_signals[CHANGED_SIGNAL]); + g_signal_emit (GTK_OBJECT (prefs), + gnomecc_preferences_signals[CHANGED_SIGNAL], 0); - gnome_dialog_close (GNOME_DIALOG (prefs_dialog)); + gtk_widget_destroy (GTK_WIDGET (prefs_dialog)); prefs_dialog = NULL; prefs_dialog_data = NULL; } @@ -283,6 +283,25 @@ tree_widget_toggled_cb (GtkWidget *widget) !gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget))); } +static void +prefs_dialog_response (GtkWidget *widget, gint id, GladeXML *data) +{ + switch (id) { + case GTK_RESPONSE_OK: + prefs_dialog_ok_cb (widget, data); + break; + case GTK_RESPONSE_APPLY: + prefs_dialog_apply_cb (widget, data); + break; + case GTK_RESPONSE_CANCEL: + prefs_dialog_cancel_cb (widget, data); + break; + default: + g_warning ("file %s: line %d: Unknown response id %d", __FILE__, __LINE__, id); + break; + } +} + GtkWidget * gnomecc_preferences_get_config_dialog (GnomeCCPreferences *prefs) { @@ -304,6 +323,7 @@ gnomecc_preferences_get_config_dialog (GnomeCCPreferences *prefs) prefs_dialog = glade_xml_get_widget (prefs_dialog_data, "preferences_dialog"); +#if 0 gnome_dialog_button_connect (GNOME_DIALOG (prefs_dialog), 0, GTK_SIGNAL_FUNC (prefs_dialog_ok_cb), @@ -318,9 +338,13 @@ gnomecc_preferences_get_config_dialog (GnomeCCPreferences *prefs) (GNOME_DIALOG (prefs_dialog), 2, GTK_SIGNAL_FUNC (prefs_dialog_cancel_cb), prefs_dialog_data); +#else + g_signal_connect (G_OBJECT (prefs_dialog), "response", + (GCallback) prefs_dialog_response, prefs_dialog_data); +#endif - gtk_object_set_data (GTK_OBJECT (prefs_dialog_data), - "prefs_struct", prefs); + g_object_set_data (G_OBJECT (prefs_dialog_data), + "prefs_struct", prefs); glade_xml_signal_connect (prefs_dialog_data, "tree_widget_toggled_cb", diff --git a/gnome-settings-daemon/ChangeLog b/gnome-settings-daemon/ChangeLog index cb4c33138..9d1d45f3e 100644 --- a/gnome-settings-daemon/ChangeLog +++ b/gnome-settings-daemon/ChangeLog @@ -1,3 +1,7 @@ +2002-02-13 Lauris Kaplinski + + * gnome-settings-xsettings.c: #include to kill warning + Tue Feb 12 01:34:19 2002 Jonathan Blandford * gnome-settings-daemon.c (main): add session management. diff --git a/gnome-settings-daemon/gnome-settings-xsettings.c b/gnome-settings-daemon/gnome-settings-xsettings.c index 04a852379..7cf7ff639 100644 --- a/gnome-settings-daemon/gnome-settings-xsettings.c +++ b/gnome-settings-daemon/gnome-settings-xsettings.c @@ -1,3 +1,4 @@ +#include #include #include "gnome-settings-daemon.h" diff --git a/libbackground/ChangeLog b/libbackground/ChangeLog index f3800cef4..91ca688f2 100644 --- a/libbackground/ChangeLog +++ b/libbackground/ChangeLog @@ -1,3 +1,18 @@ +2002-02-12 Lauris Kaplinski + + * applier.c (draw_disabled_message): Use g_object_unref for GdkGC + (render_wallpaper): Use gdk_drawable_get_size + (render_to_screen): Use gdk_get_default_root_window + (wallpaper_full_cover_p): Ditto + + * preferences.c (read_color_from_string): Use gdk_rgb_find_color + + * applier.c (bg_applier_get_preview_widget): Use gnome_program_locate_file, + replace GDK_ROOT_PARENT with gdk_get_default_root_window, deprecated + gdk_window_* methods with gdk_drawable_* ones + (bg_applier_get_preview_widget): Removed gtk_widget_push_visual, + gtk_widget_pop_visual, use gtk_image instead of gtk_pixmap + 2002-02-07 Richard Hestilow * applier.c (BGApplierPrivate): Add "timeout" field. diff --git a/libbackground/applier.c b/libbackground/applier.c index 04967e955..db17a1326 100644 --- a/libbackground/applier.c +++ b/libbackground/applier.c @@ -21,10 +21,6 @@ * 02111-1307, USA. */ -#ifdef GDK_DISABLE_DEPRECATED -#undef GDK_DISABLE_DEPRECATED -#endif - #ifdef HAVE_CONFIG_H # include "config.h" #endif @@ -454,27 +450,26 @@ bg_applier_get_preview_widget (BGApplier *bg_applier) if (bg_applier->p->preview_widget != NULL) return bg_applier->p->preview_widget; - filename = gnome_pixmap_file ("monitor.png"); - visual = gdk_window_get_visual (GDK_ROOT_PARENT ()); - colormap = gdk_window_get_colormap (GDK_ROOT_PARENT ()); + filename = gnome_program_locate_file (NULL, GNOME_FILE_DOMAIN_PIXMAP, "monitor.png", TRUE, NULL); + visual = gdk_drawable_get_visual (gdk_get_default_root_window ()); + colormap = gdk_drawable_get_colormap (gdk_get_default_root_window ()); - gtk_widget_push_visual (visual); gtk_widget_push_colormap (colormap); pixbuf = gdk_pixbuf_new_from_file (filename, NULL); if (pixbuf == NULL) return NULL; - pixmap = gdk_pixmap_new (GDK_ROOT_PARENT (), + pixmap = gdk_pixmap_new (gdk_get_default_root_window (), gdk_pixbuf_get_width (pixbuf), gdk_pixbuf_get_height (pixbuf), visual->depth); - mask = gdk_pixmap_new (GDK_ROOT_PARENT (), + mask = gdk_pixmap_new (gdk_get_default_root_window (), gdk_pixbuf_get_width (pixbuf), gdk_pixbuf_get_height (pixbuf), 1); - gc = gdk_gc_new (GDK_ROOT_PARENT ()); + gc = gdk_gc_new (gdk_get_default_root_window ()); gdk_pixbuf_render_threshold_alpha (pixbuf, mask, 0, 0, 0, 0, @@ -490,12 +485,11 @@ bg_applier_get_preview_widget (BGApplier *bg_applier) gdk_pixbuf_get_height (pixbuf), GDK_RGB_DITHER_MAX, 0, 0); - bg_applier->p->preview_widget = gtk_pixmap_new (pixmap, mask); + bg_applier->p->preview_widget = gtk_image_new_from_pixmap (pixmap, mask); gtk_widget_show (bg_applier->p->preview_widget); g_object_unref (G_OBJECT (pixbuf)); g_free (filename); - gtk_widget_pop_visual (); gtk_widget_pop_colormap (); return bg_applier->p->preview_widget; @@ -558,7 +552,7 @@ draw_disabled_message (GtkWidget *widget) y + (h - extents.height) / 2 + extents.height / 2, layout); - gdk_gc_unref (gc); + g_object_unref (G_OBJECT (gc)); g_object_unref (G_OBJECT (layout)); } @@ -675,7 +669,7 @@ render_wallpaper (BGApplier *bg_applier, const BGPreferences *prefs) if (bg_applier->p->wallpaper_pixbuf == NULL) return; - gdk_window_get_size (GDK_ROOT_PARENT (), &tmp1, &tmp2); + gdk_drawable_get_size (gdk_get_default_root_window (), &tmp1, &tmp2); virtual_geom.x = virtual_geom.y = 0; virtual_geom.width = tmp1; virtual_geom.height = tmp2; @@ -764,7 +758,7 @@ render_to_screen (BGApplier *bg_applier, const BGPreferences *prefs) g_return_if_fail (prefs != NULL); g_return_if_fail (IS_BG_PREFERENCES (prefs)); - gc = gdk_gc_new (GDK_ROOT_PARENT ()); + gc = gdk_gc_new (gdk_get_default_root_window ()); if (bg_applier->p->pixbuf != NULL) { if (bg_applier->p->pixbuf_render_geom.x != 0 || @@ -772,7 +766,14 @@ render_to_screen (BGApplier *bg_applier, const BGPreferences *prefs) bg_applier->p->pixbuf_render_geom.width != bg_applier->p->render_geom.width || bg_applier->p->pixbuf_render_geom.height != bg_applier->p->render_geom.height) { - gdk_color_alloc (gdk_window_get_colormap (GDK_ROOT_PARENT ()), prefs->color1); + gboolean success; + +#if 0 + gdk_color_alloc (gdk_window_get_colormap (gdk_get_default_root_window ()), prefs->color1); +#else + gdk_colormap_alloc_colors (gdk_drawable_get_colormap (gdk_get_default_root_window ()), + prefs->color1, 1, FALSE, TRUE, &success); +#endif gdk_gc_set_foreground (gc, prefs->color1); gdk_draw_rectangle (bg_applier->p->pixmap, gc, TRUE, bg_applier->p->render_geom.x, @@ -793,12 +794,26 @@ render_to_screen (BGApplier *bg_applier, const BGPreferences *prefs) GDK_RGB_DITHER_MAX, 0, 0); } else { if (bg_applier->p->type == BG_APPLIER_ROOT) { - gdk_color_alloc (gdk_window_get_colormap (GDK_ROOT_PARENT()), prefs->color1); - gdk_window_set_background (GDK_ROOT_PARENT (), prefs->color1); - gdk_window_clear (GDK_ROOT_PARENT ()); + gboolean success; + +#if 0 + gdk_color_alloc (gdk_window_get_colormap (gdk_get_default_root_window()), prefs->color1); +#else + gdk_colormap_alloc_colors (gdk_drawable_get_colormap (gdk_get_default_root_window ()), + prefs->color1, 1, FALSE, TRUE, &success); +#endif + gdk_window_set_background (gdk_get_default_root_window (), prefs->color1); + gdk_window_clear (gdk_get_default_root_window ()); } else if (bg_applier->p->type == BG_APPLIER_PREVIEW) { + gboolean success; + +#if 0 gdk_color_alloc (gdk_window_get_colormap (bg_applier->p->preview_widget->window), prefs->color1); +#else + gdk_colormap_alloc_colors (gdk_drawable_get_colormap (gdk_get_default_root_window ()), + prefs->color1, 1, FALSE, TRUE, &success); +#endif gdk_gc_set_foreground (gc, prefs->color1); gdk_draw_rectangle (bg_applier->p->pixmap, gc, TRUE, bg_applier->p->render_geom.x, @@ -851,7 +866,11 @@ create_pixmap (BGApplier *bg_applier, const BGPreferences *prefs) if (!GTK_WIDGET_REALIZED (bg_applier->p->preview_widget)) gtk_widget_realize (bg_applier->p->preview_widget); +#if 0 bg_applier->p->pixmap = GTK_PIXMAP (bg_applier->p->preview_widget)->pixmap; +#else + gtk_image_get_pixmap (GTK_IMAGE (bg_applier->p->preview_widget), &bg_applier->p->pixmap, NULL); +#endif bg_applier->p->pixmap_is_set = TRUE; break; } @@ -1266,7 +1285,7 @@ wallpaper_full_cover_p (const BGApplier *bg_applier, const BGPreferences *prefs) else if (prefs->wallpaper_type == WPTYPE_STRETCHED) return TRUE; - gdk_window_get_size (GDK_ROOT_PARENT (), &swidth, &sheight); + gdk_drawable_get_size (gdk_get_default_root_window (), &swidth, &sheight); pwidth = gdk_pixbuf_get_width (bg_applier->p->wallpaper_pixbuf); pheight = gdk_pixbuf_get_height (bg_applier->p->wallpaper_pixbuf); diff --git a/libbackground/preferences.c b/libbackground/preferences.c index ddf377bf4..be56ffd78 100644 --- a/libbackground/preferences.c +++ b/libbackground/preferences.c @@ -25,6 +25,7 @@ # include "config.h" #endif +#include #include #include @@ -267,7 +268,11 @@ read_color_from_string (const gchar *string) rgb = ((color->red >> 8) << 16) || ((color->green >> 8) << 8) || (color->blue >> 8); +#if 0 color->pixel = gdk_rgb_xpixel_from_rgb (rgb); +#else + gdk_rgb_find_color (gdk_rgb_get_colormap (), color); +#endif } return color;