comparison pidgin/gtkdocklet-x11.c @ 15439:a415922e2882

merge of '8f5c72b9dbcf628f35e4674469f97b34f9c6fa2c' and 'e082ba7b9cfaf0fef0531d0fe9b54af7831f75df'
author Ethan Blanton <elb@pidgin.im>
date Sun, 28 Jan 2007 01:24:15 +0000
parents ea9ec8c3a3b8
children d75099d2567e
comparison
equal deleted inserted replaced
15426:c9497aad9fc4 15439:a415922e2882
252 although docklet_refcount may be all hosed. hopefully won't happen. */ 252 although docklet_refcount may be all hosed. hopefully won't happen. */
253 gaim_debug(GAIM_DEBUG_WARNING, "docklet", "trying to create icon but it already exists?\n"); 253 gaim_debug(GAIM_DEBUG_WARNING, "docklet", "trying to create icon but it already exists?\n");
254 docklet_x11_destroy(); 254 docklet_x11_destroy();
255 } 255 }
256 256
257 docklet = egg_tray_icon_new("Gaim"); 257 docklet = egg_tray_icon_new(PIDGIN_NAME);
258 box = gtk_event_box_new(); 258 box = gtk_event_box_new();
259 image = gtk_image_new(); 259 image = gtk_image_new();
260 260
261 g_signal_connect(G_OBJECT(docklet), "embedded", G_CALLBACK(docklet_x11_embedded_cb), NULL); 261 g_signal_connect(G_OBJECT(docklet), "embedded", G_CALLBACK(docklet_x11_embedded_cb), NULL);
262 g_signal_connect(G_OBJECT(docklet), "destroy", G_CALLBACK(docklet_x11_destroyed_cb), NULL); 262 g_signal_connect(G_OBJECT(docklet), "destroy", G_CALLBACK(docklet_x11_destroyed_cb), NULL);