From bc85298dcb164d7069fb866c2d344af8d0267cda Mon Sep 17 00:00:00 2001 From: Thomas Hindoe Paaboel Andersen Date: Mon, 23 Feb 2009 18:15:51 +0000 Subject: [PATCH] Replace following deprecated gtk symbols: gtk_box_pack_start_defaults, gtk_widget_set_usize, and GTK_CHECK_* Bug #572325 svn path=/trunk/; revision=9284 --- ChangeLog | 8 ++++++++ capplets/keybindings/eggcellrendererkeys.h | 10 +++++----- capplets/keybindings/gnome-keybinding-properties.c | 2 +- capplets/keyboard/gnome-keyboard-properties-xkbot.c | 2 +- 4 files changed, 15 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0f5367e70..a6b028aba 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2009-02-23 Thomas H.P. Andersen + + * capplets/keyboard/gnome-keyboard-properties-xkbot.c: + * capplets/keybindings/gnome-keybinding-properties.c: + * capplets/keybindings/eggcellrendererkeys.h: Replaces deprecated: + gtk_box_pack_start_defaults, gtk_widget_set_usize, and GTK_CHECK_*. + Bug #572325 + 2009-02-22 Thomas H.P. Andersen * capplets/appearance/appearance-font.c: diff --git a/capplets/keybindings/eggcellrendererkeys.h b/capplets/keybindings/eggcellrendererkeys.h index ed3451d2f..24e58aea2 100644 --- a/capplets/keybindings/eggcellrendererkeys.h +++ b/capplets/keybindings/eggcellrendererkeys.h @@ -26,11 +26,11 @@ G_BEGIN_DECLS #define EGG_TYPE_CELL_RENDERER_KEYS (egg_cell_renderer_keys_get_type ()) -#define EGG_CELL_RENDERER_KEYS(obj) (GTK_CHECK_CAST ((obj), EGG_TYPE_CELL_RENDERER_KEYS, EggCellRendererKeys)) -#define EGG_CELL_RENDERER_KEYS_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), EGG_TYPE_CELL_RENDERER_KEYS, EggCellRendererKeysClass)) -#define EGG_IS_CELL_RENDERER_KEYS(obj) (GTK_CHECK_TYPE ((obj), EGG_TYPE_CELL_RENDERER_KEYS)) -#define EGG_IS_CELL_RENDERER_KEYS_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), EGG_TYPE_CELL_RENDERER_KEYS)) -#define EGG_CELL_RENDERER_KEYS_GET_CLASS(obj) (GTK_CHECK_GET_CLASS ((obj), EGG_TYPE_CELL_RENDERER_KEYS, EggCellRendererKeysClass)) +#define EGG_CELL_RENDERER_KEYS(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), EGG_TYPE_CELL_RENDERER_KEYS, EggCellRendererKeys)) +#define EGG_CELL_RENDERER_KEYS_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), EGG_TYPE_CELL_RENDERER_KEYS, EggCellRendererKeysClass)) +#define EGG_IS_CELL_RENDERER_KEYS(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), EGG_TYPE_CELL_RENDERER_KEYS)) +#define EGG_IS_CELL_RENDERER_KEYS_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), EGG_TYPE_CELL_RENDERER_KEYS)) +#define EGG_CELL_RENDERER_KEYS_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), EGG_TYPE_CELL_RENDERER_KEYS, EggCellRendererKeysClass)) typedef struct _EggCellRendererKeys EggCellRendererKeys; typedef struct _EggCellRendererKeysClass EggCellRendererKeysClass; diff --git a/capplets/keybindings/gnome-keybinding-properties.c b/capplets/keybindings/gnome-keybinding-properties.c index 800211d60..f28a1b2e3 100644 --- a/capplets/keybindings/gnome-keybinding-properties.c +++ b/capplets/keybindings/gnome-keybinding-properties.c @@ -395,7 +395,7 @@ clear_old_model (GladeXML *dialog) gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (WID ("actions_swindow")), GTK_POLICY_NEVER, GTK_POLICY_NEVER); - gtk_widget_set_usize (WID ("actions_swindow"), -1, -1); + gtk_widget_set_size_request (WID ("actions_swindow"), -1, -1); } typedef struct { diff --git a/capplets/keyboard/gnome-keyboard-properties-xkbot.c b/capplets/keyboard/gnome-keyboard-properties-xkbot.c index 781ae83ee..f1cf08845 100644 --- a/capplets/keyboard/gnome-keyboard-properties-xkbot.c +++ b/capplets/keyboard/gnome-keyboard-properties-xkbot.c @@ -348,7 +348,7 @@ xkb_options_add_group (XklConfigRegistry * config_registry, (GCompareFunc) xkb_option_checks_compare); while (option_checks_list) { option_check = GTK_WIDGET (option_checks_list->data); - gtk_box_pack_start_defaults (GTK_BOX (vbox), option_check); + gtk_box_pack_start (GTK_BOX (vbox), option_check, TRUE, TRUE, 0); option_checks_list = option_checks_list->next; } /* free it */