# HG changeset patch
# User Nathan Walp <nwalp@pidgin.im>
# Date 1134840954 0
# Node ID dd2b171a624cdaad28a292905bbc6f78f9b05061
# Parent  977ebab0435f1e6a41d2b265bb61f95185417c4b
[gaim-migrate @ 14837]
this fixes having the docklet enabled at startup.  Since the signed-on signal
gets emitted at almost the exact same time as the account-connecting signal,
I have no problem removing the duplication.

committer: Tailor Script <tailor@pidgin.im>

diff -r 977ebab0435f -r dd2b171a624c plugins/docklet/docklet-x11.c
--- a/plugins/docklet/docklet-x11.c	Sat Dec 17 15:40:06 2005 +0000
+++ b/plugins/docklet/docklet-x11.c	Sat Dec 17 17:35:54 2005 +0000
@@ -113,7 +113,8 @@
 			break;
 	}
 
-	gtk_image_set_from_stock(GTK_IMAGE(image), icon_name, GTK_ICON_SIZE_LARGE_TOOLBAR);
+	if(icon_name)
+		gtk_image_set_from_stock(GTK_IMAGE(image), icon_name, GTK_ICON_SIZE_LARGE_TOOLBAR);
 
 #if 0
 	GdkPixbuf *p;
diff -r 977ebab0435f -r dd2b171a624c plugins/docklet/docklet.c
--- a/plugins/docklet/docklet.c	Sat Dec 17 15:40:06 2005 +0000
+++ b/plugins/docklet/docklet.c	Sat Dec 17 17:35:54 2005 +0000
@@ -144,7 +144,7 @@
 		pending = TRUE;
 
 		/* set tooltip if messages are pending */
-		if (ui_ops->set_tooltip) {
+		if (0 && ui_ops->set_tooltip) {
 			GString *tooltip_text = g_string_new("");
 			for (l = convs, count = 0 ; l != NULL ; l = l->next, count++) {
 				if (GAIM_IS_GTK_CONVERSATION(l->data)) {
@@ -246,7 +246,8 @@
 
 	while(c != NULL) {
 		GaimConnection *gc = c->data;
-		if (GAIM_PLUGIN_PROTOCOL_INFO(gc->prpl)->chat_info != NULL)
+		GaimPluginProtocolInfo *prpl_info = GAIM_PLUGIN_PROTOCOL_INFO(gc->prpl);
+		if (prpl_info != NULL && prpl_info->chat_info != NULL)
 			return TRUE;
 		c = c->next;
 	}
@@ -515,13 +516,10 @@
 	docklet_ui_init();
 	if (ui_ops && ui_ops->create)
 		ui_ops->create();
-
 	gaim_signal_connect(conn_handle, "signed-on",
 						plugin, GAIM_CALLBACK(docklet_signed_on_cb), NULL);
 	gaim_signal_connect(conn_handle, "signed-off",
 						plugin, GAIM_CALLBACK(docklet_signed_off_cb), NULL);
-	gaim_signal_connect(accounts_handle, "account-connecting",
-						plugin, GAIM_CALLBACK(docklet_update_status_cb), NULL);
 	gaim_signal_connect(accounts_handle, "account-status-changed",
 						plugin, GAIM_CALLBACK(docklet_update_status_cb), NULL);
 	gaim_signal_connect(conv_handle, "received-im-msg",