[prev in list] [next in list] [prev in thread] [next in thread] 

List:       pidgin-commits
Subject:    cpw.gillux.detachablepurple: 65c771e4: Fixed the purple default dbus
From:       gillux () soc ! pidgin ! im
Date:       2011-05-19 22:35:46
Message-ID: 20110519223546.75884AFD0A9C () rock ! pidgin ! im
[Download RAW message or body]

----------------------------------------------------------------------
Revision: 65c771e49a26de6c3a7f71b48f46a7b41e82bb4b
Parent:   ed5d766faad9fd86702f197cbeae4741c1f58fb3
Author:   gillux@soc.pidgin.im
Date:     05/19/11 18:29:22
Branch:   im.pidgin.cpw.gillux.detachablepurple
URL: http://d.pidgin.im/viewmtn/revision/info/65c771e49a26de6c3a7f71b48f46a7b41e82bb4b

Changelog: 

Fixed the purple default dbus properties setter.

Changes against parent ed5d766faad9fd86702f197cbeae4741c1f58fb3

  patched  libpurple/pobject.c



============================================================
--- libpurple/pobject.c	f67614cf127fba0fdc066aa0877af3e14c22d73e
+++ libpurple/pobject.c	c2cbab2af6956d41806b11b0fa87bac34dc38228
@@ -651,20 +651,20 @@ purple_object_generic_dbus_set_property(
                                         GError          **error,
                                         gpointer          object)
 {
-	gboolean ret = FALSE;
 	GParamSpec *pspec;
 	GValue value = {0, };
 	GValue tmp   = {0, };
 
 	pspec = g_object_class_find_property(G_OBJECT_GET_CLASS(object),
 	                                     property_name);
-	if (!pspec)
+	if (!pspec) {
 		g_set_error(error, G_DBUS_ERROR, G_DBUS_ERROR_INVALID_ARGS,
-			"No property named %s in interface %s.",
-		    property_name, interface_name);
-	else {
+		            "No property named %s in interface %s.",
+		            property_name, interface_name);
+		return FALSE;
+	} else {
+		g_value_init(&value, G_PARAM_SPEC_VALUE_TYPE(pspec));
 		g_dbus_gvariant_to_gvalue(variant, &value);
-		g_value_init(&value, G_PARAM_SPEC_VALUE_TYPE(pspec));
 		if (G_TYPE_IS_OBJECT(G_PARAM_SPEC_VALUE_TYPE(pspec))
 		    && G_VALUE_HOLDS_STRING(&value)) {
 			/* Convert dbus path names into gobjects. */
@@ -677,8 +677,8 @@ purple_object_generic_dbus_set_property(
 		}
 		g_object_set_property(G_OBJECT(object), property_name, &value);
 		g_value_unset(&value);
+		return TRUE;
 	}
-	return ret;
 }
 
 guint


_______________________________________________
Commits mailing list
Commits@pidgin.im
http://pidgin.im/cgi-bin/mailman/listinfo/commits

[prev in list] [next in list] [prev in thread] [next in thread]