Mercurial > pidgin
diff src/gtkmenutray.c @ 11888:7d2d926704aa
[gaim-migrate @ 14179]
Gtk 2.0 support. Deja Vu.
committer: Tailor Script <tailor@pidgin.im>
| author | Stu Tomlinson <stu@nosnilmot.com> |
|---|---|
| date | Sat, 29 Oct 2005 14:45:15 +0000 |
| parents | c9188d3eb9d3 |
| children | 34ea75bdd0c9 |
line wrap: on
line diff
--- a/src/gtkmenutray.c Sat Oct 29 13:23:19 2005 +0000 +++ b/src/gtkmenutray.c Sat Oct 29 14:45:15 2005 +0000 @@ -121,7 +121,9 @@ static void gaim_gtk_menu_tray_init(GaimGtkMenuTray *menu_tray) { GtkWidget *widget = GTK_WIDGET(menu_tray); +#if GTK_CHECK_VERSION(2,2,0) GtkSettings *settings; +#endif gint height = -1; gtk_menu_item_set_right_justified(GTK_MENU_ITEM(menu_tray), TRUE); @@ -132,12 +134,12 @@ #if GTK_CHECK_VERSION(2,2,0) settings = gtk_settings_get_for_screen(gtk_widget_get_screen(widget)); -#else - settings = gtk_settings_get_default(); -#endif if(gtk_icon_size_lookup_for_settings(settings, GTK_ICON_SIZE_MENU, NULL, &height)) +#else + if(gtk_icon_size_lookup(GTK_ICON_SIZE_MENU, NULL, &height)) +#endif { gtk_widget_set_size_request(widget, -1, height); }