comparison gtk/gtkdocklet-x11.c @ 14873:3a23706f9f4b

[gaim-migrate @ 17642] Show icon pref. No way to change it yet (other than your editor) committer: Tailor Script <tailor@pidgin.im>
author Sean Egan <seanegan@gmail.com>
date Wed, 01 Nov 2006 00:57:39 +0000
parents 510da3975938
children 650dee386bf6
comparison
equal deleted inserted replaced
14872:a73b2b332ec2 14873:3a23706f9f4b
206 static void 206 static void
207 docklet_x11_destroy() 207 docklet_x11_destroy()
208 { 208 {
209 g_return_if_fail(docklet != NULL); 209 g_return_if_fail(docklet != NULL);
210 210
211 if (embed_timeout)
212 g_source_remove(embed_timeout);
213
211 gaim_gtk_docklet_remove(); 214 gaim_gtk_docklet_remove();
212 215
213 g_signal_handlers_disconnect_by_func(G_OBJECT(docklet), G_CALLBACK(docklet_x11_destroyed_cb), NULL); 216 g_signal_handlers_disconnect_by_func(G_OBJECT(docklet), G_CALLBACK(docklet_x11_destroyed_cb), NULL);
214 gtk_widget_destroy(GTK_WIDGET(docklet)); 217 gtk_widget_destroy(GTK_WIDGET(docklet));
215 218
216 g_object_unref(G_OBJECT(docklet)); 219 g_object_unref(G_OBJECT(docklet));
217 docklet = NULL; 220 docklet = NULL;