[telepathy-mission-control/master] Remove McdSystemFlags
Simon McVittie
simon.mcvittie at collabora.co.uk
Wed Sep 16 11:46:03 PDT 2009
---
src/mcd-mission.c | 83 ++++------------------------------------
src/mcd-mission.h | 28 +------------
src/mcd-operation.c | 13 ------
src/mcd-proxy.c | 5 --
test/twisted/mc-debug-server.c | 3 +
5 files changed, 14 insertions(+), 118 deletions(-)
diff --git a/src/mcd-mission.c b/src/mcd-mission.c
index 148625a..2bbe5d3 100644
--- a/src/mcd-mission.c
+++ b/src/mcd-mission.c
@@ -64,8 +64,8 @@ G_DEFINE_TYPE (McdMission, mcd_mission, G_TYPE_OBJECT);
typedef struct _McdMissionPrivate
{
McdMission *parent;
- McdSystemFlags flags;
+ gboolean connected;
gboolean is_disposed;
} McdMissionPrivate;
@@ -74,7 +74,6 @@ enum _McdMissionSignalType
{
CONNECTED,
DISCONNECTED,
- FLAGS_CHANGED,
PARENT_SET,
ABORT,
LAST_SIGNAL
@@ -83,7 +82,6 @@ enum _McdMissionSignalType
enum _McdMissionPropertyType
{
PROP_0,
- PROP_SYSTEM_FLAGS,
PROP_PARENT
};
@@ -97,12 +95,10 @@ _mcd_mission_connect (McdMission * mission)
g_return_if_fail (MCD_IS_MISSION (mission));
priv = MCD_MISSION_PRIV (mission);
- if (!mcd_mission_is_connected (mission))
+ if (!priv->connected)
{
- gint flags = mcd_mission_get_flags (mission);
- flags |= MCD_SYSTEM_CONNECTED;
- mcd_mission_set_flags (mission, flags);
- g_signal_emit_by_name (mission, "connected");
+ priv->connected = TRUE;
+ g_signal_emit_by_name (mission, "connected");
}
}
@@ -114,42 +110,14 @@ _mcd_mission_disconnect (McdMission * mission)
g_return_if_fail (MCD_IS_MISSION (mission));
priv = MCD_MISSION_PRIV (mission);
- if (mcd_mission_is_connected (mission))
+ if (priv->connected)
{
- gint flags = mcd_mission_get_flags (mission);
- flags &= ~MCD_SYSTEM_CONNECTED;
- mcd_mission_set_flags (mission, flags);
- g_signal_emit_by_name (mission, "disconnected");
+ priv->connected = FALSE;
+ g_signal_emit_by_name (mission, "disconnected");
}
}
static void
-_mcd_mission_set_flags (McdMission * mission, McdSystemFlags flags)
-{
- McdMissionPrivate *priv;
-
- g_return_if_fail (MCD_IS_MISSION (mission));
- priv = MCD_MISSION_PRIV (mission);
-
- if (priv->flags != flags)
- {
- priv->flags = flags;
- g_signal_emit_by_name (mission, "flags-changed", flags);
- }
-}
-
-static McdSystemFlags
-_mcd_mission_get_flags (McdMission * mission)
-{
- McdMissionPrivate *priv;
-
- g_return_val_if_fail (MCD_IS_MISSION (mission), 0);
- priv = MCD_MISSION_PRIV (mission);
-
- return priv->flags;
-}
-
-static void
on_parent_abort (McdMission *parent, McdMission *mission)
{
DEBUG ("called");
@@ -243,9 +211,6 @@ _mcd_set_property (GObject * object, guint prop_id, const GValue * val,
case PROP_PARENT:
mcd_mission_set_parent (mission, g_value_get_object (val));
break;
- case PROP_SYSTEM_FLAGS:
- mcd_mission_set_flags (mission, g_value_get_enum (val));
- break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break;
@@ -263,9 +228,6 @@ _mcd_get_property (GObject * object, guint prop_id, GValue * val,
case PROP_PARENT:
g_value_set_object (val, mcd_mission_get_parent (mission));
break;
- case PROP_SYSTEM_FLAGS:
- g_value_set_enum (val, mcd_mission_get_flags (mission));
- break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break;
@@ -288,8 +250,6 @@ mcd_mission_class_init (McdMissionClass * klass)
klass->abort = _mcd_mission_abort;
klass->connect = _mcd_mission_connect;
klass->disconnect = _mcd_mission_disconnect;
- klass->set_flags = _mcd_mission_set_flags;
- klass->get_flags = _mcd_mission_get_flags;
klass->set_parent = _mcd_mission_set_parent;
@@ -313,12 +273,6 @@ mcd_mission_class_init (McdMissionClass * klass)
disconnected_signal),
NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE,
0);
- mcd_mission_signals[FLAGS_CHANGED] =
- g_signal_new ("flags-changed", G_OBJECT_CLASS_TYPE (klass),
- G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (McdMissionClass,
- flags_changed_signal),
- NULL, NULL, g_cclosure_marshal_VOID__FLAGS, G_TYPE_NONE,
- 1, MCD_TYPE_SYSTEM_FLAGS);
mcd_mission_signals[PARENT_SET] =
g_signal_new ("parent-set", G_OBJECT_CLASS_TYPE (klass),
G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (McdMissionClass,
@@ -334,13 +288,6 @@ mcd_mission_class_init (McdMissionClass * klass)
"Parent mission",
MCD_TYPE_MISSION,
G_PARAM_READWRITE));
- g_object_class_install_property
- (object_class, PROP_SYSTEM_FLAGS,
- g_param_spec_flags ("system-flags",
- "System flags",
- "Mission control system flags",
- MCD_TYPE_SYSTEM_FLAGS, 0,
- G_PARAM_READWRITE));
}
static void
@@ -381,20 +328,6 @@ mcd_mission_abort (McdMission * mission)
MCD_MISSION_GET_CLASS (mission)->abort (mission);
}
-McdSystemFlags
-mcd_mission_get_flags (McdMission * mission)
-{
- g_return_val_if_fail (MCD_IS_MISSION (mission), 0);
- return MCD_MISSION_GET_CLASS (mission)->get_flags (mission);
-}
-
-void
-mcd_mission_set_flags (McdMission * mission, McdSystemFlags flags)
-{
- g_return_if_fail (MCD_IS_MISSION (mission));
- MCD_MISSION_GET_CLASS (mission)->set_flags (mission, flags);
-}
-
gboolean
mcd_mission_is_connected (McdMission * mission)
{
@@ -403,7 +336,7 @@ mcd_mission_is_connected (McdMission * mission)
g_return_val_if_fail (MCD_IS_MISSION (mission), FALSE);
priv = MCD_MISSION_PRIV (mission);
- return (priv->flags & MCD_SYSTEM_CONNECTED);
+ return priv->connected;
}
void
diff --git a/src/mcd-mission.h b/src/mcd-mission.h
index 921f17c..93e8b91 100644
--- a/src/mcd-mission.h
+++ b/src/mcd-mission.h
@@ -39,25 +39,6 @@ G_BEGIN_DECLS
#define MCD_IS_MISSION_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), MCD_TYPE_MISSION))
#define MCD_MISSION_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), MCD_TYPE_MISSION, McdMissionClass))
-#define MCD_MISSION_GET_FLAGS_MASKED(mission, flags) \
- (mcd_mission_get_flags (mission) & flags)
-
-#define MCD_MISSION_SET_FLAGS_MASKED(mission, flags) \
- (mcd_mission_set_flags (mission, mcd_mission_get_flags (mission) | flags))
-
-#define MCD_MISSION_UNSET_FLAGS_MASKED(mission, flags) \
- (mcd_mission_set_flags (mission, mcd_mission_get_flags (mission) & (~flags)))
-
-typedef enum
-{
- MCD_SYSTEM_CONNECTED = 1,
- MCD_SYSTEM_MEMORY_CONSERVED = 1 << 1,
- MCD_SYSTEM_POWER_CONSERVED = 1 << 2,
- MCD_SYSTEM_SCREEN_BLANKED = 1 << 3,
- MCD_SYSTEM_LOCKED = 1 << 4,
- MCD_SYSTEM_IDLE = 1 << 5
-} McdSystemFlags;
-
typedef struct _McdMission McdMission;
typedef struct _McdMissionClass McdMissionClass;
@@ -75,7 +56,7 @@ struct _McdMissionClass
void (*connected_signal) (McdMission * mission);
void (*disconnected_signal) (McdMission * mission);
- void (*flags_changed_signal) (McdMission *mission, McdSystemFlags flags);
+ void (*_former_flags_changed_signal) (void);
void (*_former_mode_set_signal) (void);
void (*abort_signal) (McdMission * mission);
@@ -86,8 +67,8 @@ struct _McdMissionClass
void (*connect) (McdMission * mission);
void (*disconnect) (McdMission * mission);
- void (*set_flags) (McdMission *mission, McdSystemFlags flags);
- McdSystemFlags (*get_flags) (McdMission *mission);
+ void (*_former_set_flags) (void);
+ void (*_former_get_flags) (void);
void (*_former_set_mode) (void);
void (*_former_get_mode) (void);
@@ -108,8 +89,5 @@ void mcd_mission_set_parent (McdMission * mission, McdMission * parent);
void mcd_mission_connect (McdMission * mission);
void mcd_mission_disconnect (McdMission * mission);
-void mcd_mission_set_flags (McdMission * mission, McdSystemFlags flags);
-McdSystemFlags mcd_mission_get_flags (McdMission * mission);
-
G_END_DECLS
#endif /* MCD_MISSION_H */
diff --git a/src/mcd-operation.c b/src/mcd-operation.c
index 08fa443..78a19b6 100644
--- a/src/mcd-operation.c
+++ b/src/mcd-operation.c
@@ -165,27 +165,15 @@ _mcd_operation_disconnect (McdMission * mission)
}
static void
-_mcd_operation_set_flags (McdMission * mission, McdSystemFlags flags)
-{
- McdOperationPrivate *priv = MCD_OPERATION_PRIV (mission);
- g_list_foreach (priv->missions, (GFunc) mcd_mission_set_flags,
- GINT_TO_POINTER (flags));
- MCD_MISSION_CLASS (mcd_operation_parent_class)->set_flags (mission, flags);
-}
-
-static void
_mcd_operation_take_mission (McdOperation * operation, McdMission * mission)
{
McdOperationPrivate *priv = MCD_OPERATION_PRIV (operation);
- McdSystemFlags flags;
priv->missions = g_list_prepend (priv->missions, mission);
mcd_mission_set_parent (mission, MCD_MISSION (operation));
if (mcd_mission_is_connected (MCD_MISSION (operation)))
mcd_mission_connect (mission);
- flags = mcd_mission_get_flags (MCD_MISSION (operation));
- mcd_mission_set_flags (mission, flags);
g_signal_connect (mission, "abort",
G_CALLBACK (on_mission_abort), operation);
@@ -223,7 +211,6 @@ mcd_operation_class_init (McdOperationClass * klass)
mission_class->connect = _mcd_operation_connect;
mission_class->disconnect = _mcd_operation_disconnect;
- mission_class->set_flags = _mcd_operation_set_flags;
klass->take_mission = _mcd_operation_take_mission;
klass->remove_mission = _mcd_operation_remove_mission;
diff --git a/src/mcd-proxy.c b/src/mcd-proxy.c
index 64564a1..ef39058 100644
--- a/src/mcd-proxy.c
+++ b/src/mcd-proxy.c
@@ -76,8 +76,6 @@ _mcd_proxy_connect_signals (McdProxy * proxy)
G_CALLBACK (mcd_mission_connect), proxy);
g_signal_connect_swapped (priv->proxy_object, "disconnected",
G_CALLBACK (mcd_mission_disconnect), proxy);
- g_signal_connect_swapped (priv->proxy_object, "flags-changed",
- G_CALLBACK (mcd_mission_set_flags), proxy);
g_signal_connect_swapped (priv->proxy_object, "abort",
G_CALLBACK (_mcd_proxy_abort), proxy);
}
@@ -94,9 +92,6 @@ _mcd_proxy_disconnect_signals (McdProxy * proxy)
G_CALLBACK (mcd_mission_disconnect),
proxy);
g_signal_handlers_disconnect_by_func (priv->proxy_object,
- G_CALLBACK (mcd_mission_set_flags),
- proxy);
- g_signal_handlers_disconnect_by_func (priv->proxy_object,
G_CALLBACK (_mcd_proxy_abort), proxy);
}
diff --git a/test/twisted/mc-debug-server.c b/test/twisted/mc-debug-server.c
index 7130392..92b7209 100644
--- a/test/twisted/mc-debug-server.c
+++ b/test/twisted/mc-debug-server.c
@@ -66,6 +66,9 @@ on_abort (gpointer unused G_GNUC_UNUSED)
mcd = NULL;
}
+#define MCD_SYSTEM_MEMORY_CONSERVED (1 << 1)
+#define MCD_SYSTEM_IDLE (1 << 5)
+
static DBusHandlerResult
dbus_filter_function (DBusConnection *connection,
DBusMessage *message,
--
1.5.6.5
More information about the telepathy-commits
mailing list