Mercurial > pidgin
changeset 26200:ea6b3aa222f1
merge of '96cf043274a971d5a2b9e01ef85fb60ca2a4bcd1'
and 'd70375c084af2336e7fc6646fb778120b05de9a8'
| author | Paul Aurich <paul@darkrain42.org> |
|---|---|
| date | Mon, 23 Mar 2009 03:06:36 +0000 |
| parents | bdb34fc5d889 (current diff) b23211876f47 (diff) |
| children | fb7b216ead22 |
| files | |
| diffstat | 5 files changed, 8 insertions(+), 11 deletions(-) [+] |
line wrap: on
line diff
--- 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)
--- 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);
--- 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);
--- 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"},
--- 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); }