From 51bd7465ac148a34ec37cb8760daf3b282b5ed6a Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Thu, 20 Jun 2013 13:44:21 -0500 Subject: remove the --replace command-line argument and property as we're using upstart for that --- src/main.c | 37 ++------------------- src/service.c | 102 +++++++--------------------------------------------------- src/service.h | 2 +- 3 files changed, 14 insertions(+), 127 deletions(-) (limited to 'src') diff --git a/src/main.c b/src/main.c index aa29456..c75b2d7 100644 --- a/src/main.c +++ b/src/main.c @@ -31,37 +31,6 @@ **** ***/ -static gboolean replace = FALSE; - -static void -parse_command_line (int * argc, char *** argv) -{ - GError * error; - GOptionContext * option_context; - - static GOptionEntry entries[] = - { - { "replace", 'r', 0, G_OPTION_ARG_NONE, &replace, "Replace the currently-running service", NULL }, - { NULL } - }; - - error = NULL; - option_context = g_option_context_new ("- indicator-datetime service"); - g_option_context_add_main_entries (option_context, entries, GETTEXT_PACKAGE); - if (!g_option_context_parse (option_context, argc, argv, &error)) - { - g_print ("option parsing failed: %s\n", error->message); - g_error_free (error); - exit (EXIT_FAILURE); - } - - g_option_context_free (option_context); -} - -/*** -**** -***/ - static void on_name_lost (gpointer instance G_GNUC_UNUSED, gpointer loop) { @@ -70,7 +39,7 @@ on_name_lost (gpointer instance G_GNUC_UNUSED, gpointer loop) } int -main (int argc, char ** argv) +main (int argc G_GNUC_UNUSED, char ** argv G_GNUC_UNUSED) { GMainLoop * loop; IndicatorDatetimeService * service; @@ -80,10 +49,8 @@ main (int argc, char ** argv) bindtextdomain (GETTEXT_PACKAGE, GNOMELOCALEDIR); textdomain (GETTEXT_PACKAGE); - parse_command_line (&argc, &argv); - /* run */ - service = indicator_datetime_service_new (replace); + service = indicator_datetime_service_new (); loop = g_main_loop_new (NULL, FALSE); g_signal_connect (service, INDICATOR_DATETIME_SERVICE_SIGNAL_NAME_LOST, G_CALLBACK(on_name_lost), loop); diff --git a/src/service.c b/src/service.c index 5694ffe..558b03a 100644 --- a/src/service.c +++ b/src/service.c @@ -48,15 +48,6 @@ enum static guint signals[LAST_SIGNAL] = { 0 }; -enum -{ - PROP_0, - PROP_REPLACE, - LAST_PROP -}; - -static GParamSpec * properties[LAST_PROP]; - enum { SECTION_HEADER = (1<<0), @@ -124,8 +115,6 @@ struct _IndicatorDatetimeServicePrivate GSimpleAction * calendar_action; GDBusProxy * login1_manager; - - gboolean replace; }; typedef IndicatorDatetimeServicePrivate priv_t; @@ -1544,67 +1533,6 @@ on_name_lost (GDBusConnection * connection G_GNUC_UNUSED, **** GObject virtual functions ***/ -static void -my_constructed (GObject * o) -{ - GBusNameOwnerFlags owner_flags; - IndicatorDatetimeService * self = INDICATOR_DATETIME_SERVICE(o); - priv_t * p = self->priv; - - /* own the name in constructed() instead of init() so that - we'll know the value of the 'replace' property */ - owner_flags = G_BUS_NAME_OWNER_FLAGS_ALLOW_REPLACEMENT; - if (p->replace) - owner_flags |= G_BUS_NAME_OWNER_FLAGS_REPLACE; - - p->own_id = g_bus_own_name (G_BUS_TYPE_SESSION, - BUS_NAME, - owner_flags, - on_bus_acquired, - NULL, - on_name_lost, - self, - NULL); -} - -static void -my_get_property (GObject * o, - guint property_id, - GValue * value, - GParamSpec * pspec) -{ - IndicatorDatetimeService * self = INDICATOR_DATETIME_SERVICE (o); - - switch (property_id) - { - case PROP_REPLACE: - g_value_set_boolean (value, self->priv->replace); - break; - - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (o, property_id, pspec); - } -} - -static void -my_set_property (GObject * o, - guint property_id, - const GValue * value, - GParamSpec * pspec) -{ - IndicatorDatetimeService * self = INDICATOR_DATETIME_SERVICE (o); - - switch (property_id) - { - case PROP_REPLACE: - self->priv->replace = g_value_get_boolean (value); - break; - - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (o, property_id, pspec); - } -} - static void my_dispose (GObject * o) { @@ -1799,6 +1727,15 @@ indicator_datetime_service_init (IndicatorDatetimeService * self) skew_timer_func, self); + p->own_id = g_bus_own_name (G_BUS_TYPE_SESSION, + BUS_NAME, + G_BUS_NAME_OWNER_FLAGS_ALLOW_REPLACEMENT, + on_bus_acquired, + NULL, + on_name_lost, + self, + NULL); + on_local_time_jumped (self); g_string_free (gstr, TRUE); @@ -1811,9 +1748,6 @@ indicator_datetime_service_class_init (IndicatorDatetimeServiceClass * klass) object_class->dispose = my_dispose; object_class->finalize = my_finalize; - object_class->constructed = my_constructed; - object_class->get_property = my_get_property; - object_class->set_property = my_set_property; g_type_class_add_private (klass, sizeof (IndicatorDatetimeServicePrivate)); @@ -1825,18 +1759,6 @@ indicator_datetime_service_class_init (IndicatorDatetimeServiceClass * klass) NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); - - properties[PROP_0] = NULL; - - properties[PROP_REPLACE] = g_param_spec_boolean ("replace", - "Replace Service", - "Replace existing service", - FALSE, - G_PARAM_READWRITE | - G_PARAM_CONSTRUCT_ONLY | - G_PARAM_STATIC_STRINGS); - - g_object_class_install_properties (object_class, LAST_PROP, properties); } /*** @@ -1844,11 +1766,9 @@ indicator_datetime_service_class_init (IndicatorDatetimeServiceClass * klass) ***/ IndicatorDatetimeService * -indicator_datetime_service_new (gboolean replace) +indicator_datetime_service_new (void) { - GObject * o = g_object_new (INDICATOR_TYPE_DATETIME_SERVICE, - "replace", replace, - NULL); + GObject * o = g_object_new (INDICATOR_TYPE_DATETIME_SERVICE, NULL); return INDICATOR_DATETIME_SERVICE (o); } diff --git a/src/service.h b/src/service.h index 53d4281..b142882 100644 --- a/src/service.h +++ b/src/service.h @@ -62,7 +62,7 @@ struct _IndicatorDatetimeServiceClass GType indicator_datetime_service_get_type (void); -IndicatorDatetimeService * indicator_datetime_service_new (gboolean replace); +IndicatorDatetimeService * indicator_datetime_service_new (void); GDateTime * indicator_datetime_service_get_localtime (IndicatorDatetimeService * service); -- cgit v1.2.3