Split proxy.h into proxy.h (for normal use) and proxy-subclass.h (for subclasses/mixins only)

20071218134907-53eee-040b9b19c3aba50993cddfc333bd36bd0373ef98.gz

1 files changed, 9 insertions, 33 deletions

diff --git a/telepathy-glib/proxy.h b/telepathy-glib/proxy.h
index ead71e06e..44ed7bceb 100644
--- a/telepathy-glib/proxy.h
+++ b/telepathy-glib/proxy.h
@@ -65,36 +65,12 @@ struct _TpProxyClass {
 
 typedef struct _TpProxyPendingCall TpProxyPendingCall;
 
-TpProxyPendingCall *tp_proxy_pending_call_new (TpProxy *self,
-    GQuark interface, const gchar *member, GCallback callback,
-    gpointer user_data, GDestroyNotify destroy, GObject *weak_object,
-    void (*raise_error) (TpProxyPendingCall *));
-
-void tp_proxy_pending_call_free (gpointer self);
-
 void tp_proxy_pending_call_cancel (TpProxyPendingCall *self);
 
-GCallback tp_proxy_pending_call_steal_callback (TpProxyPendingCall *self,
-    TpProxy **proxy_out, gpointer *user_data_out, GObject **weak_object_out);
-
-void tp_proxy_pending_call_take_pending_call (TpProxyPendingCall *self,
-    DBusGProxyCall *pending_call);
-
 typedef struct _TpProxySignalConnection TpProxySignalConnection;
 
-TpProxySignalConnection *tp_proxy_signal_connection_new (TpProxy *self,
-    GQuark interface, const gchar *member, GCallback callback,
-    gpointer user_data, GDestroyNotify destroy, GObject *weak_object,
-    GCallback impl_callback);
-
-void tp_proxy_signal_connection_free_closure (gpointer self, GClosure *unused);
-
 void tp_proxy_signal_connection_disconnect (TpProxySignalConnection *self);
 
-GCallback tp_proxy_signal_connection_get_callback
-    (TpProxySignalConnection *self, TpProxy **proxy_out,
-     gpointer *user_data_out, GObject **weak_object_out);
-
 GType tp_proxy_get_type (void);
 
 /* TYPE MACROS */
@@ -114,18 +90,18 @@ GType tp_proxy_get_type (void);
   (G_TYPE_INSTANCE_GET_CLASS ((obj), TP_TYPE_PROXY, \
                               TpProxyClass))
 
-typedef void (*TpProxyInterfaceAddedCb) (TpProxy *self,
-    guint quark, DBusGProxy *proxy, gpointer unused);
-
-void tp_proxy_class_hook_on_interface_add (TpProxyClass *klass,
-    TpProxyInterfaceAddedCb callback);
+gboolean tp_proxy_has_interface_by_id (gpointer self, GQuark interface);
 
-DBusGProxy *tp_proxy_borrow_interface_by_id (TpProxy *self, GQuark interface,
-    GError **error);
+static inline gboolean
+_tp_proxy_inline_has_interface (gpointer self, const gchar *interface)
+{
+  GQuark q = g_quark_try_string (interface);
 
-DBusGProxy *tp_proxy_add_interface_by_id (TpProxy *self, GQuark interface);
+  return q != 0 && tp_proxy_has_interface_by_id (self, q);
+}
 
-void tp_proxy_invalidated (TpProxy *self, const GError *error);
+#define tp_proxy_has_interface(self, interface) \
+    (_tp_proxy_inline_has_interface (self, interface))
 
 G_END_DECLS