~ubuntu-branches/ubuntu/precise/gnome-control-center/precise-updates

« back to all changes in this revision

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

  • Committer: Package Import Robot
  • Author(s): Sebastien Bacher, Jeremy Bicha, Ken VanDine
  • Date: 2012-02-15 23:16:31 UTC
  • mfrom: (1.1.56)
  • Revision ID: package-import@ubuntu.com-20120215231631-vk7me0mhofpsq0hp
Tags: 1:3.3.5-0ubuntu1
* Upload the new serie, that will bring in quite some fixes, we revert
  some problematic or risky changes as well
* The new version includes those fixes:
  - "Change Password in User Accounts panel focuses "New password" field, 
     skipping "Current password"" (lp: #821759)
  - The dialog to add online accounts should have a title 
    (lp: #822380)
  - "Remove Profile" button clickable in Color panel when 
     no profile selected (lp: #869603)
  - Move Removable Media into System Info (lp: #835880)
  - Sound preferences: mouse scrolling balance only works for right.
    (lp: #918017)
  - gnome-control-center SIGSEGV in actualize_printers_list() 
    (lp: #903009)
  - selecting preffered applications is not an info (lp: #890143)
  - Add a keyboard shortcut by default for take screenshot of a selection"
    (lp: #625518)
* debian/patches/revert_git_datetime_port.patch:
  - revert use of datetimed, we don't use systemd and ubuntu-system-service 
    doesn't support it yet
* debian/patches/revert_git_drop_library.patch:
  - consolidate "01_allow_external_panels.patch", don't drop the library
    we use it from other components on ubuntu, the patch will be improved
    later to not use a copy of files like it does in that version
* debian/patches/revert_git_stop_using_gconf.patch,
  debian/patches/revert_ua_gsettings.patch,
  debian/patches/revert_git_keyboard_gsettings.patch:
  - revert keyboard porting to gsettings, compiz still use gconf and we
    didn't update gnome-shell to the new serie (yet)

[ Jeremy Bicha ]
* New upstream release (Thanks Rico Tzchichholz!)
* debian/control.in:
  - Bump minimum dependency versions and add libwacom dependency
* debian/rules: Build without -Wl,-z,defs
* debian/watch: Watch for unstable releases
* Refreshed patches:
  - 01_allow_external_panels.patch
  - 04_add_theme_selection.patch
  - 50_ubuntu_systemwide_prefs.patch
  - 58_ubuntu_icon_views_redesign.patch
  - 59_install_gcm_components_on_demand.patch
  - 91_configure_cheese.patch
* Dropped upstream patches:
  - 00git_handle_media_dialog_close.patch
  - 03_show_wacom_under_unity.patch
  - 90_git_sound_tab_order.patch
  - 91_git_build_use_fontconfig.patch
  - 92_git_minimal_output_height.patch
  - 93_change_window_role_on_panel_change.patch
  - 94_git_adding_shortcuts.patch
  - 95_git_ctrlw_shortcut.patch
  - git_extra_keywords.patch

[ Ken VanDine ]
* debian/patches/96_sound_nua_panel.patch
  - refreshed with latest changes from ronoc

Show diffs side-by-side

added added

removed removed

Lines of Context:
398
398
  gint value;
399
399
  gboolean ret;
400
400
  const gchar *key = (const gchar *)g_object_get_data (G_OBJECT(widget), "_gsettings_key");
401
 
  gchar *key_timeout;
402
401
 
403
402
  /* no selection */
404
403
  ret = gtk_combo_box_get_active_iter (GTK_COMBO_BOX(widget), &iter);
412
411
                      -1);
413
412
 
414
413
  /* set both keys */
415
 
  key_timeout = g_strdup_printf ("%s-timeout", key);
416
 
  g_settings_set_int (self->priv->gsd_settings, key_timeout, value);
417
 
  g_settings_set_boolean (self->priv->gsd_settings, key, value != 0);
418
 
  g_free (key_timeout);
 
414
  g_settings_set_int (self->priv->gsd_settings, key, value);
419
415
}
420
416
 
421
417
static void
628
624
  widget = GTK_WIDGET (gtk_builder_get_object (self->priv->builder,
629
625
                                               "combobox_sleep_ac"));
630
626
  set_value_for_combo (GTK_COMBO_BOX (widget), value);
631
 
  g_object_set_data (G_OBJECT(widget), "_gsettings_key", "sleep-inactive-ac");
 
627
  g_object_set_data (G_OBJECT(widget), "_gsettings_key", "sleep-inactive-ac-timeout");
632
628
  g_signal_connect (widget, "changed",
633
629
                    G_CALLBACK (combo_time_changed_cb),
634
630
                    self);
636
632
  widget = GTK_WIDGET (gtk_builder_get_object (self->priv->builder,
637
633
                                               "combobox_sleep_battery"));
638
634
  set_value_for_combo (GTK_COMBO_BOX (widget), value);
639
 
  g_object_set_data (G_OBJECT(widget), "_gsettings_key", "sleep-inactive-battery");
 
635
  g_object_set_data (G_OBJECT(widget), "_gsettings_key", "sleep-inactive-battery-timeout");
640
636
  g_signal_connect (widget, "changed",
641
637
                    G_CALLBACK (combo_time_changed_cb),
642
638
                    self);