# HG changeset patch # User Nathan Walp # Date 1182707572 0 # Node ID 589c9ebf84db64c8e73e19279565da55b1f4fb49 # Parent 08ec2f08e38cc0e0f9eba03553a9792436b07883# Parent dfe4d0a0a00e826c768c44562832d2f041cedbd3 merge of '683ac90580e5631dcc8b79c3caea1adc7b92ffec' and '947b20b6fc725a1f22dd7b7b23ebbaee89f0cfed' diff -r dfe4d0a0a00e -r 589c9ebf84db libpurple/protocols/oscar/peer.c --- a/libpurple/protocols/oscar/peer.c Sun Jun 24 17:52:00 2007 +0000 +++ b/libpurple/protocols/oscar/peer.c Sun Jun 24 17:52:52 2007 +0000 @@ -1019,7 +1019,7 @@ PURPLE_DEFAULT_ACTION_NONE, account, sn, NULL, conn, 2, - _("_Connect"), G_CALLBACK(peer_connection_got_proposition_yes_cb), + _("C_onnect"), G_CALLBACK(peer_connection_got_proposition_yes_cb), _("Cancel"), G_CALLBACK(peer_connection_got_proposition_no_cb)); } else if (args->type == OSCAR_CAPABILITY_SENDFILE) diff -r dfe4d0a0a00e -r 589c9ebf84db pidgin/gtkblist.c --- a/pidgin/gtkblist.c Sun Jun 24 17:52:00 2007 +0000 +++ b/pidgin/gtkblist.c Sun Jun 24 17:52:52 2007 +0000 @@ -2976,10 +2976,11 @@ signon = purple_presence_get_login_time(presence); if (full && PURPLE_BUDDY_IS_ONLINE(b) && signon > 0) { - if (time(NULL) - signon > 63072000 /* 2 years */) { + if (signon > time(NULL)) { /* - * Our local clock must be wrong, show the actual - * date instead of "4 days", etc. + * They signed on in the future?! Our local clock + * must be wrong, show the actual date instead of + * "4 days", etc. */ tmp = g_strdup(purple_date_format_long(localtime(&signon))); } else diff -r dfe4d0a0a00e -r 589c9ebf84db pidgin/gtkconv.c --- a/pidgin/gtkconv.c Sun Jun 24 17:52:00 2007 +0000 +++ b/pidgin/gtkconv.c Sun Jun 24 17:52:52 2007 +0000 @@ -8560,7 +8560,7 @@ win->gtkconvs = g_list_remove(win->gtkconvs, gtkconv); if (!win->gtkconvs || !win->gtkconvs->next) - gtk_notebook_set_show_tabs(win->notebook, FALSE); + gtk_notebook_set_show_tabs(GTK_NOTEBOOK(win->notebook), FALSE); if (!win->gtkconvs && win != hidden_convwin) pidgin_conv_window_destroy(win); diff -r dfe4d0a0a00e -r 589c9ebf84db pidgin/gtkprivacy.c --- a/pidgin/gtkprivacy.c Sun Jun 24 17:52:00 2007 +0000 +++ b/pidgin/gtkprivacy.c Sun Jun 24 17:52:52 2007 +0000 @@ -366,7 +366,7 @@ dialog = g_new0(PidginPrivacyDialog, 1); - dialog->win = pidgin_create_window(_("Privacy"), PIDGIN_HIG_BORDER, "privacy", FALSE); + dialog->win = pidgin_create_window(_("Privacy"), PIDGIN_HIG_BORDER, "privacy", TRUE); g_signal_connect(G_OBJECT(dialog->win), "delete_event", G_CALLBACK(destroy_cb), dialog); diff -r dfe4d0a0a00e -r 589c9ebf84db pidgin/gtksavedstatuses.c --- a/pidgin/gtksavedstatuses.c Sun Jun 24 17:52:00 2007 +0000 +++ b/pidgin/gtksavedstatuses.c Sun Jun 24 17:52:52 2007 +0000 @@ -1140,7 +1140,7 @@ if (edit) dialog->original_title = g_strdup(purple_savedstatus_get_title(saved_status)); - dialog->window = win = pidgin_create_window (_("Status"), PIDGIN_HIG_BORDER, "status", FALSE) ; + dialog->window = win = pidgin_create_window(_("Status"), PIDGIN_HIG_BORDER, "status", TRUE); g_signal_connect(G_OBJECT(win), "delete_event", G_CALLBACK(status_editor_destroy_cb), dialog); @@ -1475,7 +1475,7 @@ dialog->account = account; tmp = g_strdup_printf(_("Status for %s"), purple_account_get_username(account)); - dialog->window = win = pidgin_create_window(tmp, PIDGIN_HIG_BORDER, "substatus", FALSE) ; + dialog->window = win = pidgin_create_window(tmp, PIDGIN_HIG_BORDER, "substatus", TRUE); g_free(tmp); g_signal_connect(G_OBJECT(win), "delete_event", @@ -1520,7 +1520,7 @@ /* Status mesage */ hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_BOX_SPACE); - gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0); + gtk_box_pack_start(GTK_BOX(vbox), hbox, TRUE, TRUE, 0); label = gtk_label_new_with_mnemonic(_("_Message:")); gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5); diff -r dfe4d0a0a00e -r 589c9ebf84db pidgin/pidginstock.c --- a/pidgin/pidginstock.c Sun Jun 24 17:52:00 2007 +0000 +++ b/pidgin/pidginstock.c Sun Jun 24 17:52:52 2007 +0000 @@ -169,10 +169,8 @@ { PIDGIN_STOCK_TRAY_XA, "tray", "tray-extended-away.png", TRUE, TRUE, TRUE, TRUE, FALSE, FALSE, NULL }, { PIDGIN_STOCK_TRAY_OFFLINE, "tray", "tray-offline.png", TRUE, TRUE, TRUE, TRUE, FALSE, FALSE, NULL }, { PIDGIN_STOCK_TRAY_CONNECT, "tray", "tray-connecting.png", TRUE, TRUE, TRUE, TRUE, FALSE, FALSE, NULL }, - { PIDGIN_STOCK_TRAY_PENDING, "tray", "tray-new-im.png", TRUE, TRUE, TRUE, TRUE, FALSE, FALSE, NULL } -/* Uncomment me after 2.0.2! - * { PIDGIN_STOCK_TRAY_EMAIL, "tray", "tray-message.png", TRUE, TRUE, TRUE, TRUE, FALSE, FALSE, NULL } - */ + { PIDGIN_STOCK_TRAY_PENDING, "tray", "tray-new-im.png", TRUE, TRUE, TRUE, TRUE, FALSE, FALSE, NULL }, + { PIDGIN_STOCK_TRAY_EMAIL, "tray", "tray-message.png", TRUE, TRUE, TRUE, TRUE, FALSE, FALSE, NULL } }; static gchar * diff -r dfe4d0a0a00e -r 589c9ebf84db pidgin/pidginstock.h --- a/pidgin/pidginstock.h Sun Jun 24 17:52:00 2007 +0000 +++ b/pidgin/pidginstock.h Sun Jun 24 17:52:52 2007 +0000 @@ -137,9 +137,7 @@ #define PIDGIN_STOCK_TRAY_OFFLINE "pidgin-tray-offline" #define PIDGIN_STOCK_TRAY_CONNECT "pidgin-tray-connect" #define PIDGIN_STOCK_TRAY_PENDING "pidgin-tray-pending" -/* Uncomment me after 2.0.2! - * #define PIDGIN_STOCK_TRAY_EMAIL "pidgin-tray-email" - */ +#define PIDGIN_STOCK_TRAY_EMAIL "pidgin-tray-email" /*@}*/ diff -r dfe4d0a0a00e -r 589c9ebf84db pidgin/plugins/gtkbuddynote.c --- a/pidgin/plugins/gtkbuddynote.c Sun Jun 24 17:52:00 2007 +0000 +++ b/pidgin/plugins/gtkbuddynote.c Sun Jun 24 17:52:52 2007 +0000 @@ -30,8 +30,8 @@ if (full) { const gchar *note = purple_blist_node_get_string(node, "notes"); - if (note != NULL) { - g_string_append_printf(text, _("\nBuddy Note: %s"), + if ((note != NULL) && (*note != '\0')) { + g_string_append_printf(text, _("\nBuddy Note: %s"), note); } } @@ -94,6 +94,7 @@ check_for_buddynote(gpointer data) { PurplePlugin *buddynote = NULL; + PurplePlugin *plugin = (PurplePlugin *)data; buddynote = purple_plugins_find_with_id("core-plugin_pack-buddynote"); @@ -108,6 +109,18 @@ info.dependencies = g_list_append(info.dependencies, "core-plugin_pack-buddynote"); + + /* If non-gtk buddy note plugin is loaded, but we are not, then load + * ourselves, otherwise people upgrading from pre-gtkbuddynote days + * will not have 'Buddy Notes' showing as loaded in the plugins list. + * We also trigger a save on the list of plugins because it's not been + * loaded through the UI. */ + if (purple_plugin_is_loaded(buddynote) && + !purple_plugin_is_loaded(plugin)) { + purple_plugin_load(plugin); + pidgin_plugins_save(); + } + } else { info.flags = PURPLE_PLUGIN_FLAG_INVISIBLE; }