# HG changeset patch
# User Elliott Sales de Andrade <qulogic@pidgin.im>
# Date 1266309774 0
# Node ID f3745c3198b2a655ebe1ce2aad7c759614451143
# Parent  ce3f4bd8939b174fe840453aa04eb3c15e569fd7# Parent  e6395be20517dd099fe79562baa526093ff4432b
merge of '3b76f09b9b1fcbbf73ad7179aac8eb1896920f56'
     and '538f7126c2ed33ecc1a411bfd61a46c18bce3e83'

diff -r ce3f4bd8939b -r f3745c3198b2 configure.ac
--- a/configure.ac	Tue Feb 16 02:56:10 2010 +0000
+++ b/configure.ac	Tue Feb 16 08:42:54 2010 +0000
@@ -317,7 +317,7 @@
 	AC_MSG_RESULT(no)
 	AC_MSG_ERROR([
 
-You must have GLib 2.4.0 or newer development headers installed to build.
+You must have GLib 2.12.0 or newer development headers installed to build.
 
 If you have these installed already you may need to install pkg-config so
 I can find them.
diff -r ce3f4bd8939b -r f3745c3198b2 finch/finch.c
--- a/finch/finch.c	Tue Feb 16 02:56:10 2010 +0000
+++ b/finch/finch.c	Tue Feb 16 08:42:54 2010 +0000
@@ -431,9 +431,7 @@
 	g_thread_init(NULL);
 
 	g_set_prgname("Finch");
-#if GLIB_CHECK_VERSION(2,2,0)
 	g_set_application_name(_("Finch"));
-#endif
 
 	if (gnt_start(&argc, &argv)) {
 		gnt_main();
diff -r ce3f4bd8939b -r f3745c3198b2 finch/gntconv.c
--- a/finch/gntconv.c	Tue Feb 16 02:56:10 2010 +0000
+++ b/finch/gntconv.c	Tue Feb 16 08:42:54 2010 +0000
@@ -1318,7 +1318,6 @@
 	return PURPLE_CMD_RET_OK;
 }
 
-#if GLIB_CHECK_VERSION(2,6,0)
 static PurpleCmdRet
 cmd_message_color(PurpleConversation *conv, const char *cmd, char **args, char **error, gpointer data)
 {
@@ -1359,7 +1358,6 @@
 
 	return PURPLE_CMD_RET_OK;
 }
-#endif
 
 static PurpleCmdRet
 users_command_cb(PurpleConversation *conv, const char *cmd, char **args, char **error, gpointer data)
@@ -1445,7 +1443,6 @@
 	                  PURPLE_CMD_FLAG_CHAT | PURPLE_CMD_FLAG_IM, NULL,
 	                  cmd_show_window, _("statuses: Show the savedstatuses window."), finch_savedstatus_show_all);
 
-#if GLIB_CHECK_VERSION(2,6,0)
 	/* Allow customizing the message colors using a command during run-time */
 	purple_cmd_register("msgcolor", "www", PURPLE_CMD_P_DEFAULT,
 			PURPLE_CMD_FLAG_CHAT | PURPLE_CMD_FLAG_IM, NULL,
@@ -1455,7 +1452,6 @@
 				                 "    &lt;foreground/background&gt;: black, red, green, blue, white, gray, darkgray, magenta, cyan, default<br><br>"
 								 "EXAMPLE:<br>    msgcolor send cyan default"),
 			NULL);
-#endif
 
 	purple_signal_connect(purple_conversations_get_handle(), "buddy-typing", finch_conv_get_handle(),
 					PURPLE_CALLBACK(update_buddy_typing), NULL);
diff -r ce3f4bd8939b -r f3745c3198b2 libpurple/protocols/msn/notification.c
--- a/libpurple/protocols/msn/notification.c	Tue Feb 16 02:56:10 2010 +0000
+++ b/libpurple/protocols/msn/notification.c	Tue Feb 16 08:42:54 2010 +0000
@@ -1624,11 +1624,7 @@
 	 *  6: Album
 	 *  7: ?
 	 */
-#if GLIB_CHECK_VERSION(2,6,0)
 	strings  = g_strv_length(cmedia_array);
-#else
-	while (cmedia_array[++strings] != NULL);
-#endif
 
 	if (strings >= 4 && !strcmp(cmedia_array[2], "1")) {
 		if (user->extinfo == NULL)
diff -r ce3f4bd8939b -r f3745c3198b2 pidgin/gtksavedstatuses.c
--- a/pidgin/gtksavedstatuses.c	Tue Feb 16 02:56:10 2010 +0000
+++ b/pidgin/gtksavedstatuses.c	Tue Feb 16 08:42:54 2010 +0000
@@ -1824,9 +1824,7 @@
 	g_object_set(G_OBJECT(icon_rend),
 			"stock-size", gtk_icon_size_from_name(PIDGIN_ICON_SIZE_TANGO_EXTRA_SMALL),
 			NULL);
-#if GTK_CHECK_VERSION(2,6,0)
 	g_object_set(text_rend, "ellipsize", PANGO_ELLIPSIZE_END, NULL);
-#endif
 
 	gtk_combo_box_set_active(GTK_COMBO_BOX(combobox), index);
 	g_signal_connect(G_OBJECT(combobox), "changed", G_CALLBACK(status_menu_cb), callback);