# HG changeset patch
# User Richard Laager <rlaager@wiktel.com>
# Date 1177734222 0
# Node ID db7e68346e44eaca58deb5bb246ab452787e6804
# Parent  d212880d8d5b3efd49cc6265bad8b63f39c6321a# Parent  45773df910e0e2517c2449be9183c398489ab7bc
merge of '17c8f178728e61d42fa98ed6205a73cd2e5d21af'
     and '3ec872c5acc8cc8fe8216af9473507e2912c0847'

diff -r d212880d8d5b -r db7e68346e44 finch/finch.c
--- a/finch/finch.c	Sat Apr 28 04:22:37 2007 +0000
+++ b/finch/finch.c	Sat Apr 28 04:23:42 2007 +0000
@@ -328,8 +328,7 @@
 	/* TODO: Move prefs loading into purple_prefs_init() */
 	purple_prefs_load();
 	purple_prefs_update_old();
-	purple_prefs_rename("/gaim/gnt", "/finch");
-	purple_prefs_rename("/purple/gnt", "/finch");
+	finch_prefs_update_old();
 
 	/* load plugins we had when we quit */
 	purple_plugins_load_saved("/finch/plugins/loaded");
diff -r d212880d8d5b -r db7e68346e44 finch/gntprefs.c
--- a/finch/gntprefs.c	Sat Apr 28 04:22:37 2007 +0000
+++ b/finch/gntprefs.c	Sat Apr 28 04:23:42 2007 +0000
@@ -42,9 +42,19 @@
 
 	purple_prefs_add_none("/finch/conversations");
 	purple_prefs_add_bool("/finch/conversations/timestamps", TRUE);
-	purple_prefs_add_bool("/finch/conversations/notify_typing", FALSE); /* XXX: Not functional yet */
+	purple_prefs_add_bool("/finch/conversations/notify_typing", FALSE);
+}
+
+void finch_prefs_update_old()
+{
+	const char *str = NULL;
+
 	purple_prefs_rename("/gaim/gnt", "/finch");
 	purple_prefs_rename("/purple/gnt", "/finch");
+
+	if ((str = purple_prefs_get_string("/purple/away/idle_reporting")) &&
+			strcmp(str, "gaim") == 0)
+		purple_prefs_set_string("/purple/away/idle_reporting", "purple");
 }
 
 typedef struct
diff -r d212880d8d5b -r db7e68346e44 finch/gntprefs.h
--- a/finch/gntprefs.h	Sat Apr 28 04:22:37 2007 +0000
+++ b/finch/gntprefs.h	Sat Apr 28 04:23:42 2007 +0000
@@ -40,6 +40,10 @@
  */
 void finch_prefs_show_all(void);
 
+/**
+ * You don't need to know about this.
+ */
+void finch_prefs_update_old(void);
 /*@}*/
 
 #endif
diff -r d212880d8d5b -r db7e68346e44 pidgin/gtkdocklet-x11.c
--- a/pidgin/gtkdocklet-x11.c	Sat Apr 28 04:22:37 2007 +0000
+++ b/pidgin/gtkdocklet-x11.c	Sat Apr 28 04:23:42 2007 +0000
@@ -77,7 +77,7 @@
 	g_object_unref(G_OBJECT(docklet));
 	docklet = NULL;
 
-	g_idle_add(docklet_x11_create_cb, NULL);
+	g_idle_add(docklet_x11_recreate_cb, NULL);
 }
 
 static void