# HG changeset patch
# User Paul Aurich <paul@darkrain42.org>
# Date 1237777596 0
# Node ID ea6b3aa222f19d58324b54aebf78edbda29ef1ee
# Parent  bdb34fc5d8891acd0126cd688fd6605d6ca2e0bf# Parent  b23211876f478a1c92e9c7b89e4d5792ac8eec0e
merge of '96cf043274a971d5a2b9e01ef85fb60ca2a4bcd1'
     and 'd70375c084af2336e7fc6646fb778120b05de9a8'

diff -r bdb34fc5d889 -r ea6b3aa222f1 finch/gntlog.c
--- a/finch/gntlog.c	Mon Mar 23 02:10:44 2009 +0000
+++ b/finch/gntlog.c	Mon Mar 23 03:06:36 2009 +0000
@@ -66,7 +66,7 @@
 			g_str_hash(purple_account_get_username(viewer->account));
 	}
 
-	return (guint)viewer;
+	return g_direct_hash(viewer);
 }
 
 static gboolean log_viewer_equal(gconstpointer y, gconstpointer z)
diff -r bdb34fc5d889 -r ea6b3aa222f1 finch/gntplugin.c
--- a/finch/gntplugin.c	Mon Mar 23 02:10:44 2009 +0000
+++ b/finch/gntplugin.c	Mon Mar 23 03:06:36 2009 +0000
@@ -484,10 +484,10 @@
 				char *value = NULL;
 				switch(type) {
 					case PURPLE_PREF_BOOLEAN:
-						value = g_strdup_printf("%d", (int)list->next->data);
+						value = g_strdup_printf("%d", GPOINTER_TO_INT(list->next->data));
 						break;
 					case PURPLE_PREF_INT:
-						value = g_strdup_printf("%d", (int)list->next->data);
+						value = g_strdup_printf("%d", GPOINTER_TO_INT(list->next->data));
 						break;
 					case PURPLE_PREF_STRING:
 						value = g_strdup(list->next->data);
diff -r bdb34fc5d889 -r ea6b3aa222f1 finch/gntroomlist.c
--- a/finch/gntroomlist.c	Mon Mar 23 02:10:44 2009 +0000
+++ b/finch/gntroomlist.c	Mon Mar 23 03:06:36 2009 +0000
@@ -190,7 +190,7 @@
 				label = g_strdup(iter->data ? "True" : "False");
 				break;
 			case PURPLE_ROOMLIST_FIELD_INT:
-				label = g_strdup_printf("%d", (int)iter->data);
+				label = g_strdup_printf("%d", GPOINTER_TO_INT(iter->data));
 				break;
 			case PURPLE_ROOMLIST_FIELD_STRING:
 				label = g_strdup(iter->data);
diff -r bdb34fc5d889 -r ea6b3aa222f1 pidgin/gtkdialogs.c
--- a/pidgin/gtkdialogs.c	Mon Mar 23 02:10:44 2009 +0000
+++ b/pidgin/gtkdialogs.c	Mon Mar 23 03:06:36 2009 +0000
@@ -189,7 +189,7 @@
 	{N_("Italian"),             "it", "Claudio Satriano", "satriano@na.infn.it"},
 	{N_("Japanese"),            "ja", "Takashi Aihana", "aihana@gnome.gr.jp"},
 	{N_("Georgian"),            "ka", N_("Ubuntu Georgian Translators"), "alexander.didebulidze@stusta.mhn.de"},
-	{"Khmer",                   "km", "Khoem Sokhem", "khoemsokhem@khmeros.info"},
+	{N_("Khmer"),               "km", "Khoem Sokhem", "khoemsokhem@khmeros.info"},
 	{N_("Kannada"),             "kn", N_("Kannada Translation team"), "translation@sampada.info"},
 	{N_("Korean"),              "ko", "Sushizang", "sushizang@empal.com"},
 	{N_("Kurdish"),             "ku", "Erdal Ronahi", "erdal.ronahi@gmail.com"},
diff -r bdb34fc5d889 -r ea6b3aa222f1 pidgin/gtkprefs.c
--- a/pidgin/gtkprefs.c	Mon Mar 23 02:10:44 2009 +0000
+++ b/pidgin/gtkprefs.c	Mon Mar 23 03:06:36 2009 +0000
@@ -2385,14 +2385,12 @@
 	/* Auto-away stuff */
 	vbox = pidgin_make_frame(ret, _("Auto-away"));
 
-	button = pidgin_prefs_checkbox(_("Change status when _idle"),
-						   "/purple/away/away_when_idle", vbox);
-
 	select = pidgin_prefs_labeled_spin_button(vbox,
 			_("_Minutes before becoming idle:"), "/purple/away/mins_before_away",
 			1, 24 * 60, sg);
-	g_signal_connect(G_OBJECT(button), "clicked",
-					 G_CALLBACK(pidgin_toggle_sensitive), select);
+
+	button = pidgin_prefs_checkbox(_("Change status when _idle"),
+						   "/purple/away/away_when_idle", vbox);
 
 	/* TODO: Show something useful if we don't have any saved statuses. */
 	menu = pidgin_status_menu(purple_savedstatus_get_idleaway(), G_CALLBACK(set_idle_away));
@@ -2404,7 +2402,6 @@
 
 	if (!purple_prefs_get_bool("/purple/away/away_when_idle")) {
 		gtk_widget_set_sensitive(GTK_WIDGET(menu), FALSE);
-		gtk_widget_set_sensitive(GTK_WIDGET(select), FALSE);
 		gtk_widget_set_sensitive(GTK_WIDGET(label), FALSE);
 	}