# HG changeset patch
# User Daniel Atallah <daniel.atallah@gmail.com>
# Date 1188270894 0
# Node ID 2f0960548c1dca85d877ea2f6860382854aa6727
# Parent  c6af18ea22a9edbac442ef57b081821902002320
Make the gtkcert stuff compile on GTK+ older than 2.8

diff -r c6af18ea22a9 -r 2f0960548c1d pidgin/gtkcertmgr.c
--- a/pidgin/gtkcertmgr.c	Tue Aug 28 03:11:11 2007 +0000
+++ b/pidgin/gtkcertmgr.c	Tue Aug 28 03:14:54 2007 +0000
@@ -29,6 +29,7 @@
 #include "core.h"
 #include "internal.h"
 #include "pidgin.h"
+#include "pidginstock.h"
 
 #include "certificate.h"
 #include "debug.h"
@@ -506,7 +507,7 @@
 
 	/* Info button */
 	tpm_dat->infobutton = infobutton =
-		gtk_button_new_from_stock(GTK_STOCK_INFO);
+		gtk_button_new_from_stock(PIDGIN_STOCK_INFO);
 	gtk_box_pack_start(GTK_BOX(bbox), infobutton, FALSE, FALSE, 0);
 	gtk_widget_show(infobutton);
 	g_signal_connect(G_OBJECT(infobutton), "clicked",
diff -r c6af18ea22a9 -r 2f0960548c1d pidgin/pidginstock.c
--- a/pidgin/pidginstock.c	Tue Aug 28 03:11:11 2007 +0000
+++ b/pidgin/pidginstock.c	Tue Aug 28 03:14:54 2007 +0000
@@ -74,6 +74,11 @@
 	{ PIDGIN_STOCK_SIGN_OFF,        NULL,      GTK_STOCK_CLOSE            },
 	{ PIDGIN_STOCK_TYPED,           "pidgin",  "typed.png"                },
 	{ PIDGIN_STOCK_UPLOAD,          NULL,      GTK_STOCK_GO_UP            },
+#if GTK_CHECK_VERSION(2,8,0)
+	{ PIDGIN_STOCK_INFO,            NULL,      GTK_STOCK_INFO             },
+#else
+	{ PIDGIN_STOCK_INFO,            "buttons", "info.png"                 },
+#endif
 };
 
 static const GtkStockItem stock_items[] =
diff -r c6af18ea22a9 -r 2f0960548c1d pidgin/pidginstock.h
--- a/pidgin/pidginstock.h	Tue Aug 28 03:11:11 2007 +0000
+++ b/pidgin/pidginstock.h	Tue Aug 28 03:14:54 2007 +0000
@@ -45,6 +45,7 @@
 #define PIDGIN_STOCK_FILE_CANCELED   "pidgin-file-canceled"
 #define PIDGIN_STOCK_FILE_DONE       "pidgin-file-done"
 #define PIDGIN_STOCK_IGNORE          "pidgin-ignore"
+#define PIDGIN_STOCK_INFO            "pidgin-info"
 #define PIDGIN_STOCK_INVITE          "pidgin-invite"
 #define PIDGIN_STOCK_MODIFY          "pidgin-modify"
 #define PIDGIN_STOCK_OPEN_MAIL       "pidgin-stock-open-mail"
diff -r c6af18ea22a9 -r 2f0960548c1d pidgin/pixmaps/Makefile.am
--- a/pidgin/pixmaps/Makefile.am	Tue Aug 28 03:11:11 2007 +0000
+++ b/pidgin/pixmaps/Makefile.am	Tue Aug 28 03:14:54 2007 +0000
@@ -2,6 +2,7 @@
 
 EXTRA_DIST = \
 		edit.png			\
+		info.png			\
 		logo.png			\
 		pause.png			\
 		arrow-down.xpm		\
@@ -12,7 +13,7 @@
 		pidgin.ico
 
 pidginbuttonpixdir = $(datadir)/pixmaps/pidgin/buttons
-pidginbuttonpix_DATA = edit.png pause.png 
+pidginbuttonpix_DATA = edit.png pause.png info.png
 
 pidgindistpixdir = $(datadir)/pixmaps/pidgin
 pidgindistpix_DATA = logo.png arrow-down.xpm arrow-left.xpm arrow-right.xpm arrow-up.xpm
diff -r c6af18ea22a9 -r 2f0960548c1d pidgin/pixmaps/info.png
Binary file pidgin/pixmaps/info.png has changed