[telepathy-mission-control/master] McdPresenceFrame: remove from source tree, leaving only a stub header
Simon McVittie
simon.mcvittie at collabora.co.uk
Mon Apr 13 05:06:10 PDT 2009
---
.../libmissioncontrol-server.types | 2 -
.../libmissioncontrol-server/tmpl/mcd-master.sgml | 5 -
.../tmpl/mcd-presence-frame.sgml | 14 -
src/Makefile.am | 1 -
src/mcd-presence-frame.c | 414 --------------------
src/mcd-presence-frame.h | 53 +---
6 files changed, 1 insertions(+), 488 deletions(-)
delete mode 100644 src/mcd-presence-frame.c
diff --git a/doc/reference/libmissioncontrol-server/libmissioncontrol-server.types b/doc/reference/libmissioncontrol-server/libmissioncontrol-server.types
index 82eff52..f261f5a 100644
--- a/doc/reference/libmissioncontrol-server/libmissioncontrol-server.types
+++ b/doc/reference/libmissioncontrol-server/libmissioncontrol-server.types
@@ -7,7 +7,6 @@
#include <mcd-master.h>
#include <mcd-mission.h>
#include <mcd-operation.h>
-#include <mcd-presence-frame.h>
#include <mcd-proxy.h>
#include <mcd-provisioning.h>
#include <mcd-provisioning-factory.h>
@@ -21,7 +20,6 @@ mcd_manager_get_type
mcd_master_get_type
mcd_mission_get_type
mcd_operation_get_type
-mcd_presence_frame_get_type
mcd_provisioning_get_type
mcd_provisioning_factory_get_type
mcd_proxy_get_type
diff --git a/doc/reference/libmissioncontrol-server/tmpl/mcd-master.sgml b/doc/reference/libmissioncontrol-server/tmpl/mcd-master.sgml
index 2ccea9c..207ebb8 100644
--- a/doc/reference/libmissioncontrol-server/tmpl/mcd-master.sgml
+++ b/doc/reference/libmissioncontrol-server/tmpl/mcd-master.sgml
@@ -48,11 +48,6 @@ McdMaster
</para>
-<!-- ##### ARG McdMaster:presence-frame ##### -->
-<para>
-
-</para>
-
<!-- ##### FUNCTION mcd_master_set_default_presence_setting ##### -->
<para>
diff --git a/doc/reference/libmissioncontrol-server/tmpl/mcd-presence-frame.sgml b/doc/reference/libmissioncontrol-server/tmpl/mcd-presence-frame.sgml
index 25bcb67..1b515ec 100644
--- a/doc/reference/libmissioncontrol-server/tmpl/mcd-presence-frame.sgml
+++ b/doc/reference/libmissioncontrol-server/tmpl/mcd-presence-frame.sgml
@@ -17,17 +17,3 @@ McdPresenceFrame
<!-- ##### SECTION Stability_Level ##### -->
-<!-- ##### STRUCT McdPresenceFrame ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### FUNCTION mcd_presence_frame_new ##### -->
-<para>
-
-</para>
-
- at Returns:
-
-
diff --git a/src/Makefile.am b/src/Makefile.am
index e2a0ca3..3489bbe 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -142,7 +142,6 @@ libmissioncontrol_server_la_SOURCES = \
mcd-master.c \
mcd-manager.c \
mcd-connection.c \
- mcd-presence-frame.c \
mcd-dispatcher.c \
mcd-channel.c \
mcd-service.c \
diff --git a/src/mcd-presence-frame.c b/src/mcd-presence-frame.c
deleted file mode 100644
index b7734c7..0000000
--- a/src/mcd-presence-frame.c
+++ /dev/null
@@ -1,414 +0,0 @@
-/* vi: set et sw=4 ts=8 cino=t0,(0: */
-/* -*- Mode: C; indent-tabs-mode: nil; c-basic-offset: 4; tab-width: 8 -*- */
-/*
- * This file is part of mission-control
- *
- * Copyright (C) 2007 Nokia Corporation.
- *
- * Contact: Naba Kumar <naba.kumar at nokia.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * version 2.1 as published by the Free Software Foundation.
- *
- * This library is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA
- *
- */
-
-/**
- * SECTION:mcd-presence-frame
- * @title: McdPresenceFrame
- * @short_description: Presence maintenance framework
- * @see_also:
- * @stability: Unstable
- * @include: mcd-presence-frame.h
- *
- * FIXME
- */
-
-#include "mcd-signals-marshal.h"
-#include "mcd-presence-frame.h"
-#include "mcd-account.h"
-#include <telepathy-glib/util.h>
-
-#define MCD_PRESENCE_FRAME_PRIV(pframe) (G_TYPE_INSTANCE_GET_PRIVATE ((pframe), \
- MCD_TYPE_PRESENCE_FRAME, \
- McdPresenceFramePrivate))
-
-G_DEFINE_TYPE (McdPresenceFrame, mcd_presence_frame, MCD_TYPE_MISSION);
-
-typedef struct _McdPresence
-{
- TpConnectionPresenceType presence;
- gchar *message;
- TpConnectionStatus connection_status;
- TpConnectionStatusReason connection_reason;
-} McdPresence;
-
-typedef struct _McdPresenceFramePrivate
-{
- McdAccountManager *account_manager;
-
- McdPresence *requested_presence;
- McdPresence *actual_presence;
- GList *accounts;
-
- TpConnectionStatus actual_status;
-} McdPresenceFramePrivate;
-
-typedef struct _McdActualPresenceInfo {
- TpConnectionPresenceType presence;
- TpConnectionPresenceType requested_presence;
- gboolean found;
-} McdActualPresenceInfo;
-
-static gboolean
-mcd_presence_frame_remove_account (McdPresenceFrame *presence_frame,
- McdAccount *account);
-
-static McdPresence *
-mcd_presence_new (TpConnectionPresenceType tp_presence,
- const gchar * presence_message,
- TpConnectionStatus connection_status,
- TpConnectionStatusReason connection_reason)
-{
- McdPresence *presence = g_new0 (McdPresence, 1);
- presence->presence = tp_presence;
- if (presence_message)
- {
- presence->message = g_strdup (presence_message);
- }
-
- else
- {
- presence->message = NULL;
- }
-
- presence->connection_status = connection_status;
- presence->connection_reason = connection_reason;
- return presence;
-}
-
-static void
-mcd_presence_free (McdPresence * presence)
-{
- g_free (presence->message);
- g_free (presence);
-}
-
-static void
-_mcd_presence_frame_dispose (GObject * object)
-{
- McdPresenceFramePrivate *priv;
-
- priv = MCD_PRESENCE_FRAME_PRIV (object);
-
- g_list_foreach (priv->accounts, (GFunc)g_object_unref, NULL);
- g_list_free (priv->accounts);
- priv->accounts = NULL;
-
- if (priv->account_manager)
- {
- g_object_unref (priv->account_manager);
- priv->account_manager = NULL;
- }
-
- G_OBJECT_CLASS (mcd_presence_frame_parent_class)->dispose (object);
-}
-
-static void
-_mcd_presence_frame_finalize (GObject * object)
-{
- McdPresenceFrame *cobj;
- McdPresenceFramePrivate *priv;
-
- cobj = MCD_PRESENCE_FRAME (object);
- priv = MCD_PRESENCE_FRAME_PRIV (object);
-
- mcd_presence_free (priv->actual_presence);
- if (priv->requested_presence)
- mcd_presence_free (priv->requested_presence);
-
- G_OBJECT_CLASS (mcd_presence_frame_parent_class)->finalize (object);
-}
-
-static void
-mcd_presence_frame_disconnect (McdMission *mission)
-{
- McdPresenceFramePrivate *priv = MCD_PRESENCE_FRAME_PRIV (mission);
-
- /* If connectivity goes away MC will abort processing a presence request;
- * so we must clear the requested-presence for consistency, or McdMaster
- * will think we are still trying to go online. */
- if (priv->requested_presence)
- {
- mcd_presence_free (priv->requested_presence);
- priv->requested_presence = NULL;
- }
-}
-
-static void
-mcd_presence_frame_class_init (McdPresenceFrameClass * klass)
-{
- GObjectClass *object_class = G_OBJECT_CLASS (klass);
- McdMissionClass *mission_class = MCD_MISSION_CLASS (klass);
-
- g_type_class_add_private (object_class, sizeof (McdPresenceFramePrivate));
-
- object_class->dispose = _mcd_presence_frame_dispose;
- object_class->finalize = _mcd_presence_frame_finalize;
- mission_class->disconnect = mcd_presence_frame_disconnect;
-}
-
-static void
-mcd_presence_frame_init (McdPresenceFrame * obj)
-{
- McdPresenceFramePrivate *priv = MCD_PRESENCE_FRAME_PRIV (obj);
-
- priv->actual_presence = mcd_presence_new (TP_CONNECTION_PRESENCE_TYPE_UNSET,
- NULL,
- TP_CONNECTION_STATUS_DISCONNECTED,
- TP_CONNECTION_STATUS_REASON_NONE_SPECIFIED);
- priv->requested_presence = NULL;
-
- priv->actual_status = TP_CONNECTION_STATUS_DISCONNECTED;
-}
-
-/* Public */
-
-McdPresenceFrame *
-mcd_presence_frame_new (void)
-{
- McdPresenceFrame *obj;
- obj = MCD_PRESENCE_FRAME (g_object_new (MCD_TYPE_PRESENCE_FRAME, NULL));
- return obj;
-}
-
-static TpConnectionPresenceType
-mcd_presence_frame_get_requested_presence (McdPresenceFrame * presence_frame)
-{
- McdPresenceFramePrivate *priv;
- g_return_val_if_fail (MCD_IS_PRESENCE_FRAME (presence_frame),
- TP_CONNECTION_PRESENCE_TYPE_UNSET);
- priv = MCD_PRESENCE_FRAME_PRIV (presence_frame);
-
- if (priv->requested_presence)
- return priv->requested_presence->presence;
- else
- return TP_CONNECTION_PRESENCE_TYPE_UNSET;
-}
-
-static void
-_mcd_presence_frame_update_actual_presences (gpointer val, gpointer userdata)
-{
- McdAccount *account = val;
- McdActualPresenceInfo *info = userdata;
- TpConnectionPresenceType presence;
- const gchar *status, *message;
-
- if (info->found) return;
- mcd_account_get_requested_presence (account, &presence,
- &status, &message);
- if (presence == info->requested_presence)
- {
- info->presence = presence;
- info->found = TRUE;
- }
- else if (info->presence < presence)
- info->presence = presence;
-}
-
-static void
-_mcd_presence_frame_update_actual_presence (McdPresenceFrame * presence_frame,
- const gchar * presence_message)
-{
- McdPresenceFramePrivate *priv;
- McdActualPresenceInfo pi;
- TpConnectionStatus connection_status;
- TpConnectionStatusReason connection_reason;
-
- DEBUG ("called");
-
- pi.presence = TP_CONNECTION_PRESENCE_TYPE_UNSET;
- pi.requested_presence = mcd_presence_frame_get_requested_presence (presence_frame);
- pi.found = FALSE;
- priv = MCD_PRESENCE_FRAME_PRIV (presence_frame);
- g_list_foreach (priv->accounts,
- _mcd_presence_frame_update_actual_presences, &pi);
-
- connection_status = priv->actual_presence->connection_status;
- connection_reason = priv->actual_presence->connection_reason;
-
- mcd_presence_free (priv->actual_presence);
- priv->actual_presence = mcd_presence_new (pi.presence,
- presence_message,
- connection_status,
- connection_reason);
-
- DEBUG ("presence actual: %d", pi.presence);
-}
-
-static void
-on_account_current_presence_changed (McdAccount *account,
- TpConnectionPresenceType presence,
- const gchar *status, const gchar *message,
- McdPresenceFrame *presence_frame)
-{
- _mcd_presence_frame_update_actual_presence (presence_frame,
- message);
-}
-
-static void
-_mcd_presence_frame_update_actual_status (McdPresenceFrame *presence_frame)
-{
- McdPresenceFramePrivate *priv = MCD_PRESENCE_FRAME_PRIV (presence_frame);
- GList *list;
-
- priv->actual_status = TP_CONNECTION_STATUS_DISCONNECTED;
- for (list = priv->accounts; list; list = list->next)
- {
- McdAccount *account = list->data;
- TpConnectionStatus status;
-
- status = mcd_account_get_connection_status (account);
- DEBUG ("Account %s is %d", mcd_account_get_unique_name (account),
- status);
- if (status == TP_CONNECTION_STATUS_CONNECTING)
- {
- priv->actual_status = status;
- break;
- }
- else if (status == TP_CONNECTION_STATUS_CONNECTED)
- priv->actual_status = status;
- }
-}
-
-static void
-on_account_connection_status_changed (McdAccount *account,
- TpConnectionStatus status,
- TpConnectionStatusReason reason,
- McdPresenceFrame *presence_frame)
-{
- _mcd_presence_frame_update_actual_status (presence_frame);
-}
-
-static void
-on_account_removed (McdAccount *account,
- McdPresenceFrame *presence_frame)
-{
- mcd_presence_frame_remove_account (presence_frame, account);
-}
-
-static gboolean
-mcd_presence_frame_add_account (McdPresenceFrame * presence_frame,
- McdAccount *account)
-{
- McdPresenceFramePrivate *priv = MCD_PRESENCE_FRAME_PRIV (presence_frame);
- GList *pos;
-
- /* Let's see if we already have the account */
- pos = g_list_find (priv->accounts, account);
- if (pos) return FALSE;
-
- g_object_ref (account);
- priv->accounts = g_list_prepend (priv->accounts,
- account);
- g_signal_connect (account, "current-presence-changed",
- G_CALLBACK (on_account_current_presence_changed),
- presence_frame);
- g_signal_connect (account, "connection-status-changed",
- G_CALLBACK (on_account_connection_status_changed),
- presence_frame);
- g_signal_connect (account, "removed",
- G_CALLBACK (on_account_removed),
- presence_frame);
-
- return TRUE;
-}
-
-static gboolean
-mcd_presence_frame_remove_account (McdPresenceFrame * presence_frame,
- McdAccount *account)
-{
- McdPresenceFramePrivate *priv = MCD_PRESENCE_FRAME_PRIV (presence_frame);
- GList *pos;
-
- pos = g_list_find (priv->accounts, account);
- if (!pos) return FALSE;
-
- DEBUG ("removing account %s", mcd_account_get_unique_name (account));
- /*_mcd_presence_frame_update_actual_presence (presence_frame, NULL);*/
- g_signal_handlers_disconnect_by_func (account,
- on_account_current_presence_changed,
- presence_frame);
- g_signal_handlers_disconnect_by_func (account,
- on_account_connection_status_changed,
- presence_frame);
- g_signal_handlers_disconnect_by_func (account,
- on_account_removed,
- presence_frame);
- g_object_unref (account);
- priv->accounts = g_list_delete_link (priv->accounts, pos);
-
- if (g_list_length (priv->accounts) == 0)
- {
- if (priv->requested_presence)
- {
- mcd_presence_free (priv->requested_presence);
- priv->requested_presence = NULL;
- }
- }
-
- return TRUE;
-}
-
-static void
-add_account (gpointer key, gpointer value, gpointer userdata)
-{
- McdPresenceFrame *presence_frame = userdata;
- McdAccount *account = value;
-
- if (!mcd_account_is_valid (account)) return;
- mcd_presence_frame_add_account (presence_frame, account);
-}
-
-static void
-on_account_validity_changed (McdAccountManager *account_manager,
- const gchar *object_path, gboolean valid,
- McdPresenceFrame *presence_frame)
-{
- McdAccount *account;
-
- account = mcd_account_manager_lookup_account_by_path (account_manager,
- object_path);
- if (valid)
- mcd_presence_frame_add_account (presence_frame, account);
- else
- mcd_presence_frame_remove_account (presence_frame, account);
-}
-
-void
-mcd_presence_frame_set_account_manager (McdPresenceFrame *presence_frame,
- McdAccountManager *account_manager)
-{
- McdPresenceFramePrivate *priv = MCD_PRESENCE_FRAME_PRIV (presence_frame);
- GHashTable *accounts;
-
- g_object_ref (account_manager);
- priv->account_manager = account_manager;
- accounts = mcd_account_manager_get_accounts (priv->account_manager);
-
- g_hash_table_foreach (accounts, add_account, presence_frame);
-
- g_signal_connect (account_manager, "account-validity-changed",
- G_CALLBACK (on_account_validity_changed),
- presence_frame);
-}
diff --git a/src/mcd-presence-frame.h b/src/mcd-presence-frame.h
index 93b946e..e75f7dd 100644
--- a/src/mcd-presence-frame.h
+++ b/src/mcd-presence-frame.h
@@ -1,28 +1,3 @@
-/* vi: set et sw=4 ts=8 cino=t0,(0: */
-/* -*- Mode: C; indent-tabs-mode: nil; c-basic-offset: 4; tab-width: 8 -*- */
-/*
- * This file is part of mission-control
- *
- * Copyright (C) 2007 Nokia Corporation.
- *
- * Contact: Naba Kumar <naba.kumar at nokia.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * version 2.1 as published by the Free Software Foundation.
- *
- * This library is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA
- *
- */
-
#ifndef MCD_PRESENCE_FRAME_H
#define MCD_PRESENCE_FRAME_H
@@ -30,35 +5,9 @@
#include <glib-object.h>
#include "mcd-mission.h"
-
-G_BEGIN_DECLS
-#define MCD_TYPE_PRESENCE_FRAME (mcd_presence_frame_get_type ())
-#define MCD_PRESENCE_FRAME(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), MCD_TYPE_PRESENCE_FRAME, McdPresenceFrame))
-#define MCD_PRESENCE_FRAME_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), MCD_TYPE_PRESENCE_FRAME, McdPresenceFrameClass))
-#define MCD_IS_PRESENCE_FRAME(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), MCD_TYPE_PRESENCE_FRAME))
-#define MCD_IS_PRESENCE_FRAME_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), MCD_TYPE_PRESENCE_FRAME))
-#define MCD_PRESENCE_FRAME_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), MCD_TYPE_PRESENCE_FRAME, McdPresenceFrameClass))
-typedef struct _McdPresenceFrame McdPresenceFrame;
-typedef struct _McdPresenceFrameClass McdPresenceFrameClass;
-
#include "mcd-account.h"
#include "mcd-account-manager.h"
-struct _McdPresenceFrame
-{
- McdMission parent;
-};
-
-struct _McdPresenceFrameClass
-{
- McdMissionClass parent_class;
-};
-
-GType mcd_presence_frame_get_type (void);
-McdPresenceFrame *mcd_presence_frame_new (void);
-
-void mcd_presence_frame_set_account_manager (McdPresenceFrame *presence_frame,
- McdAccountManager *account_manager);
+/* there is no presence frame */
-G_END_DECLS
#endif /* MCD_PRESENCE_FRAME_H */
--
1.5.6.5
More information about the telepathy-commits
mailing list