pidgin.next.minor: 4658c6fe: Remove old GLIB_CHECK_VERSION calls in f...

[qulogic at pidgin.im]

-----------------------------------------------------------------
Revision: 4658c6fe40eb2d21c69e008b6a203792fee9f3d4
Ancestor: faa320df91f057de4f7be527ad463bb8f1013b63
Author: qulogic at pidgin.im
Date: 2010-02-16T03:46:22
Branch: im.pidgin.pidgin.next.minor
URL: http://d.pidgin.im/viewmtn/revision/info/4658c6fe40eb2d21c69e008b6a203792fee9f3d4

Modified files:
        finch/finch.c finch/gntconv.c

ChangeLog: 

Remove old GLIB_CHECK_VERSION calls in finch. Refs #10024.

-------------- next part --------------
============================================================
--- finch/finch.c	f893f4128c27bed8fc01703b91abd41e78bfd51d
+++ finch/finch.c	14c60701e54c8d2a41257250ab723feebf412b03
@@ -431,9 +431,7 @@ int main(int argc, char *argv[])
 	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();
============================================================
--- finch/gntconv.c	04d8ea547ffa99a7123645d116c5099df0423684
+++ finch/gntconv.c	b8ced2d04137efad17e22b90e6871d1d335af903
@@ -1318,7 +1318,6 @@ cmd_show_window(PurpleConversation *conv
 	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 @@ cmd_message_color(PurpleConversation *co
 
 	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 @@ void finch_conversation_init()
 	                  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 @@ void finch_conversation_init()
 				                 "    &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);