cpw.gillux.detachablepurple: a5301f19: Type and cast fixes.

[gillux at soc.pidgin.im]

----------------------------------------------------------------------
Revision: a5301f19483517a5d546dad96609ede7099be808
Parent:   59b50c96182297589484025e9bce58d5e9c87be3
Author:   gillux at soc.pidgin.im
Date:     05/14/12 23:20:25
Branch:   im.pidgin.cpw.gillux.detachablepurple
URL: http://d.pidgin.im/viewmtn/revision/info/a5301f19483517a5d546dad96609ede7099be808

Changelog: 

Type and cast fixes.

Changes against parent 59b50c96182297589484025e9bce58d5e9c87be3

  patched  libpurple/dbus-server.c
  patched  libpurple/dbus-server.h
  patched  libpurple/pobject.c

-------------- next part --------------
============================================================
--- libpurple/dbus-server.c	2ff849e4ac845960ecde182f1ae7ebd46ae3f06b
+++ libpurple/dbus-server.c	ec5d9f2cea513f4c38e91a8ff6282d54dae3441b
@@ -503,12 +503,12 @@ void
 }
 
 void
-purple_dbus_assoc_gobject(const gchar *dbus_path, GObject *gobj)
+purple_dbus_assoc_gobject(const gchar *dbus_path, gpointer obj)
 {
 	g_return_if_fail(dbus_path_gobjects != NULL);
 	g_return_if_fail(dbus_path != NULL);
 
-	g_hash_table_insert(dbus_path_gobjects, g_strdup(dbus_path), gobj);
+	g_hash_table_insert(dbus_path_gobjects, g_strdup(dbus_path), obj);
 }
 
 void
@@ -520,7 +520,7 @@ purple_dbus_disassoc_gobject(const gchar
 	g_hash_table_remove(dbus_path_gobjects, dbus_path);
 }
 
-GObject*
+gpointer
 purple_dbus_get_gobject_by_path(const gchar *dbus_path)
 {
 	g_return_val_if_fail(dbus_path_gobjects != NULL, NULL);
============================================================
--- libpurple/dbus-server.h	bc04e475a95646522146433c370fa647a231b343
+++ libpurple/dbus-server.h	df5b882df9da290bb2725ea480ecc7b5e909441c
@@ -224,12 +224,12 @@ gchar* purple_dbus_sanitize_dbus_path(co
 gchar* purple_dbus_sanitize_dbus_path(const gchar *str);
 
 /**
- * Associates a local GObject with its matching remote dbus path.
+ * Associates a local object with its matching remote dbus path.
  *
  * @param dbus_path The dbus path name.
- * @param dbus_path The GObject.
+ * @param object The object.
  */
-void purple_dbus_assoc_gobject(const gchar *dbus_path, GObject *gobj);
+void purple_dbus_assoc_gobject(const gchar *dbus_path, gpointer object);
 
 /**
  * Disassociates a local GObject with its matching remote dbus path.
@@ -240,12 +240,12 @@ void purple_dbus_disassoc_gobject(const 
 void purple_dbus_disassoc_gobject(const gchar *dbus_path);
 
 /**
- * Get the local GObject associated with the given dbus path.
+ * Get the local object associated with the given dbus path.
  *
  * @param dbus_path The dbus path name.
- * @return The local GObject.
+ * @return The local object.
  */
-GObject* purple_dbus_get_gobject_by_path(const gchar *dbus_path);
+gpointer purple_dbus_get_gobject_by_path(const gchar *dbus_path);
 
 /**
 
============================================================
--- libpurple/pobject.c	31b3e0f66618b332d7c89307cff5cce7092b0778
+++ libpurple/pobject.c	3afd5286e61a3ecb9a107dd1a42d2143dde5f046
@@ -140,14 +140,14 @@ g_value_dbus_path2gobject(const GValue *
 static void
 g_value_dbus_path2gobject(const GValue *src, GValue *dest)
 {
-	GObject *obj = NULL;
+	gpointer obj = NULL;
 	gchar *path_name;
 
 	path_name = g_value_get_string(src);
 	if (path_name && path_name[0] != '\0') {
 		obj = purple_dbus_get_gobject_by_path(path_name);
 	}
-	g_value_set_object(dest, obj);
+	g_value_set_object(dest, G_OBJECT(obj));
 }
 
 /**