[Pkg-privacy-commits] [pidgin-otr] 57/255: * gtk-ui.c: Specify that the OTR button shows up in the toolbar now.

[Ximin Luo]

This is an automated email from the git hooks/post-receive script.

infinity0 pushed a commit to branch experimental
in repository pidgin-otr.

commit a1533bf9ea017c9143f167f15eb243582bec7c35
Author: cypherpunk <cypherpunk>
Date:   Thu May 29 14:03:49 2008 +0000

    	* gtk-ui.c: Specify that the OTR button shows up in the toolbar
    	now.
---
 ChangeLog | 7 +++++--
 gtk-ui.c  | 5 +++++
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 3b73061..026595a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,10 +1,13 @@
 2008-05-30
 
 	* gtk-dialog.c: The new toolbar OTR button now uses the standard
-	OTR menu
+	OTR menu.
 
 	* gtk-dialog.c: The buddy and status items in the OTR menu are
-	no longer selectable
+	no longer selectable.
+
+	* gtk-ui.c: Specify that the OTR button shows up in the toolbar
+	now.
 
 2008-05-29
 
diff --git a/gtk-ui.c b/gtk-ui.c
index 27c6359..46b2990 100644
--- a/gtk-ui.c
+++ b/gtk-ui.c
@@ -450,7 +450,12 @@ static void otroptions_clicked_cb(GtkButton *button,
 static void create_otroptions_buttons(struct otroptionsdata *oo,
 	GtkWidget *vbox)
 {
+#ifdef OLD_OTR_BUTTON
     oo->showotrbutton = gtk_check_button_new_with_label(_("Show OTR button"));
+#else
+    oo->showotrbutton = gtk_check_button_new_with_label(
+	    _("Show OTR button in toolbar"));
+#endif
 
     gtk_box_pack_start(GTK_BOX(vbox), oo->showotrbutton, FALSE, FALSE, 0);
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-privacy/packages/pidgin-otr.git