[telepathy-mission-control/master] Remove McdMode
Simon McVittie
simon.mcvittie at collabora.co.uk
Wed Sep 16 11:14:38 PDT 2009
---
.../tmpl/mcd-enum-types.sgml | 15 ----
.../libmissioncontrol-server/tmpl/mcd-mission.sgml | 41 ------------
src/mcd-mission.c | 69 +-------------------
src/mcd-mission.h | 17 +----
src/mcd-operation.c | 16 +----
src/mcd-proxy.c | 5 --
6 files changed, 6 insertions(+), 157 deletions(-)
diff --git a/doc/reference/libmissioncontrol-server/tmpl/mcd-enum-types.sgml b/doc/reference/libmissioncontrol-server/tmpl/mcd-enum-types.sgml
index 164ad57..bfd5a9d 100644
--- a/doc/reference/libmissioncontrol-server/tmpl/mcd-enum-types.sgml
+++ b/doc/reference/libmissioncontrol-server/tmpl/mcd-enum-types.sgml
@@ -17,21 +17,6 @@ mcd-enum-types
<!-- ##### SECTION Stability_Level ##### -->
-<!-- ##### FUNCTION mcd_mode_get_type ##### -->
-<para>
-
-</para>
-
- at Returns:
-
-
-<!-- ##### MACRO MCD_TYPE_MODE ##### -->
-<para>
-
-</para>
-
-
-
<!-- ##### FUNCTION mcd_system_flags_get_type ##### -->
<para>
diff --git a/doc/reference/libmissioncontrol-server/tmpl/mcd-mission.sgml b/doc/reference/libmissioncontrol-server/tmpl/mcd-mission.sgml
index 0bc384d..cf783cc 100644
--- a/doc/reference/libmissioncontrol-server/tmpl/mcd-mission.sgml
+++ b/doc/reference/libmissioncontrol-server/tmpl/mcd-mission.sgml
@@ -52,14 +52,6 @@ McdMission
@mcdmission: the object which received the signal.
@arg1:
-<!-- ##### SIGNAL McdMission::mode-set ##### -->
-<para>
-
-</para>
-
- at mcdmission: the object which received the signal.
- at arg1:
-
<!-- ##### SIGNAL McdMission::parent-set ##### -->
<para>
@@ -67,11 +59,6 @@ McdMission
@mcdmission: the object which received the signal.
-<!-- ##### ARG McdMission:mode ##### -->
-<para>
-
-</para>
-
<!-- ##### ARG McdMission:parent ##### -->
<para>
@@ -109,16 +96,6 @@ McdMission
@flags:
-<!-- ##### ENUM McdMode ##### -->
-<para>
-
-</para>
-
- at MCD_MODE_UNKNOWN:
- at MCD_MODE_NORMAL:
- at MCD_MODE_RESTRICTED:
- at MCD_MODE_CALL:
-
<!-- ##### ENUM McdSystemFlags ##### -->
<para>
@@ -208,21 +185,3 @@ McdMission
@Returns:
-<!-- ##### FUNCTION mcd_mission_set_mode ##### -->
-<para>
-
-</para>
-
- at mission:
- at mode:
-
-
-<!-- ##### FUNCTION mcd_mission_get_mode ##### -->
-<para>
-
-</para>
-
- at mission:
- at Returns:
-
-
diff --git a/src/mcd-mission.c b/src/mcd-mission.c
index 4a621d3..148625a 100644
--- a/src/mcd-mission.c
+++ b/src/mcd-mission.c
@@ -65,8 +65,7 @@ typedef struct _McdMissionPrivate
{
McdMission *parent;
McdSystemFlags flags;
- McdMode mode;
-
+
gboolean is_disposed;
} McdMissionPrivate;
@@ -76,7 +75,6 @@ enum _McdMissionSignalType
CONNECTED,
DISCONNECTED,
FLAGS_CHANGED,
- MODE_SET,
PARENT_SET,
ABORT,
LAST_SIGNAL
@@ -86,7 +84,6 @@ enum _McdMissionPropertyType
{
PROP_0,
PROP_SYSTEM_FLAGS,
- PROP_MODE,
PROP_PARENT
};
@@ -146,40 +143,13 @@ _mcd_mission_get_flags (McdMission * mission)
{
McdMissionPrivate *priv;
- g_return_val_if_fail (MCD_IS_MISSION (mission), MCD_MODE_UNKNOWN);
+ g_return_val_if_fail (MCD_IS_MISSION (mission), 0);
priv = MCD_MISSION_PRIV (mission);
return priv->flags;
}
static void
-_mcd_mission_set_mode (McdMission * mission, McdMode mode)
-{
- McdMissionPrivate *priv;
-
- g_return_if_fail (MCD_IS_MISSION (mission));
- priv = MCD_MISSION_PRIV (mission);
-
- if (priv->mode != mode)
- {
- priv->mode = mode;
-
- g_signal_emit_by_name (mission, "mode-set", mode);
- }
-}
-
-static McdMode
-_mcd_mission_get_mode (McdMission * mission)
-{
- McdMissionPrivate *priv;
-
- g_return_val_if_fail (MCD_IS_MISSION (mission), MCD_MODE_UNKNOWN);
- priv = MCD_MISSION_PRIV (mission);
-
- return priv->mode;
-}
-
-static void
on_parent_abort (McdMission *parent, McdMission *mission)
{
DEBUG ("called");
@@ -276,9 +246,6 @@ _mcd_set_property (GObject * object, guint prop_id, const GValue * val,
case PROP_SYSTEM_FLAGS:
mcd_mission_set_flags (mission, g_value_get_enum (val));
break;
- case PROP_MODE:
- mcd_mission_set_mode (mission, g_value_get_int (val));
- break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break;
@@ -299,9 +266,6 @@ _mcd_get_property (GObject * object, guint prop_id, GValue * val,
case PROP_SYSTEM_FLAGS:
g_value_set_enum (val, mcd_mission_get_flags (mission));
break;
- case PROP_MODE:
- g_value_set_enum (val, mcd_mission_get_mode (mission));
- break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break;
@@ -326,8 +290,6 @@ mcd_mission_class_init (McdMissionClass * klass)
klass->disconnect = _mcd_mission_disconnect;
klass->set_flags = _mcd_mission_set_flags;
klass->get_flags = _mcd_mission_get_flags;
- klass->set_mode = _mcd_mission_set_mode;
- klass->get_mode = _mcd_mission_get_mode;
klass->set_parent = _mcd_mission_set_parent;
@@ -357,12 +319,6 @@ mcd_mission_class_init (McdMissionClass * klass)
flags_changed_signal),
NULL, NULL, g_cclosure_marshal_VOID__FLAGS, G_TYPE_NONE,
1, MCD_TYPE_SYSTEM_FLAGS);
- mcd_mission_signals[MODE_SET] =
- g_signal_new ("mode-set", G_OBJECT_CLASS_TYPE (klass),
- G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (McdMissionClass,
- mode_set_signal),
- NULL, NULL, g_cclosure_marshal_VOID__ENUM, G_TYPE_NONE,
- 1, MCD_TYPE_MODE);
mcd_mission_signals[PARENT_SET] =
g_signal_new ("parent-set", G_OBJECT_CLASS_TYPE (klass),
G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (McdMissionClass,
@@ -379,13 +335,6 @@ mcd_mission_class_init (McdMissionClass * klass)
MCD_TYPE_MISSION,
G_PARAM_READWRITE));
g_object_class_install_property
- (object_class, PROP_MODE,
- g_param_spec_enum ("mode",
- "Platform-specific modes",
- "Platform-specific modes",
- MCD_TYPE_MODE, MCD_MODE_NORMAL,
- G_PARAM_READWRITE));
- g_object_class_install_property
(object_class, PROP_SYSTEM_FLAGS,
g_param_spec_flags ("system-flags",
"System flags",
@@ -446,20 +395,6 @@ mcd_mission_set_flags (McdMission * mission, McdSystemFlags flags)
MCD_MISSION_GET_CLASS (mission)->set_flags (mission, flags);
}
-McdMode
-mcd_mission_get_mode (McdMission * mission)
-{
- g_return_val_if_fail (MCD_IS_MISSION (mission), MCD_MODE_UNKNOWN);
- return MCD_MISSION_GET_CLASS (mission)->get_mode (mission);
-}
-
-void
-mcd_mission_set_mode (McdMission * mission, McdMode mode)
-{
- g_return_if_fail (MCD_IS_MISSION (mission));
- MCD_MISSION_GET_CLASS (mission)->set_mode (mission, mode);
-}
-
gboolean
mcd_mission_is_connected (McdMission * mission)
{
diff --git a/src/mcd-mission.h b/src/mcd-mission.h
index d3ce131..921f17c 100644
--- a/src/mcd-mission.h
+++ b/src/mcd-mission.h
@@ -50,14 +50,6 @@ G_BEGIN_DECLS
typedef enum
{
- MCD_MODE_UNKNOWN,
- MCD_MODE_NORMAL,
- MCD_MODE_RESTRICTED,
- MCD_MODE_CALL
-} McdMode;
-
-typedef enum
-{
MCD_SYSTEM_CONNECTED = 1,
MCD_SYSTEM_MEMORY_CONSERVED = 1 << 1,
MCD_SYSTEM_POWER_CONSERVED = 1 << 2,
@@ -84,7 +76,7 @@ struct _McdMissionClass
void (*disconnected_signal) (McdMission * mission);
void (*flags_changed_signal) (McdMission *mission, McdSystemFlags flags);
- void (*mode_set_signal) (McdMission * mission, McdMode mode);
+ void (*_former_mode_set_signal) (void);
void (*abort_signal) (McdMission * mission);
@@ -97,8 +89,8 @@ struct _McdMissionClass
void (*set_flags) (McdMission *mission, McdSystemFlags flags);
McdSystemFlags (*get_flags) (McdMission *mission);
- void (*set_mode) (McdMission * mission, McdMode mode);
- McdMode (*get_mode) (McdMission * mission);
+ void (*_former_set_mode) (void);
+ void (*_former_get_mode) (void);
void (*abort) (McdMission * mission);
};
@@ -119,8 +111,5 @@ void mcd_mission_disconnect (McdMission * mission);
void mcd_mission_set_flags (McdMission * mission, McdSystemFlags flags);
McdSystemFlags mcd_mission_get_flags (McdMission * mission);
-void mcd_mission_set_mode (McdMission * mission, McdMode mode);
-McdMode mcd_mission_get_mode (McdMission * mission);
-
G_END_DECLS
#endif /* MCD_MISSION_H */
diff --git a/src/mcd-operation.c b/src/mcd-operation.c
index 27365a4..08fa443 100644
--- a/src/mcd-operation.c
+++ b/src/mcd-operation.c
@@ -174,21 +174,11 @@ _mcd_operation_set_flags (McdMission * mission, McdSystemFlags flags)
}
static void
-_mcd_operation_set_mode (McdMission * mission, McdMode mode)
-{
- McdOperationPrivate *priv = MCD_OPERATION_PRIV (mission);
- g_list_foreach (priv->missions, (GFunc) mcd_mission_set_mode,
- GINT_TO_POINTER (mode));
- MCD_MISSION_CLASS (mcd_operation_parent_class)->set_mode (mission, mode);
-}
-
-static void
_mcd_operation_take_mission (McdOperation * operation, McdMission * mission)
{
McdOperationPrivate *priv = MCD_OPERATION_PRIV (operation);
McdSystemFlags flags;
- McdMode mode;
-
+
priv->missions = g_list_prepend (priv->missions, mission);
mcd_mission_set_parent (mission, MCD_MISSION (operation));
@@ -197,9 +187,6 @@ _mcd_operation_take_mission (McdOperation * operation, McdMission * mission)
flags = mcd_mission_get_flags (MCD_MISSION (operation));
mcd_mission_set_flags (mission, flags);
- mode = mcd_mission_get_mode (MCD_MISSION (operation));
- mcd_mission_set_mode (mission, mode);
-
g_signal_connect (mission, "abort",
G_CALLBACK (on_mission_abort), operation);
g_signal_emit_by_name (G_OBJECT (operation), "mission-taken", mission);
@@ -237,7 +224,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;
- mission_class->set_mode = _mcd_operation_set_mode;
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 6a1be02..64564a1 100644
--- a/src/mcd-proxy.c
+++ b/src/mcd-proxy.c
@@ -78,8 +78,6 @@ _mcd_proxy_connect_signals (McdProxy * proxy)
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, "mode-set",
- G_CALLBACK (mcd_mission_set_mode), proxy);
g_signal_connect_swapped (priv->proxy_object, "abort",
G_CALLBACK (_mcd_proxy_abort), proxy);
}
@@ -99,9 +97,6 @@ _mcd_proxy_disconnect_signals (McdProxy * proxy)
G_CALLBACK (mcd_mission_set_flags),
proxy);
g_signal_handlers_disconnect_by_func (priv->proxy_object,
- G_CALLBACK (mcd_mission_set_mode),
- proxy);
- g_signal_handlers_disconnect_by_func (priv->proxy_object,
G_CALLBACK (_mcd_proxy_abort), proxy);
}
--
1.5.6.5
More information about the telepathy-commits
mailing list