applications/gnome-control-center
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

datetime: Exit early if the timedate1 service isn't available

Browse source 
We cannot meaningfully change (or display) any Date & Time system
settings without the timedate1 DBus service, so just exit early.

https://bugzilla.gnome.org/show_bug.cgi?id=707252
This commit is contained in:
Kalev Lember 2013-09-01 22:23:25 +02:00
parent a709ae41eb
commit d7847fe7a1
1 changed files with 12 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
panels/datetime/cc-datetime-panel.c
View file

@ -599,10 +599,7 @@ get_initial_timezone (CcDateTimePanel *self)
{ {
const gchar *timezone; const gchar *timezone;
if (self->priv->dtm)
timezone = timedate1_get_timezone (self->priv->dtm); timezone = timedate1_get_timezone (self->priv->dtm);
else
timezone = NULL;
if (timezone == NULL || if (timezone == NULL ||
!cc_timezone_map_set_timezone (CC_TIMEZONE_MAP (self->priv->map), timezone)) !cc_timezone_map_set_timezone (CC_TIMEZONE_MAP (self->priv->map), timezone))
@ -1194,6 +1191,7 @@ cc_date_time_panel_init (CcDateTimePanel *self)
if (priv->dtm == NULL) { if (priv->dtm == NULL) {
g_warning ("could not get proxy for DateTimeMechanism: %s", error->message); g_warning ("could not get proxy for DateTimeMechanism: %s", error->message);
g_clear_error (&error); g_clear_error (&error);
return;
} }
priv->builder = gtk_builder_new (); priv->builder = gtk_builder_new ();
@ -1216,11 +1214,8 @@ cc_date_time_panel_init (CcDateTimePanel *self)
setup_main_listview (self); setup_main_listview (self);
/* set up network time button */ /* set up network time button */
if (priv->dtm != NULL)
{
update_ntp_switch_from_system (self); update_ntp_switch_from_system (self);
on_can_ntp_changed (self); on_can_ntp_changed (self);
}
g_signal_connect (W("network_time_switch"), "notify::active", g_signal_connect (W("network_time_switch"), "notify::active",
G_CALLBACK (change_ntp), self); G_CALLBACK (change_ntp), self);
@ -1276,8 +1271,6 @@ cc_date_time_panel_init (CcDateTimePanel *self)
G_CALLBACK (location_changed_cb), self); G_CALLBACK (location_changed_cb), self);
/* Watch changes of timedated remote service properties */ /* Watch changes of timedated remote service properties */
if (priv->dtm)
{
g_signal_connect (priv->dtm, "g-properties-changed", g_signal_connect (priv->dtm, "g-properties-changed",
G_CALLBACK (on_timedated_properties_changed), self); G_CALLBACK (on_timedated_properties_changed), self);
g_signal_connect_swapped (priv->dtm, "notify::ntp", g_signal_connect_swapped (priv->dtm, "notify::ntp",
@ -1286,7 +1279,6 @@ cc_date_time_panel_init (CcDateTimePanel *self)
G_CALLBACK (on_can_ntp_changed), self); G_CALLBACK (on_can_ntp_changed), self);
g_signal_connect_swapped (priv->dtm, "notify::timezone", g_signal_connect_swapped (priv->dtm, "notify::timezone",
G_CALLBACK (on_timezone_changed), self); G_CALLBACK (on_timezone_changed), self);
}
/* We ignore UTC <--> LocalRTC changes at the moment */ /* We ignore UTC <--> LocalRTC changes at the moment */
/* add the lock button */ /* add the lock button */