Mercurial > pidgin.yaz
comparison pidgin/gtkdocklet-x11.c @ 29522:739886e6dac2
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 | 1446436616d4 |
comparison
equal
deleted
inserted
replaced
28747:f55bd60e2738 | 29522:739886e6dac2 |
---|---|
203 gtk_tooltips_set_tip(tooltips, image->parent, "", NULL); | 203 gtk_tooltips_set_tip(tooltips, image->parent, "", NULL); |
204 gtk_tooltips_disable(tooltips); | 204 gtk_tooltips_disable(tooltips); |
205 } | 205 } |
206 } | 206 } |
207 | 207 |
208 #if GTK_CHECK_VERSION(2,2,0) | |
209 static void | 208 static void |
210 docklet_x11_position_menu(GtkMenu *menu, int *x, int *y, gboolean *push_in, | 209 docklet_x11_position_menu(GtkMenu *menu, int *x, int *y, gboolean *push_in, |
211 gpointer user_data) | 210 gpointer user_data) |
212 { | 211 { |
213 GtkWidget *widget = GTK_WIDGET(docklet); | 212 GtkWidget *widget = GTK_WIDGET(docklet); |
228 *x = menu_xpos; | 227 *x = menu_xpos; |
229 *y = menu_ypos; | 228 *y = menu_ypos; |
230 | 229 |
231 *push_in = TRUE; | 230 *push_in = TRUE; |
232 } | 231 } |
233 #endif | |
234 | 232 |
235 static void | 233 static void |
236 docklet_x11_destroy(void) | 234 docklet_x11_destroy(void) |
237 { | 235 { |
238 g_return_if_fail(docklet != NULL); | 236 g_return_if_fail(docklet != NULL); |
342 docklet_x11_create_ui_op, | 340 docklet_x11_create_ui_op, |
343 docklet_x11_destroy, | 341 docklet_x11_destroy, |
344 docklet_x11_update_icon, | 342 docklet_x11_update_icon, |
345 docklet_x11_blank_icon, | 343 docklet_x11_blank_icon, |
346 docklet_x11_set_tooltip, | 344 docklet_x11_set_tooltip, |
347 #if GTK_CHECK_VERSION(2,2,0) | |
348 docklet_x11_position_menu | 345 docklet_x11_position_menu |
349 #else | |
350 NULL | |
351 #endif | |
352 }; | 346 }; |
353 | 347 |
354 void | 348 void |
355 docklet_ui_init() | 349 docklet_ui_init() |
356 { | 350 { |