soc.2010.detachablepurple: 58398880: Removed the previous SetPassword DBus me...

[gillux at soc.pidgin.im]

----------------------------------------------------------------------
Revision: 58398880b13c1ee95a737351cfcec465368bf735
Parent:   23f15b7ddce26e8eca7918063212903bb72d97de
Author:   gillux at soc.pidgin.im
Date:     07/07/10 04:03:30
Branch:   im.pidgin.soc.2010.detachablepurple
URL: http://d.pidgin.im/viewmtn/revision/info/58398880b13c1ee95a737351cfcec465368bf735

Changelog: 

Removed the previous SetPassword DBus method, as now this is handled using
the DBus org.freedesktop.DBus.Properties.Set method.
Also moved the g_return_if_fail() check as now PurpleAccount is no more a cast
of a DBusGProxy in remote mode context.

Changes against parent 23f15b7ddce26e8eca7918063212903bb72d97de

  patched  libpurple/account-dbus.c
  patched  libpurple/account-dbus.h
  patched  libpurple/account.c
  patched  libpurple/dbus-prototypes/account.xml

-------------- next part --------------
============================================================
--- libpurple/account.c	807e7e17f396f6e1135609c9c2231e5476e6bd76
+++ libpurple/account.c	ff8f2ffc366a7bff0955336fda70afada88f917a
@@ -1434,6 +1434,9 @@ purple_account_set_password(PurpleAccoun
 purple_account_set_password(PurpleAccount *account, const char *password)
 {
 	PurpleAccountPrivate *priv;
+
+	g_return_if_fail(PURPLE_IS_ACCOUNT(account));
+
 #ifdef HAVE_DBUS
 	GValue prop = {0, };
 
@@ -1446,8 +1449,6 @@ purple_account_set_password(PurpleAccoun
 	}
 #endif
 
-	g_return_if_fail(PURPLE_IS_ACCOUNT(account));
-
 	priv = PURPLE_ACCOUNT_GET_PRIVATE(account);
 	if (purple_util_strings_equal(priv->password, password))
 		return;
============================================================
--- libpurple/account-dbus.c	92e104e7119e7c4c277c14a05fa4dabf6c7dccda
+++ libpurple/account-dbus.c	0a3aa4aa7cd025b470c59681ca70c2b1dfe69f74
@@ -2,15 +2,3 @@
 #include <glib.h>
 #include "account.h"
 
-/*
- * purple_account_set_password()'s dbus twin. This is what is actually called
- * when someone calls the associated dbus method SetPassword.
- */
-gboolean
-DBUS_purple_account_set_password(PurpleAccount *account, gchar* password,
-                                GError** error)
-{
-    purple_account_set_password(account, password);
-    return TRUE;
-}
-
============================================================
--- libpurple/account-dbus.h	2d831e0cb82ded61325f2592acf13c395726f9d9
+++ libpurple/account-dbus.h	adc83b19e793491b1c6ea0fd8b46cd9f32e592fc
@@ -1,3 +1 @@
 
-gboolean DBUS_purple_account_set_password(PurpleAccount *account, gchar* password, GError** error);
-
============================================================
--- libpurple/dbus-prototypes/account.xml	c3aa9f2daab780413a455f96ab79f3871a60bb30
+++ libpurple/dbus-prototypes/account.xml	f26c47f296ceb8286268b3065b3c6008216bcbbd
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <node name="/im/pidgin/purple/account">
 	<interface name="im.pidgin.purple.account">
-		<method name="SetPassword">
-			<arg type="s" name="password" direction="in" />
-		</method>
 	</interface>
 </node>