Mercurial > pidgin
changeset 17367:837b697723c0
merge of '4af1e220d3ae855eec7a057ef1e41b586abb8f5f'
and 'c5effd605c706950531cbca778c43fafa75e1109'
| author | Sean Egan <seanegan@gmail.com> |
|---|---|
| date | Tue, 29 May 2007 04:56:30 +0000 |
| parents | 2284a8aad9ef (current diff) fae50c8130d3 (diff) |
| children | b31f53796f3b |
| files | |
| diffstat | 2 files changed, 4 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- a/pidgin/gtkaccount.c Tue May 29 04:43:56 2007 +0000 +++ b/pidgin/gtkaccount.c Tue May 29 04:56:30 2007 +0000 @@ -433,6 +433,7 @@ /* Screen name */ dialog->screenname_entry = gtk_entry_new(); + g_object_set(G_OBJECT(dialog->screenname_entry), "truncate-multiline", TRUE, NULL); add_pref_box(dialog, vbox, _("Screen name:"), dialog->screenname_entry);
--- a/pidgin/gtkblist.c Tue May 29 04:43:56 2007 +0000 +++ b/pidgin/gtkblist.c Tue May 29 04:56:30 2007 +0000 @@ -488,11 +488,6 @@ pidgin_syslog_show(); } -static void gtk_blist_show_onlinehelp_cb() -{ - purple_notify_uri(NULL, PURPLE_WEBSITE "documentation.php"); -} - static void do_join_chat(PidginJoinChatData *data) { @@ -2845,6 +2840,7 @@ { N_("/Buddies/Add C_hat..."), NULL, pidgin_blist_add_chat_cb, 0, "<StockItem>", GTK_STOCK_ADD }, { N_("/Buddies/Add _Group..."), NULL, purple_blist_request_add_group, 0, "<StockItem>", GTK_STOCK_ADD }, { "/Buddies/sep3", NULL, NULL, 0, "<Separator>", NULL }, + { N_("/Buddies/_About Pidgin"), NULL, pidgin_dialogs_about, 0, "<Item>", NULL }, { N_("/Buddies/_Quit"), "<CTL>Q", purple_core_quit, 0, "<StockItem>", GTK_STOCK_QUIT }, /* Accounts menu */ @@ -2861,14 +2857,9 @@ { N_("/Tools/_File Transfers"), "<CTL>T", pidgin_xfer_dialog_show, 0, "<Item>", NULL }, { N_("/Tools/R_oom List"), NULL, pidgin_roomlist_dialog_show, 0, "<Item>", NULL }, { N_("/Tools/System _Log"), NULL, gtk_blist_show_systemlog_cb, 0, "<Item>", NULL }, + { N_("/Tools/_Debug Window"), NULL, toggle_debug, 0, "<Item>", NULL }, { "/Tools/sep3", NULL, NULL, 0, "<Separator>", NULL }, { N_("/Tools/Mute _Sounds"), "<CTL>S", pidgin_blist_mute_sounds_cb, 0, "<CheckItem>", NULL }, - - /* Help */ - { N_("/_Help"), NULL, NULL, 0, "<Branch>", NULL }, - { N_("/Help/Online _Help"), "F1", gtk_blist_show_onlinehelp_cb, 0, "<StockItem>", GTK_STOCK_HELP }, - { N_("/Help/_Debug Window"), NULL, toggle_debug, 0, "<Item>", NULL }, - { N_("/Help/_About"), NULL, pidgin_dialogs_about, 0, "<Item>", NULL }, }; /********************************************************* @@ -3239,7 +3230,7 @@ ret = gtk_widget_render_icon (GTK_WIDGET(gtkblist->treeview), PIDGIN_STOCK_STATUS_XA, icon_size, "GtkTreeView"); else if (purple_presence_is_status_primitive_active(p, PURPLE_STATUS_OFFLINE)) - ret = gtk_widget_render_icon (GTK_WIDGET(gtkblist->treeview), PIDGIN_STOCK_STATUS_OFFLINE_I, + ret = gtk_widget_render_icon (GTK_WIDGET(gtkblist->treeview), PIDGIN_STOCK_STATUS_OFFLINE, icon_size, "GtkTreeView"); else if (purple_presence_is_idle(p) && size == PIDGIN_STATUS_ICON_SMALL) ret = gtk_widget_render_icon (GTK_WIDGET(gtkblist->treeview), PIDGIN_STOCK_STATUS_AVAILABLE_I,