Mercurial > pidgin.yaz
changeset 8811:7329d01bb770
[gaim-migrate @ 9573]
A patch from Phil Snowberger to add a "None" option for the
warn, info, add/remove, and send buttons in conversation windows.
committer: Tailor Script <tailor@pidgin.im>
| author | Mark Doliner <mark@kingant.net> |
|---|---|
| date | Mon, 26 Apr 2004 04:16:35 +0000 |
| parents | a7affa2e2986 |
| children | 4248712ba336 |
| files | COPYRIGHT src/gtkconv.c src/gtkprefs.c |
| diffstat | 3 files changed, 19 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/COPYRIGHT Sun Apr 25 23:40:13 2004 +0000 +++ b/COPYRIGHT Mon Apr 26 04:16:35 2004 +0000 @@ -116,6 +116,7 @@ John Silvestri Alex Smith David Smock +Phil Snowberger Mark Spencer <markster@marko.net> Lex Spoon Kevin Stange
--- a/src/gtkconv.c Sun Apr 25 23:40:13 2004 +0000 +++ b/src/gtkconv.c Mon Apr 26 04:16:35 2004 +0000 @@ -3291,6 +3291,7 @@ GaimConnection *gc; GaimGtkConversation *gtkconv; GaimGtkImPane *gtkim; + GaimButtonStyle button_type; gtkconv = GAIM_GTK_CONVERSATION(conv); gtkim = gtkconv->u.im; @@ -3371,6 +3372,13 @@ gaim_gtkconv_update_buttons_by_protocol(conv); + /* Check if the buttons should be visible or not */ + button_type = gaim_prefs_get_int("/gaim/gtk/conversations/im/button_type"); + if (button_type == GAIM_BUTTON_NONE) + gtk_widget_hide(gtkconv->bbox); + else + gtk_widget_show(gtkconv->bbox); + g_signal_connect(G_OBJECT(gtkim->warn), "clicked", G_CALLBACK(warn_cb), conv); g_signal_connect(G_OBJECT(gtkim->block), "clicked", @@ -3391,6 +3399,7 @@ GaimConnection *gc; GaimGtkConversation *gtkconv; GaimGtkChatPane *gtkchat; + GaimButtonStyle button_type; gtkconv = GAIM_GTK_CONVERSATION(conv); gtkchat = gtkconv->u.chat; @@ -3450,6 +3459,13 @@ gaim_gtkconv_update_buttons_by_protocol(conv); + /* Check if the buttons should be visible or not */ + button_type = gaim_prefs_get_int("/gaim/gtk/conversations/chat/button_type"); + if (button_type == GAIM_BUTTON_NONE) + gtk_widget_hide(gtkconv->bbox); + else + gtk_widget_show(gtkconv->bbox); + /* Callbacks */ g_signal_connect(G_OBJECT(gtkchat->invite), "clicked", G_CALLBACK(invite_cb), conv);
--- a/src/gtkprefs.c Sun Apr 25 23:40:13 2004 +0000 +++ b/src/gtkprefs.c Mon Apr 26 04:16:35 2004 +0000 @@ -1012,6 +1012,7 @@ _("Pictures"), GAIM_BUTTON_IMAGE, _("Text"), GAIM_BUTTON_TEXT, _("Pictures and text"), GAIM_BUTTON_TEXT_IMAGE, + _("None"), GAIM_BUTTON_NONE, NULL); gtk_size_group_add_widget(sg, widge); @@ -1063,6 +1064,7 @@ _("Pictures"), GAIM_BUTTON_IMAGE, _("Text"), GAIM_BUTTON_TEXT, _("Pictures and text"), GAIM_BUTTON_TEXT_IMAGE, + _("None"), GAIM_BUTTON_NONE, NULL); gtk_size_group_add_widget(sg, dd);