Mercurial > pidgin
changeset 29724:0c764778c765
merge of '2dffa8ba1bee1171684d1f2eda5b5ba307787274'
and '7f87d4b5d3cc6e2b720d52df157f2e5d9ebe39ca'
| author | Sadrul Habib Chowdhury <imadil@gmail.com> |
|---|---|
| date | Tue, 13 Apr 2010 16:28:32 +0000 |
| parents | 0625cebc84d7 (diff) 0665d7eff0a3 (current diff) |
| children | 823c3917d533 |
| files | ChangeLog |
| diffstat | 3 files changed, 6 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Tue Apr 13 06:03:35 2010 +0000 +++ b/ChangeLog Tue Apr 13 16:28:32 2010 +0000 @@ -36,7 +36,6 @@ in the distant past. (Greg McNew) * Added a menu set mood globally for all mood-supporting accounts (currently XMPP and ICQ). - * Use standard (but small) GTK+ buttons instead of custom "X" symbol. * Default binding of Ctrl+Shift+v to 'Paste as Plain Text' in conversation windows. This can be changed in .gtkrc-2.0. For example, Ctrl+v can be bound to 'Paste as Plain Text' by default.
--- a/pidgin/gtkconv.c Tue Apr 13 06:03:35 2010 +0000 +++ b/pidgin/gtkconv.c Tue Apr 13 16:28:32 2010 +0000 @@ -4866,12 +4866,11 @@ pidgin_conv_setup_quickfind(PidginConversation *gtkconv, GtkWidget *container) { GtkWidget *widget = gtk_hbox_new(FALSE, 0); - GtkWidget *label, *entry, *close, *image; + GtkWidget *label, *entry, *close; gtk_box_pack_start(GTK_BOX(container), widget, FALSE, FALSE, 0); - image = gtk_image_new_from_stock(GTK_STOCK_CLOSE, GTK_ICON_SIZE_MENU); - close = pidgin_create_small_button(image); + close = pidgin_create_small_button(gtk_label_new("×")); gtk_box_pack_start(GTK_BOX(widget), close, FALSE, FALSE, 0); gtk_tooltips_set_tip(gtkconv->tooltips, close, _("Close Find bar"), NULL); @@ -9450,7 +9449,6 @@ GtkWidget *tab_cont = gtkconv->tab_cont; PurpleConversationType conv_type; const gchar *tmp_lab; - GtkWidget *close_image; conv_type = purple_conversation_get_type(conv); @@ -9462,8 +9460,7 @@ /* Close button. */ - close_image = gtk_image_new_from_stock(GTK_STOCK_CLOSE, GTK_ICON_SIZE_MENU); - gtkconv->close = pidgin_create_small_button(close_image); + gtkconv->close = pidgin_create_small_button(gtk_label_new("×")); gtk_tooltips_set_tip(gtkconv->tooltips, gtkconv->close, _("Close conversation"), NULL);
--- a/pidgin/gtkutils.c Tue Apr 13 06:03:35 2010 +0000 +++ b/pidgin/gtkutils.c Tue Apr 13 16:28:32 2010 +0000 @@ -3484,6 +3484,9 @@ "GtkWidget::focus-line-width = 0\n" "xthickness = 0\n" "ythickness = 0\n" + "GtkContainer::border-width = 0\n" + "GtkButton::inner-border = {0, 0, 0, 0}\n" + "GtkButton::default-border = {0, 0, 0, 0}\n" "}\n" "widget \"*.pidgin-small-close-button\" style \"pidgin-small-close-button\"");