pidgin: 9c6cf403: Fix compile with glib<2.26.

qulogic at pidgin.im qulogic at pidgin.im
Sat Oct 8 03:50:50 EDT 2011


----------------------------------------------------------------------
Revision: 9c6cf403ea89eb7f104231f4b96c86c8dfcfff22
Parent:   938c7df0117566ee420d9394df715502b6f868e3
Author:   qulogic at pidgin.im
Date:     10/07/11 22:44:27
Branch:   im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/9c6cf403ea89eb7f104231f4b96c86c8dfcfff22

Changelog: 

Fix compile with glib<2.26.

Changes against parent 938c7df0117566ee420d9394df715502b6f868e3

  patched  pidgin/gtkconv-theme.c

-------------- next part --------------
============================================================
--- pidgin/gtkconv-theme.c	1eee4c54dd7b27de436dd1462cef7b6d957137cd
+++ pidgin/gtkconv-theme.c	aba4989a4654466a2f40587699673abfe3df7e6f
@@ -83,7 +83,9 @@ static GObjectClass *parent_class = NULL
  *****************************************************************************/
 
 static GObjectClass *parent_class = NULL;
+#if GLIB_CHECK_VERSION(2,26,0)
 static GParamSpec *properties[PROP_LAST];
+#endif
 
 /******************************************************************************
  * Helper Functions
@@ -507,15 +509,18 @@ pidgin_conv_theme_class_init(PidginConvT
 			G_TYPE_HASH_TABLE,
 			G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY);
 	g_object_class_install_property(obj_class, PROP_INFO, pspec);
+#if GLIB_CHECK_VERSION(2,26,0)
 	properties[PROP_INFO] = pspec;
+#endif
 
 	/* VARIANT */
 	pspec = g_param_spec_string("variant", "Variant",
 			"The current variant for this theme",
 			NULL, G_PARAM_READWRITE);
 	g_object_class_install_property(obj_class, PROP_VARIANT, pspec);
+#if GLIB_CHECK_VERSION(2,26,0)
 	properties[PROP_VARIANT] = pspec;
-
+#endif
 }
 
 GType
@@ -680,7 +685,11 @@ pidgin_conversation_theme_set_variant(Pi
 pidgin_conversation_theme_set_variant(PidginConvTheme *theme, const char *variant)
 {
 	_set_variant(theme, variant);
+#if GLIB_CHECK_VERSION(2,26,0)
 	g_object_notify_by_pspec(G_OBJECT(theme), properties[PROP_VARIANT]);
+#else
+	g_object_notify(G_OBJECT(theme), "variant");
+#endif
 }
 
 const GList *


More information about the Commits mailing list