Author: kelnos
Date: 2008-10-20 20:11:31 +0000 (Mon, 20 Oct 2008)
New Revision: 28334
Modified:
xfconf/trunk/xfconf/xfconf-private.h
xfconf/trunk/xfconf/xfconf.c
Log:
remove vestigial org.xfce.Xfconf.GUI-related stuff
Modified: xfconf/trunk/xfconf/xfconf-private.h
===================================================================
--- xfconf/trunk/xfconf/xfconf-private.h 2008-10-20 20:07:30 UTC (rev
28333)
+++ xfconf/trunk/xfconf/xfconf-private.h 2008-10-20 20:11:31 UTC (rev
28334)
@@ -28,7 +28,6 @@
DBusGConnection *_xfconf_get_dbus_g_connection();
DBusGProxy *_xfconf_get_dbus_g_proxy();
-DBusGProxy *_xfconf_get_gui_dbus_g_proxy();
XfconfNamedStruct *_xfconf_named_struct_lookup(const gchar *struct_name);
Modified: xfconf/trunk/xfconf/xfconf.c
===================================================================
--- xfconf/trunk/xfconf/xfconf.c 2008-10-20 20:07:30 UTC (rev 28333)
+++ xfconf/trunk/xfconf/xfconf.c 2008-10-20 20:11:31 UTC (rev 28334)
@@ -37,7 +37,6 @@
static guint xfconf_refcnt = 0;
static DBusGConnection *dbus_conn = NULL;
static DBusGProxy *dbus_proxy = NULL;
-static DBusGProxy *gui_dbus_proxy = NULL;
static GHashTable *named_structs = NULL;
@@ -65,17 +64,6 @@
return dbus_proxy;
}
-DBusGProxy *
-_xfconf_get_gui_dbus_g_proxy()
-{
- if(!xfconf_refcnt) {
- g_critical("xfconf_init() must be called before attempting to use
libxfconf!");
- return NULL;
- }
-
- return gui_dbus_proxy;
-}
-
XfconfNamedStruct *
_xfconf_named_struct_lookup(const gchar *struct_name)
{
@@ -143,11 +131,6 @@
G_TYPE_STRING, G_TYPE_STRING,
G_TYPE_INVALID);
- gui_dbus_proxy = dbus_g_proxy_new_for_name(dbus_conn,
- "org.xfce.Xfconf",
- "/org/xfce/Xfconf",
- "org.xfce.Xfconf.GUI");
-
++xfconf_refcnt;
return TRUE;
}
@@ -181,9 +164,6 @@
g_object_unref(G_OBJECT(dbus_proxy));
dbus_proxy = NULL;
- g_object_unref(G_OBJECT(gui_dbus_proxy));
- gui_dbus_proxy = NULL;
-
dbus_g_connection_unref(dbus_conn);
dbus_conn = NULL;
_______________________________________________
Xfce4-commits mailing list
[email protected]
http://foo-projects.org/mailman/listinfo/xfce4-commits
