From ce969c6347b69180088c592e9184f05d0d3525c4 Mon Sep 17 00:00:00 2001
From: Havoc Pennington <hp@redhat.com>
Date: Sat, 30 Aug 2003 02:56:12 +0000
Subject: 2003-08-29  Havoc Pennington  <hp@pobox.com>

	* dbus/dbus-object-tree.c: modify to allow overlapping paths to be
	registered
	(struct DBusObjectSubtree): shrink this
	a lot, since we may have a lot of them
	(_dbus_object_tree_free_all_unlocked): implement
	(_dbus_object_tree_dispatch_and_unlock): implement
---
 glib/dbus-gidl.c |  5 +----
 glib/dbus-gidl.h | 10 +---------
 2 files changed, 2 insertions(+), 13 deletions(-)

(limited to 'glib')

diff --git a/glib/dbus-gidl.c b/glib/dbus-gidl.c
index b6e0fb8c..c1a1f6dc 100644
--- a/glib/dbus-gidl.c
+++ b/glib/dbus-gidl.c
@@ -37,7 +37,6 @@ struct MethodInfo
   int refcount;
   GSList *args;
   char *name;
-  MethodStyle style;
 };
 
 struct SignalInfo
@@ -157,15 +156,13 @@ free_arg_list (GSList **args_p)
 }
 
 MethodInfo*
-method_info_new (const char *name,
-                 MethodStyle style)
+method_info_new (const char *name)
 {
   MethodInfo *info;
 
   info = g_new0 (MethodInfo, 1);
   info->refcount = 1;
   info->name = g_strdup (name);
-  info->style = style;
   
   return info;
 }
diff --git a/glib/dbus-gidl.h b/glib/dbus-gidl.h
index c3c72d61..812e1866 100644
--- a/glib/dbus-gidl.h
+++ b/glib/dbus-gidl.h
@@ -40,13 +40,6 @@ typedef enum
   ARG_OUT
 } ArgDirection;
 
-typedef enum
-{
-  METHOD_SYNC,
-  METHOD_ASYNC,
-  METHOD_CANCELLABLE
-} MethodStyle;
-
 InterfaceInfo* interface_info_new         (const char    *name);
 void           interface_info_ref         (InterfaceInfo *info);
 void           interface_info_unref       (InterfaceInfo *info);
@@ -57,8 +50,7 @@ void           interface_info_add_method  (InterfaceInfo *info,
 void           interface_info_add_signal  (InterfaceInfo *info,
                                            SignalInfo    *signal);
 
-MethodInfo*    method_info_new            (const char    *name,
-                                           MethodStyle    style);
+MethodInfo*    method_info_new            (const char    *name);
 void           method_info_ref            (MethodInfo    *info);
 void           method_info_unref          (MethodInfo    *info);
 
-- 
cgit