comparison pidgin/gtkdocklet-x11.c @ 29762:5a6c66d4de94

Make it slightly clearer which docklet is in use.
author Elliott Sales de Andrade <qulogic@pidgin.im>
date Tue, 16 Feb 2010 00:03:52 +0000
parents 1446436616d4
children
comparison
equal deleted inserted replaced
29761:f52f167fb846 29762:5a6c66d4de94
59 } 59 }
60 60
61 static void 61 static void
62 docklet_x11_embedded_cb(GtkWidget *widget, void *data) 62 docklet_x11_embedded_cb(GtkWidget *widget, void *data)
63 { 63 {
64 purple_debug(PURPLE_DEBUG_INFO, "docklet", "embedded\n"); 64 purple_debug(PURPLE_DEBUG_INFO, "docklet", "X11 embedded\n");
65 65
66 g_source_remove(embed_timeout); 66 g_source_remove(embed_timeout);
67 embed_timeout = 0; 67 embed_timeout = 0;
68 pidgin_docklet_embedded(); 68 pidgin_docklet_embedded();
69 purple_prefs_set_bool(PIDGIN_PREFS_ROOT "/docklet/x11/embedded", FALSE); 69 purple_prefs_set_bool(PIDGIN_PREFS_ROOT "/docklet/x11/embedded", FALSE);
70 } 70 }
71 71
72 static void 72 static void
73 docklet_x11_destroyed_cb(GtkWidget *widget, void *data) 73 docklet_x11_destroyed_cb(GtkWidget *widget, void *data)
74 { 74 {
75 purple_debug(PURPLE_DEBUG_INFO, "docklet", "destroyed\n"); 75 purple_debug(PURPLE_DEBUG_INFO, "docklet", "X11 destroyed\n");
76 76
77 pidgin_docklet_remove(); 77 pidgin_docklet_remove();
78 78
79 g_object_unref(G_OBJECT(docklet)); 79 g_object_unref(G_OBJECT(docklet));
80 docklet = NULL; 80 docklet = NULL;
252 g_object_unref(G_OBJECT(blank_icon)); 252 g_object_unref(G_OBJECT(blank_icon));
253 blank_icon = NULL; 253 blank_icon = NULL;
254 254
255 image = NULL; 255 image = NULL;
256 256
257 purple_debug(PURPLE_DEBUG_INFO, "docklet", "destroyed\n"); 257 purple_debug(PURPLE_DEBUG_INFO, "docklet", "X11 destroyed\n");
258 } 258 }
259 259
260 static gboolean 260 static gboolean
261 docklet_x11_embed_timeout_cb(gpointer data) 261 docklet_x11_embed_timeout_cb(gpointer data)
262 { 262 {
263 /* The docklet was not embedded within the timeout. 263 /* The docklet was not embedded within the timeout.
264 * Remove it as a visibility manager, but leave the plugin 264 * Remove it as a visibility manager, but leave the plugin
265 * loaded so that it can embed automatically if/when a notification 265 * loaded so that it can embed automatically if/when a notification
266 * area becomes available. 266 * area becomes available.
267 */ 267 */
268 purple_debug_info("docklet", "failed to embed within timeout\n"); 268 purple_debug_info("docklet", "X11 failed to embed within timeout\n");
269 pidgin_docklet_remove(); 269 pidgin_docklet_remove();
270 270
271 return FALSE; 271 return FALSE;
272 } 272 }
273 273
326 } else { 326 } else {
327 embed_timeout = g_timeout_add(SHORT_EMBED_TIMEOUT, docklet_x11_embed_timeout_cb, NULL); 327 embed_timeout = g_timeout_add(SHORT_EMBED_TIMEOUT, docklet_x11_embed_timeout_cb, NULL);
328 } 328 }
329 } 329 }
330 330
331 purple_debug(PURPLE_DEBUG_INFO, "docklet", "created\n"); 331 purple_debug(PURPLE_DEBUG_INFO, "docklet", "X11 created\n");
332 } 332 }
333 333
334 static void 334 static void
335 docklet_x11_create_ui_op(void) 335 docklet_x11_create_ui_op(void)
336 { 336 {