pidgin: 307e9086: Correctly set up the prefs for the dockl...

[qulogic at pidgin.im]

----------------------------------------------------------------------
Revision: 307e908687637931b9f8ae0227fcd515724bdd13
Parent:   85e7b7db1a0f6770ffea92e171de90d309c603be
Author:   qulogic at pidgin.im
Date:     01/05/11 23:15:28
Branch:   im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/307e908687637931b9f8ae0227fcd515724bdd13

Changelog: 

Correctly set up the prefs for the docklet.

Changes against parent 85e7b7db1a0f6770ffea92e171de90d309c603be

  patched  pidgin/gtkdocklet-gtk.c

-------------- next part --------------
============================================================
--- pidgin/gtkdocklet-gtk.c	1c19d9fa2315562ea3dd1b54d8d8716870c2026c
+++ pidgin/gtkdocklet-gtk.c	87b17638595b6b1ebfdf232f8cd5f7ad61bdf557
@@ -54,6 +54,7 @@ docklet_gtk_embed_timeout_cb(gpointer da
 	 */
 	purple_debug_info("docklet", "failed to embed within timeout\n");
 	pidgin_docklet_remove();
+	purple_prefs_set_bool(PIDGIN_PREFS_ROOT "/docklet/gtk/embedded", FALSE);
 
 	embed_timeout = 0;
 	return FALSE;
@@ -255,6 +256,16 @@ docklet_ui_init(void)
 docklet_ui_init(void)
 {
 	pidgin_docklet_set_ui_ops(&ui_ops);
+
+	purple_prefs_add_none(PIDGIN_PREFS_ROOT "/docklet/gtk");
+	if (purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/docklet/x11/embedded")) {
+		purple_prefs_add_bool(PIDGIN_PREFS_ROOT "/docklet/gtk/embedded", TRUE);
+		purple_prefs_remove(PIDGIN_PREFS_ROOT "/docklet/x11/embedded");
+	} else {
+		purple_prefs_add_bool(PIDGIN_PREFS_ROOT "/docklet/gtk/embedded", FALSE);
+	}
+
 	gtk_icon_theme_append_search_path(gtk_icon_theme_get_default(),
 		DATADIR G_DIR_SEPARATOR_S "pixmaps" G_DIR_SEPARATOR_S "pidgin" G_DIR_SEPARATOR_S "tray");
 }
+