Mercurial > pidgin
changeset 24220:a7e1edeb3ac6
merge of '791f3e070376e218af0a5c33695979827bbda747'
and 'f9c75197f0a1451c4c5cc375d37cc5aa441c82a8'
| author | Elliott Sales de Andrade <qulogic@pidgin.im> |
|---|---|
| date | Thu, 02 Oct 2008 04:59:11 +0000 |
| parents | 3a5ae157b730 (current diff) 40d03c5388ad (diff) |
| children | 89cb9c0f5bd9 |
| files | |
| diffstat | 4 files changed, 12 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/protocols/jabber/jabber.c Thu Oct 02 01:02:44 2008 +0000 +++ b/libpurple/protocols/jabber/jabber.c Thu Oct 02 04:59:11 2008 +0000 @@ -131,6 +131,9 @@ } if((my_jb = jabber_buddy_find(js, full_jid, TRUE))) my_jb->subscription |= JABBER_SUB_BOTH; + + purple_connection_set_display_name(js->gc, full_jid); + g_free(full_jid); } } else {
--- a/pidgin/gtkaccount.c Thu Oct 02 01:02:44 2008 +0000 +++ b/pidgin/gtkaccount.c Thu Oct 02 04:59:11 2008 +0000 @@ -451,7 +451,8 @@ if (dialog->account != NULL) username = g_strdup(purple_account_get_username(dialog->account)); - if (!username && PURPLE_PROTOCOL_PLUGIN_HAS_FUNC(dialog->prpl_info, get_account_text_table)) { + if (!username && dialog->prpl_info + && PURPLE_PROTOCOL_PLUGIN_HAS_FUNC(dialog->prpl_info, get_account_text_table)) { GdkColor color = {0, 34952, 35466, 34181}; GHashTable *table; const char *label;
--- a/pidgin/plugins/notify.c Thu Oct 02 01:02:44 2008 +0000 +++ b/pidgin/plugins/notify.c Thu Oct 02 04:59:11 2008 +0000 @@ -557,9 +557,7 @@ static void handle_urgent(PidginWindow *win, gboolean set) { -#ifndef _WIN32 pidgin_set_urgent(GTK_WINDOW(win->window), set); -#endif } static void @@ -767,12 +765,15 @@ /* Urgent method button */ toggle = gtk_check_button_new_with_mnemonic(_("Set window manager \"_URGENT\" hint")); +#else + /* TODO: When we're not string frozen, mark for translation */ + toggle = gtk_check_button_new_with_mnemonic("_Flash window"); +#endif gtk_box_pack_start(GTK_BOX(vbox), toggle, FALSE, FALSE, 0); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(toggle), purple_prefs_get_bool("/plugins/gtk/X11/notify/method_urgent")); g_signal_connect(G_OBJECT(toggle), "toggled", G_CALLBACK(method_toggle_cb), "method_urgent"); -#endif /* Raise window method button */ toggle = gtk_check_button_new_with_mnemonic(_("R_aise conversation window"));
--- a/pidgin/win32/winpidgin.c Thu Oct 02 01:02:44 2008 +0000 +++ b/pidgin/win32/winpidgin.c Thu Oct 02 04:59:11 2008 +0000 @@ -212,6 +212,9 @@ return; } + /* Set $HOME so that the GTK+ settings get stored in the right place */ + _snprintf(path2, sizeof(path2), "HOME=%s", path); + _putenv(path2); /* Set up the settings dir base to be \\path\to * The actual settings dir will be \\path\to\.purple */