Mercurial > pidgin.yaz

comparison pidgin/gtkmenutray.c @ 29522:739886e6dac2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
propagate from branch 'im.pidgin.pidgin' (head 667654b3309008b53bf4d9df02bd401d1ede8db5) to branch 'im.pidgin.pidgin.next.minor' (head e37d7dfead3e1864f8de0c0397a8f6471af07e29)
author John Bailey <rekkanoryo@rekkanoryo.org>
date Mon, 12 Oct 2009 22:40:37 +0000
parents 48ea900ee72a
children
comparison
equal deleted inserted replaced
28747:f55bd60e2738 29522:739886e6dac2
136 } 136 }
137 137
138 static void 138 static void
139 pidgin_menu_tray_init(PidginMenuTray *menu_tray) { 139 pidgin_menu_tray_init(PidginMenuTray *menu_tray) {
140 GtkWidget *widget = GTK_WIDGET(menu_tray); 140 GtkWidget *widget = GTK_WIDGET(menu_tray);
141 #if GTK_CHECK_VERSION(2,2,0)
142 GtkSettings *settings; 141 GtkSettings *settings;
143 #endif
144 gint height = -1; 142 gint height = -1;
145 143
146 gtk_menu_item_set_right_justified(GTK_MENU_ITEM(menu_tray), TRUE); 144 gtk_menu_item_set_right_justified(GTK_MENU_ITEM(menu_tray), TRUE);
147 145
148 if(!GTK_IS_WIDGET(menu_tray->tray)) 146 if(!GTK_IS_WIDGET(menu_tray->tray))
149 menu_tray->tray = gtk_hbox_new(FALSE, 0); 147 menu_tray->tray = gtk_hbox_new(FALSE, 0);
150 148
151 #if GTK_CHECK_VERSION(2,2,0)
152 settings = 149 settings =
153 gtk_settings_get_for_screen(gtk_widget_get_screen(widget)); 150 gtk_settings_get_for_screen(gtk_widget_get_screen(widget));
154 151
155 if(gtk_icon_size_lookup_for_settings(settings, GTK_ICON_SIZE_MENU, 152 if(gtk_icon_size_lookup_for_settings(settings, GTK_ICON_SIZE_MENU,
156 NULL, &height)) 153 NULL, &height))
157 #else
158 if(gtk_icon_size_lookup(GTK_ICON_SIZE_MENU, NULL, &height))
159 #endif
160 { 154 {
161 gtk_widget_set_size_request(widget, -1, height); 155 gtk_widget_set_size_request(widget, -1, height);
162 } 156 }
163 157
164 gtk_widget_show(menu_tray->tray); 158 gtk_widget_show(menu_tray->tray);