[telepathy-mission-control/master] McdService: don't register with GObject at all

Simon McVittie simon.mcvittie at collabora.co.uk
Thu Apr 2 12:41:09 PDT 2009


---
 src/mcd-service.c |  172 -----------------------------------------------------
 1 files changed, 0 insertions(+), 172 deletions(-)

diff --git a/src/mcd-service.c b/src/mcd-service.c
index 0d6b878..e5dcc47 100644
--- a/src/mcd-service.c
+++ b/src/mcd-service.c
@@ -106,175 +106,6 @@ typedef struct _McdServicePrivate
     gboolean is_disposed;
 } McdServicePrivate;
 
-#define MC_EMIT_ERROR_ASYNC(mi, err) \
-    g_assert (err != NULL); \
-    dbus_g_method_return_error (mi, err); \
-    g_warning ("%s: Returning async error '%s'", G_STRFUNC, err->message); \
-    g_error_free (err);
-
-#define MC_SHOW_ERROR(err) \
-    g_assert ((err) != NULL); \
-    g_warning ("%s: Returning error '%s'", G_STRFUNC, (err)->message);
-
-/* MC doesn't actually have an equivalent of NotImplemented. Sad face. */
-#define MC_NOT_IMPLEMENTED_SYNC(error) \
-    G_STMT_START { \
-        g_set_error (error, MC_ERROR, MC_NO_ACCOUNTS_ERROR, \
-                     "No longer implemented"); \
-        return FALSE; \
-    } G_STMT_END
-#define MC_NOT_IMPLEMENTED_ASYNC(context) \
-    G_STMT_START { \
-        GError e = { MC_ERROR, MC_NO_ACCOUNTS_ERROR, \
-            "No longer implemented" }; \
-        \
-        dbus_g_method_return_error (context, &e); \
-    } G_STMT_END
-
-/* Dbus interface implementation */
-static gboolean
-mcd_service_set_presence (GObject * obj, gint presence, gchar * message,
-			  GError ** error)
-{
-    MC_NOT_IMPLEMENTED_SYNC (error);
-}
-
-static gboolean
-mcd_service_get_presence (GObject *obj, gint *ret, GError **error)
-{
-    MC_NOT_IMPLEMENTED_SYNC (error);
-}
-
-static gboolean
-mcd_service_get_presence_message (GObject *obj, gchar **ret, GError **error)
-{
-    MC_NOT_IMPLEMENTED_SYNC (error);
-}
-
-static gboolean
-mcd_service_get_presence_actual (GObject *obj, gint *ret, GError **error)
-{
-    MC_NOT_IMPLEMENTED_SYNC (error);
-}
-
-static gboolean
-mcd_service_get_presence_message_actual (GObject *obj, gchar **ret,
-					 GError **error)
-{
-    MC_NOT_IMPLEMENTED_SYNC (error);
-}
-
-static void
-mcd_service_connect_all_with_default_presence (GObject * obj,
-					       DBusGMethodInvocation *mi)
-{
-    MC_NOT_IMPLEMENTED_ASYNC (mi);
-}
-
-static gboolean
-mcd_service_get_connection_status (GObject * obj, gchar * account_name,
-				   guint * ret, GError ** error)
-{
-    MC_NOT_IMPLEMENTED_SYNC (error);
-}
-
-static gboolean
-mcd_service_get_online_connections (GObject * obj,
-				    gchar *** ret, GError ** error)
-{
-    MC_NOT_IMPLEMENTED_SYNC (error);
-}
-
-static gboolean
-mcd_service_get_connection (GObject * obj, const gchar * account_name,
-			    gchar ** ret_servname,
-			    gchar ** ret_objpath, GError ** error)
-{
-    MC_NOT_IMPLEMENTED_SYNC (error);
-}
-
-static void
-mcd_service_request_channel (GObject * obj,
-			     const gchar * account_name,
-			     const gchar * type,
-			     guint handle,
-			     gint handle_type,
-			     guint serial,
-			     DBusGMethodInvocation *mi)
-{
-    MC_NOT_IMPLEMENTED_ASYNC (mi);
-}
-
-static void
-mcd_service_request_channel_with_string_handle (GObject * obj,
-						const gchar * account_name,
-						const gchar * type,
-						const gchar * handle,
-						gint handle_type,
-						guint serial,
-					       	DBusGMethodInvocation *mi)
-{
-    MC_NOT_IMPLEMENTED_ASYNC (mi);
-}
-
-static void
-mcd_service_cancel_channel_request (GObject * obj, guint operation_id,
-				    DBusGMethodInvocation *mi)
-{
-    MC_NOT_IMPLEMENTED_ASYNC (mi);
-}
-
-static gboolean
-mcd_service_get_used_channels_count (GObject * obj, const gchar *chan_type,
-				     guint * ret, GError ** error)
-{
-    MC_NOT_IMPLEMENTED_SYNC (error);
-}
-
-static gboolean
-mcd_service_get_account_for_connection(GObject *obj,
-				       const gchar *object_path,
-				       gchar **ret_unique_name,
-				       GError **error)
-{
-    MC_NOT_IMPLEMENTED_SYNC (error);
-}
-
-static gboolean
-mcd_service_get_current_status(GObject *obj,
-                               McStatus *status_out,
-                               TpConnectionPresenceType *presence_out,
-                               TpConnectionPresenceType *requested_presence_out,
-                               GPtrArray **accounts,
-                               GError **error)
-{
-    MC_NOT_IMPLEMENTED_SYNC (error);
-}
-
-static void
-mcd_service_remote_avatar_changed(GObject *obj,
-				  const gchar *object_path,
-				  guint contact_id,
-				  const gchar *token,
-				  DBusGMethodInvocation *mi)
-{
-    MC_NOT_IMPLEMENTED_ASYNC (mi);
-}
-
-static gboolean
-mcd_service_register_filter(GObject *obj,
-			    const gchar *bus_name,
-			    const gchar *object_path,
-			    const gchar *channel_type,
-			    guint priority,
-			    guint flags,
-			    GError **error)
-{
-    MC_NOT_IMPLEMENTED_SYNC (error);
-}
-
-#include "mcd-service-gen.h"
-
 static void
 mcd_service_obtain_bus_name (McdService * obj)
 {
@@ -688,9 +519,6 @@ mcd_service_class_init (McdServiceClass * self)
 		      0,
 		      NULL, NULL, _mcd_marshal_VOID__UINT_UINT,
 		      G_TYPE_NONE, 2, G_TYPE_UINT, G_TYPE_UINT);
-    
-    dbus_g_object_type_install_info (G_TYPE_FROM_CLASS (self),
-				     &dbus_glib_mcd_service_object_info);
 }
 
 McdService *
-- 
1.5.6.5




More information about the telepathy-commits mailing list