diff gtk/gtkdocklet.c @ 14683:a8c2af13b96d

[gaim-migrate @ 17435] Fix the docklet on wingaim. What is the plan for the docklet prefs? committer: Tailor Script <[e-mail]>

--- a/gtk/gtkdocklet.c	Fri Oct 06 00:10:34 2006 +0000
+++ b/gtk/gtkdocklet.c	Fri Oct 06 05:03:28 2006 +0000
@@ -30,12 +30,10 @@
 #include "prefs.h"
 #include "signals.h"
 #include "sound.h"
-#include "version.h"
 
 #include "gtkaccount.h"
 #include "gtkblist.h"
 #include "gtkconv.h"
-#include "gtkft.h"
 #include "gtkplugin.h"
 #include "gtkprefs.h"
 #include "gtksavedstatuses.h"
@@ -43,8 +41,6 @@
 #include "gtkutils.h"
 #include "gaimstock.h"
 #include "gtkdocklet.h"
-
-#include "gaim.h"
 #include "gtkdialogs.h"
 
 #ifndef DOCKLET_TOOLTIP_LINE_LIMIT
@@ -256,11 +252,13 @@
 /**************************************************************************
  * callbacks and signal handlers
  **************************************************************************/
+#if 0
 static void 
 gaim_quit_cb() 
 {
 	/* TODO: confirm quit while pending */
 }
+#endif
 
 static void
 docklet_update_status_cb(void *data)
@@ -269,13 +267,6 @@
 }
 
 static void
-docklet_prefs_cb(const char *name, GaimPrefType type,
-				 gconstpointer val, gpointer data)
-{
-	docklet_update_status();
-}
-
-static void
 docklet_conv_updated_cb(GaimConversation *conv, GaimConvUpdateType type)
 {
 	if (type == GAIM_CONV_UPDATE_UNSEEN)
@@ -602,26 +593,23 @@
 	return &i;
 }
 
-void 
+void
 gaim_gtk_docklet_init()
 {
 	void *conn_handle = gaim_connections_get_handle();
 	void *conv_handle = gaim_conversations_get_handle();
 	void *accounts_handle = gaim_accounts_get_handle();
-	void *core_handle = gaim_get_core();
 	void *docklet_handle = gaim_gtk_docklet_get_handle();
-	
-	gaim_debug(GAIM_DEBUG_INFO, "docklet", "plugin loaded\n");
 
-        gaim_prefs_add_none("/plugins/gtk/docklet");
-        gaim_prefs_add_string("/plugins/gtk/docklet/blink_im", "hidden");
-        gaim_prefs_add_string("/plugins/gtk/docklet/blink_chat", "never");
-	
+	gaim_prefs_add_none("/plugins/gtk/docklet");
+	gaim_prefs_add_string("/plugins/gtk/docklet/blink_im", "hidden");
+	gaim_prefs_add_string("/plugins/gtk/docklet/blink_chat", "never");
+
 	docklet_ui_init();
 	if (ui_ops && ui_ops->create)
 		ui_ops->create();
 	gaim_signal_connect(conn_handle, "signed-on",
-	    		    docklet_handle, GAIM_CALLBACK(docklet_signed_on_cb), NULL);
+			    docklet_handle, GAIM_CALLBACK(docklet_signed_on_cb), NULL);
 	gaim_signal_connect(conn_handle, "signed-off",
 			    docklet_handle, GAIM_CALLBACK(docklet_signed_off_cb), NULL);
 	gaim_signal_connect(accounts_handle, "account-status-changed",
@@ -634,9 +622,10 @@
 			    docklet_handle, GAIM_CALLBACK(docklet_update_status_cb), NULL);
 	gaim_signal_connect(conv_handle, "conversation-updated",
 			    docklet_handle, GAIM_CALLBACK(docklet_conv_updated_cb), NULL);
-
-	gaim_signal_connect(core_handle, "quitting",
-						NULL, GAIM_CALLBACK(gaim_quit_cb), NULL);
+#if 0
+	gaim_signal_connect(gaim_get_core(), "quitting",
+			    docklet_handle, GAIM_CALLBACK(gaim_quit_cb), NULL);
+#endif
 
 /*	gaim_prefs_connect_callback(plugin, "/plugins/gtk/docklet/blink_im",
 								docklet_prefs_cb, NULL);
@@ -653,6 +642,7 @@
 		ui_ops->destroy();
 }
 
+#if 0
 static GtkWidget *
 plugin_config_frame(GaimPlugin *plugin)
 {
@@ -686,9 +676,5 @@
 	gtk_widget_show_all(frame);
 	return frame;
 }
+#endif
 
-static GaimGtkPluginUiInfo ui_info =
-{
-	plugin_config_frame,
-	0 /* page_num (Reserved) */
-};