# HG changeset patch
# User Will Thompson <will.thompson@collabora.co.uk>
# Date 1186486376 0
# Node ID 140662c8280c897360e479b5ab9670f7b89a1f0e
# Parent  d579269907684764aefebff18dbe5397fdb76090# Parent  f8b22b11a126d610cfccbddb9bec50f0c7523e06
merge of '599ce70692fe573e98628269564b76296451b587'
     and 'bbcb8341b26dc1c43b844d99930c771cf6e64246'

diff -r d57926990768 -r 140662c8280c finch/finch.c
--- a/finch/finch.c	Tue Aug 07 11:25:22 2007 +0000
+++ b/finch/finch.c	Tue Aug 07 11:32:56 2007 +0000
@@ -401,7 +401,9 @@
 	signal(SIGPIPE, SIG_IGN);
 
 	g_set_prgname("Finch");
+#if GLIB_CHECK_VERSION(2,2,0)
 	g_set_application_name(_("Finch"));
+#endif
 
 	/* Initialize the libpurple stuff */
 	if (!init_libpurple(argc, argv))
diff -r d57926990768 -r 140662c8280c pidgin/gtkmain.c
--- a/pidgin/gtkmain.c	Tue Aug 07 11:25:22 2007 +0000
+++ b/pidgin/gtkmain.c	Tue Aug 07 11:32:56 2007 +0000
@@ -695,7 +695,9 @@
 		return 1;
 	}
 
+#if GLIB_CHECK_VERSION(2,2,0)
 	g_set_application_name(_("Pidgin"));
+#endif /* glib-2.0 >= 2.2.0 */
 
 #ifdef _WIN32
 	winpidgin_init(hint);
diff -r d57926990768 -r 140662c8280c pidgin/gtkutils.c
--- a/pidgin/gtkutils.c	Tue Aug 07 11:25:22 2007 +0000
+++ b/pidgin/gtkutils.c	Tue Aug 07 11:32:56 2007 +0000
@@ -2047,11 +2047,11 @@
 														entry.entry.buddy->account,
 														entry.entry.buddy->name
 													 );
+#else
+					item->data = g_strdup(entry.entry.buddy->name);
+					g_completion_add_items(data->completion, item);
+#endif /* NEW_STYLE_COMPLETION */
 				}
-#else
-				item->data = g_strdup(buddy->name);
-				g_completion_add_items(data->completion, item);
-#endif /* NEW_STYLE_COMPLETION */
 			}
 		}
 	}
diff -r d57926990768 -r 140662c8280c pidgin/pidginstock.c
--- a/pidgin/pidginstock.c	Tue Aug 07 11:25:22 2007 +0000
+++ b/pidgin/pidginstock.c	Tue Aug 07 11:32:56 2007 +0000
@@ -44,7 +44,7 @@
 #endif
 	{ PIDGIN_STOCK_CHAT,            NULL,      GTK_STOCK_JUMP_TO          },
 	{ PIDGIN_STOCK_CLEAR,           NULL,      GTK_STOCK_CLEAR            },
-	{ PIDGIN_STOCK_CLOSE_TABS,      "buttons", "close-tab.png"            },
+	{ PIDGIN_STOCK_CLOSE_TABS,      NULL,      GTK_STOCK_CLOSE            },
 	{ PIDGIN_STOCK_DEBUG,           NULL,      GTK_STOCK_PROPERTIES       },
 	{ PIDGIN_STOCK_DOWNLOAD,        NULL,      GTK_STOCK_GO_DOWN          },
 #if GTK_CHECK_VERSION(2,6,0)
diff -r d57926990768 -r 140662c8280c pidgin/pixmaps/Makefile.am
--- a/pidgin/pixmaps/Makefile.am	Tue Aug 07 11:25:22 2007 +0000
+++ b/pidgin/pixmaps/Makefile.am	Tue Aug 07 11:32:56 2007 +0000
@@ -1,7 +1,6 @@
 SUBDIRS = animations buddy_icons dialogs emblems emotes icons protocols status toolbar tray
 
 EXTRA_DIST = \
-		close-tab.png		\
 		edit.png			\
 		logo.png			\
 		pause.png			\
@@ -13,7 +12,7 @@
 		pidgin.ico
 
 pidginbuttonpixdir = $(datadir)/pixmaps/pidgin/buttons
-pidginbuttonpix_DATA = edit.png pause.png close-tab.png
+pidginbuttonpix_DATA = edit.png pause.png 
 
 pidgindistpixdir = $(datadir)/pixmaps/pidgin
 pidgindistpix_DATA = logo.png arrow-down.xpm arrow-left.xpm arrow-right.xpm arrow-up.xpm