← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/gnome-control-center/oneiric

« back to all changes in this revision

Viewing changes to panels/datetime/cc-datetime-panel.c

  • Committer: Package Import Robot
  • Author(s): Rodrigo Moya, Rodrigo Moya, Gunnar Hjalmarsson
  • Date: 2011-08-30 12:24:44 UTC
  • mfrom: (1.1.50 upstream)
  • Revision ID: package-import@ubuntu.com-20110830122444-bmvakubeof8hgbhe
Tags: 1:3.1.90-0ubuntu1
[ Rodrigo Moya ]
* New upstream release
* debian/patches/03_dont_show_region_panel_in_unity.patch:
  - Remove upstreamed patch
* debian/patches/04_add_theme_selection.patch:
  - Set the metacity theme also

[ Gunnar Hjalmarsson ]
* debian/patches/52_ubuntu_language_list_mods.patch:
  - Change the list of options, when setting language from User
    Accounts, to items representing available translations, and with
    that make it similar to the language list in language-selector.
  - Make items representing language @variants be displayed as such.
* debian/control.in:
  - accountsservice (>= 0.6.13-1ubuntu2) added to dependency list.

Show diffs side-by-side

added added

removed removed

Lines of Context:
panels/datetime/cc-datetime-panel.c
209
209
  g_signal_handlers_block_by_func (priv->settings, clock_settings_changed_cb,
210
210
                                   panel);
211
211
 
212
 
  if (gtk_switch_get_active (GTK_SWITCH (W ("24h_time_switch"))))
 
212
  if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (W ("24h_button"))))
213
213
    value = G_DESKTOP_CLOCK_FORMAT_24H;
214
214
  else
215
215
    value = G_DESKTOP_CLOCK_FORMAT_12H;
229
229
                           CcDateTimePanel *panel)
230
230
{
231
231
  CcDateTimePanelPrivate *priv = panel->priv;
232
 
  GtkWidget *switch24h;
 
232
  GtkWidget *button24h;
233
233
  gboolean use_24_hour;
234
234
  GDesktopClockFormat value;
235
235
 
236
236
  value = g_settings_get_enum (settings, CLOCK_FORMAT_KEY);
237
237
  priv->clock_format = value;
238
238
 
239
 
  switch24h = W ("24h_time_switch");
 
239
  button24h = W ("24h_button");
240
240
 
241
241
  use_24_hour = (value == G_DESKTOP_CLOCK_FORMAT_24H);
242
242
 
243
 
  g_signal_handlers_block_by_func (switch24h, change_clock_settings, panel);
 
243
  g_signal_handlers_block_by_func (button24h, change_clock_settings, panel);
244
244
 
245
 
  gtk_switch_set_active (GTK_SWITCH (switch24h), use_24_hour);
 
245
  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button24h), use_24_hour);
246
246
 
247
247
  update_time (panel);
248
248
 
249
 
  g_signal_handlers_unblock_by_func (switch24h, change_clock_settings, panel);
 
249
  g_signal_handlers_unblock_by_func (button24h, change_clock_settings, panel);
250
250
}
251
251
 
252
252
static void
1003
1003
  g_signal_connect (priv->settings, "changed::" CLOCK_FORMAT_KEY,
1004
1004
                    G_CALLBACK (clock_settings_changed_cb), self);
1005
1005
 
1006
 
  g_signal_connect (W("24h_time_switch"), "notify::active",
 
1006
  g_signal_connect (W("24h_button"), "notify::active",
1007
1007
                    G_CALLBACK (change_clock_settings), self);
1008
1008
 
1009
1009
  update_time (self);