pidgin: a2d611d8: Add an ellipsis to the "Add" and "Modify...
rlaager at pidgin.im
rlaager at pidgin.im
Sat Nov 8 21:20:32 EST 2008
-----------------------------------------------------------------
Revision: a2d611d8fe1aec7a7cc8d1837f1a4dceeadcb6eb
Ancestor: a3a362035084e46eb25678c2b763896989804948
Author: alex at moreati.org.uk
Date: 2008-11-08T19:26:28
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/a2d611d8fe1aec7a7cc8d1837f1a4dceeadcb6eb
Modified files:
COPYRIGHT pidgin/gtkaccount.c pidgin/gtkpounce.c
pidgin/gtksavedstatuses.c pidgin/pidginstock.c
pidgin/pidginstock.h
ChangeLog:
Add an ellipsis to the "Add" and "Modify" buttons in the accounts, pounces, and
saved statuses windows.
Fixes #6662
-------------- next part --------------
============================================================
--- COPYRIGHT 696c95a22abae2444988ea9a853ad21107722ade
+++ COPYRIGHT 405781307ea0abbc86a2d39902562baac20d84e8
@@ -463,6 +463,7 @@ Jason Willis
Dan Willemsen
Justin Williams (Jaywalker)
Jason Willis
+Alex Willmer
Matt Wilson
Dan Winship
Scott Wolchok
============================================================
--- pidgin/gtkaccount.c 1dc90c32a4f29151f3b9f05397255eeafc81f51e
+++ pidgin/gtkaccount.c 543345dd872b7cd3f0cf5fd9818d7f542d498637
@@ -2149,9 +2149,9 @@ create_accounts_list(AccountsWindow *dia
"<span size='larger' weight='bold'>Welcome to %s!</span>\n\n"
"You have no IM accounts configured. To start connecting with %s "
- "press the <b>Add</b> button below and configure your first "
+ "press the <b>Add...</b> button below and configure your first "
"account. If you want %s to connect to multiple IM accounts, "
- "press <b>Add</b> again to configure them all.\n\n"
+ "press <b>Add...</b> again to configure them all.\n\n"
"You can come back to this window to add, edit, or remove "
"accounts from <b>Accounts->Manage Accounts</b> in the Buddy "
@@ -2285,7 +2285,7 @@ pidgin_accounts_window_show(void)
gtk_widget_show(sw);
/* Add button */
- pidgin_dialog_add_button(GTK_DIALOG(win), GTK_STOCK_ADD, G_CALLBACK(add_account_cb), dialog);
+ pidgin_dialog_add_button(GTK_DIALOG(win), PIDGIN_STOCK_ADD, G_CALLBACK(add_account_cb), dialog);
/* Modify button */
button = pidgin_dialog_add_button(GTK_DIALOG(win), PIDGIN_STOCK_MODIFY, G_CALLBACK(modify_account_cb), dialog);
============================================================
--- pidgin/gtkpounce.c e98a23f67301eb38b1a4bbf8e767d9d5a52bd604
+++ pidgin/gtkpounce.c 25877f36abfbd3bb6018db6f220e6646d7469ee9
@@ -1374,7 +1374,7 @@ pidgin_pounces_manager_show(void)
gtk_box_pack_start(GTK_BOX(vbox), list, TRUE, TRUE, 0);
/* Add button */
- button = pidgin_dialog_add_button(GTK_DIALOG(win), GTK_STOCK_ADD, G_CALLBACK(pounces_manager_add_cb), dialog);
+ button = pidgin_dialog_add_button(GTK_DIALOG(win), PIDGIN_STOCK_ADD, G_CALLBACK(pounces_manager_add_cb), dialog);
gtk_widget_set_sensitive(button, (purple_accounts_get_all() != NULL));
purple_signal_connect(purple_connections_get_handle(), "signed-on",
============================================================
--- pidgin/gtksavedstatuses.c 26d7f2493b4efd47f78544b5aa8b2a6c2b5dedc8
+++ pidgin/gtksavedstatuses.c 82e52249a0d0a71b17ba0cc1947c3a3241dc2119
@@ -655,7 +655,7 @@ pidgin_status_window_show(void)
G_CALLBACK(status_window_use_cb), dialog);
/* Add button */
- pidgin_dialog_add_button(GTK_DIALOG(win), GTK_STOCK_ADD,
+ pidgin_dialog_add_button(GTK_DIALOG(win), PIDGIN_STOCK_ADD,
G_CALLBACK(status_window_add_cb), dialog);
/* Modify button */
============================================================
--- pidgin/pidginstock.c fb7740443271d7148fa5152aef2888be2e80193e
+++ pidgin/pidginstock.c 97c6db4129f7291d67a1352bea443a9dd2ca1ea7
@@ -64,6 +64,7 @@ static struct StockIcon
{ PIDGIN_STOCK_IGNORE, NULL, GTK_STOCK_DIALOG_ERROR },
{ PIDGIN_STOCK_INVITE, NULL, GTK_STOCK_JUMP_TO },
{ PIDGIN_STOCK_MODIFY, NULL, GTK_STOCK_PREFERENCES },
+ { PIDGIN_STOCK_ADD, NULL, GTK_STOCK_ADD },
#if GTK_CHECK_VERSION(2,6,0)
{ PIDGIN_STOCK_PAUSE, NULL, GTK_STOCK_MEDIA_PAUSE },
#else
@@ -90,7 +91,8 @@ static const GtkStockItem stock_items[]
{ PIDGIN_STOCK_TOOLBAR_MESSAGE_NEW, N_("I_M"), 0, 0, NULL },
{ PIDGIN_STOCK_TOOLBAR_USER_INFO, N_("_Get Info"), 0, 0, NULL },
{ PIDGIN_STOCK_INVITE, N_("_Invite"), 0, 0, NULL },
- { PIDGIN_STOCK_MODIFY, N_("_Modify"), 0, 0, NULL },
+ { PIDGIN_STOCK_MODIFY, N_("_Modify..."), 0, 0, NULL },
+ { PIDGIN_STOCK_ADD, N_("_Add..."), 0, 0, NULL },
{ PIDGIN_STOCK_OPEN_MAIL, N_("_Open Mail"), 0, 0, NULL },
{ PIDGIN_STOCK_PAUSE, N_("_Pause"), 0, 0, NULL },
{ PIDGIN_STOCK_EDIT, N_("_Edit"), 0, 0, NULL }
============================================================
--- pidgin/pidginstock.h fcccf6f3ed762cf7dfa76325ef6bf0336118a76e
+++ pidgin/pidginstock.h f610e8deaaa6b4536dc7619dd9aeac8e017fc701
@@ -49,6 +49,7 @@
#define PIDGIN_STOCK_INFO "pidgin-info"
#define PIDGIN_STOCK_INVITE "pidgin-invite"
#define PIDGIN_STOCK_MODIFY "pidgin-modify"
+#define PIDGIN_STOCK_ADD "pidgin-add"
#define PIDGIN_STOCK_OPEN_MAIL "pidgin-stock-open-mail"
#define PIDGIN_STOCK_PAUSE "pidgin-pause"
#define PIDGIN_STOCK_POUNCE "pidgin-pounce"
More information about the Commits
mailing list