# HG changeset patch
# User Paul Aurich <paul@darkrain42.org>
# Date 1237527964 0
# Node ID e1b91b7b5f6907243b5270a2823727313694449b
# Parent  bcbc5994d21c46bac8eadd4de4bfea3ff605702c# Parent  e6a7f95cbcc3ae96e4a558e5d4607afa8ce3652e
merge of '7829ec76bdb008583f8da54e238c2265a1140db2'
     and 'e10c42213b8452c2fd4906e4ca501ef3eb83bd69'

diff -r bcbc5994d21c -r e1b91b7b5f69 pidgin/gtkdialogs.c
--- a/pidgin/gtkdialogs.c	Fri Mar 20 02:42:38 2009 +0000
+++ b/pidgin/gtkdialogs.c	Fri Mar 20 05:46:04 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 bcbc5994d21c -r e1b91b7b5f69 pidgin/gtkprefs.c
--- a/pidgin/gtkprefs.c	Fri Mar 20 02:42:38 2009 +0000
+++ b/pidgin/gtkprefs.c	Fri Mar 20 05:46:04 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);
 	}