debian/0000775000000000000000000000000012321533756007177 5ustar debian/libgnome-control-center1.symbols0000664000000000000000000000177112321533756015430 0ustar libgnome-control-center.so.1 libgnome-control-center1 #MINVER# * Build-Depends-Package: libgnome-control-center-dev cc_editable_entry_get_editable@Base 1:3.1.3 cc_editable_entry_get_scale@Base 1:3.1.3 cc_editable_entry_get_selectable@Base 1:3.1.4 cc_editable_entry_get_text@Base 1:3.1.3 cc_editable_entry_get_type@Base 1:3.1.3 cc_editable_entry_get_weight@Base 1:3.1.3 cc_editable_entry_new@Base 1:3.1.3 cc_editable_entry_set_editable@Base 1:3.1.3 cc_editable_entry_set_scale@Base 1:3.1.3 cc_editable_entry_set_selectable@Base 1:3.1.4 cc_editable_entry_set_text@Base 1:3.1.3 cc_editable_entry_set_weight@Base 1:3.1.3 cc_panel_get_help_uri@Base 1:3.5.2 cc_panel_get_permission@Base 1:3.1.3 cc_panel_get_shell@Base 1:2.91.2 cc_panel_get_type@Base 1:2.91.2 cc_shell_embed_widget_in_header@Base 1:3.3.5 cc_shell_get_active_panel@Base 1:2.91.2 cc_shell_get_toplevel@Base 1:2.91.2 cc_shell_get_type@Base 1:2.91.2 cc_shell_set_active_panel@Base 1:2.91.2 cc_shell_set_active_panel_from_id@Base 1:2.91.2 debian/copyright0000664000000000000000000000204712321533756011135 0ustar This package was debianized by Jim Pick jim@jimpick.com on Sat, 14 Mar 1998 20:12:23 -0800. It was downloaded from: http://ftp.gnome.org/pub/GNOME/sources/gnome-control-center/ Copyright: 1998,99,2000 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this package; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. On Debian systems, the complete text of the GNU General Public License can be found in `/usr/share/common-licenses/GPL'. debian/gnome-control-center-shared-data.install0000664000000000000000000000003012321533756016774 0ustar usr/share/pixmaps/faces debian/changelog0000664000000000000000000042552712321533756011070 0ustar gnome-control-center (1:3.6.3-0ubuntu56) trusty; urgency=medium * debian/patches/git_keyboard_grp_xkb_option.patch: - take upstream's grp xkb option combo for modifier-only input switching -- William Hua Tue, 08 Apr 2014 01:03:33 +1200 gnome-control-center (1:3.6.3-0ubuntu54) trusty; urgency=medium * debian/control.in, debian/gnome/control-center-data.install, debian/gnome-control-center-shared-data.install: - create a new binary with data files that are needed by g-c-c and u-c-c (the default selection of user icons for example) (lp: #1291608) -- Sebastien Bacher Fri, 21 Mar 2014 12:25:38 +0100 gnome-control-center (1:3.6.3-0ubuntu53) trusty; urgency=medium * debian/patches/gcc_not_in_unity.patch: - Unity was still listed in some panels, fix that (lp: #1286937) -- Sebastien Bacher Tue, 04 Mar 2014 19:20:30 +0100 gnome-control-center (1:3.6.3-0ubuntu52) trusty; urgency=low * debian/patches/gcc_not_in_unity.patch: - don't list "Unity" in OnlyShowIn, other g-c-c and u-c-c entries get duplicated in the Unity dash, when they both installed (lp: #1280872) * debian/libgnome-control-center1.symbols, debian/patches/10_keyboard_layout_on_unity.patch, debian/patches/input-sources-text-entry.patch, debian/patches/sound_nua_panel.patch, debian/patches/unity_menus.patch, debian/patches/unity_notice_info.patch: - dropped some unity specific changes [ Brian Murray ] * debian/source_gnome-control-center.py: Do not pass an empty list of plugin packages to apport. (LP: #1237119) -- Sebastien Bacher Wed, 26 Feb 2014 19:21:03 +0100 gnome-control-center (1:3.6.3-0ubuntu50) trusty; urgency=low [ Sebastien Bacher ] * debian/gnome-control-center.links: drop old symlink that was used to add a system-settings entry to indicator-session, that's deprecated [ Brian Murray ] * debian/source_gnome-control-center.py: Do not attempt to find the version of a package for a plugin not from a package. (LP: #1237119) [ Robert Ancell ] * debian/gnome-control-center.sh: * debian/rules: - Add a wrapper to run unity-control-center in Unity * debian/patches/10_keyboard_layout_on_unity.patch: * debian/patches/ubuntu_update_translations_template.patch: - Rename unity-region-panel to gnome-unity-region-panel so it doesn't conflict with the one in unity-control-center -- Robert Ancell Thu, 09 Jan 2014 11:47:33 +1300 gnome-control-center (1:3.6.3-0ubuntu49) trusty; urgency=low * debian/patches/0001-online-accounts-use-the-async-function-to-get-all-th.patch: goa_provider_get_all went async in 3.10. Backport patch to deal with this. -- Iain Lane Fri, 06 Dec 2013 12:43:49 +0000 gnome-control-center (1:3.6.3-0ubuntu48) trusty; urgency=low * debian/patches/git_iconview_columns.patch: - set the number of columns, that seems needed with new GTK versions * debian/patches/ubuntu_update_translations_template.patch: - updated to list the current sources in use -- Sebastien Bacher Fri, 29 Nov 2013 12:32:36 +0100 gnome-control-center (1:3.6.3-0ubuntu47) trusty; urgency=low * debian/patches/sanitize_ssid_convert_utf8.patch: make sure we properly convert the SSID to UTF-8 where possible; using nm_utils_ssid_to_utf8(), rather than nm_utils_escape_ssid() which isn't meant to be used that way. (LP: #1198315) -- Mathieu Trudel-Lapierre Wed, 20 Nov 2013 10:53:01 -0500 gnome-control-center (1:3.6.3-0ubuntu46) trusty; urgency=low [ Iain Lane ] * 0001-rfkill-glib-Don-t-use-g_assert_not_reached-in-type_t.patch: Cherry-pick 90f49a4d5dd646b8fce10f61a9231db4973a907b from upstream. rfkill-glib: Don't use g_assert_not_reached in type_to_string. New kernel versions can add new RFKILL types, we should not crash here, just say that we don't know what the switch is. (LP: #1209092) [ Jian-Ding Chen (timchen119) ] * Add additional options to the power option system sleep settings menu. Add 20 minutes and 2 hours options to give the user more fine-grained controls. (LP: #1244065) [ William Hua ] * debian/patches/input-sources-text-entry.patch: - Next group and double modifier input-source switching (LP: #1218322) -- Iain Lane Thu, 31 Oct 2013 00:48:04 +0000 gnome-control-center (1:3.6.3-0ubuntu45) saucy; urgency=low [ Iain Lane ] * debian/patches/97_unity_power_ui.patch: Don't crash if indicator-power isn't installed. When deciding whether to display/not display the indicator-power options, use the presence of indicator-power instead of just checking if Unity is the DE in use. (LP: #1195481) * debian/control.in: Build-Depend on glib >= 2.31.2 for g_settings_schema_source_ref. [ William Hua ] * debian/patches/input-sources-text-entry.patch: - support modifier-only input-source switching (lp: #1218322) -- Iain Lane Fri, 18 Oct 2013 12:47:01 +0100 gnome-control-center (1:3.6.3-0ubuntu44) saucy; urgency=low * debian/patches/git_add_printer_crash.patch: - Fix crash when adding a printer (LP: #1155825) -- Robert Ancell Wed, 16 Oct 2013 15:51:53 +1300 gnome-control-center (1:3.6.3-0ubuntu43) saucy; urgency=low * debian/patches/unity_no_zoom_controls.patch: hide the zoom controls under Unity. The upstream code only shows them when gnome-shell is running, but unity takes the dbus namespace for other compat reasons which leads to have the option even if there is no zoom backend (lp: #1205893) -- Sebastien Bacher Tue, 08 Oct 2013 16:05:32 +0200 gnome-control-center (1:3.6.3-0ubuntu41) saucy; urgency=low * debian/patches/git_drop_ibus_engine_whitelist.patch, debian/patches/git_show_per_window_input_settings.patch, debian/patches/input-sources-text-entry.patch, debian/patches/series: - restore the unity specific's entry, it was dropped by error during the cyle. This way we don't have a duplicated language icon in the settings' grid. Clean up some warnings in the code as well Thanks William Hua (lp: #188251) -- Sebastien Bacher Wed, 02 Oct 2013 17:09:43 +0200 gnome-control-center (1:3.6.3-0ubuntu40) saucy; urgency=low * debian/patches/ubuntu_update_translations_template.patch - rename the patch, move it at the end of the series, lists missing sources (lp: #1233067) [ Tim Lunn ] * debian/patches: ubuntu_update_lock_and_power_settings.patch: Fix type mismatch in idle-delay setting (LP: #1228939) -- Sebastien Bacher Mon, 30 Sep 2013 16:30:03 +0200 gnome-control-center (1:3.6.3-0ubuntu39) saucy; urgency=low * debian/patches/input-sources-text-entry.patch: - Revert to upstream panel if indicator-keyboard schema is missing. (lp: #1229367) -- William Hua Tue, 24 Sep 2013 16:58:18 -0400 gnome-control-center (1:3.6.3-0ubuntu38) saucy; urgency=low * debian/patches/57_use_nonsymbolic_keyboard_icon.patch: Dropped, no longer needed (LP: #862027) -- Jeremy Bicha Thu, 19 Sep 2013 15:14:51 -0400 gnome-control-center (1:3.6.3-0ubuntu37) saucy; urgency=low * git_drop_ibus_engine_whitelist.patch: - Don't limit available ibus methods to a whitelist (LP: #1225086) -- Jeremy Bicha Sat, 14 Sep 2013 11:18:38 -0400 gnome-control-center (1:3.6.3-0ubuntu36) saucy; urgency=low * git_hide_unavailable_layout_settings_button.patch: - Only show layout settings button when it's usable (i.e. for certain ibus input methods) since it's too confusing to have the button visible but insensitive * git_show_per_window_input_settings.patch: - Show separate-layout-per-window option for GNOME too * git_restore_mouse_speed.patch: - Restore mouse & touchpad pointer speed (LP: #1186666) -- Jeremy Bicha Wed, 11 Sep 2013 11:11:08 -0400 gnome-control-center (1:3.6.3-0ubuntu35) saucy; urgency=low [ Tim Lunn ] * debian/patches: - git_power_gsd_proxies.patch, git patch to use correct interface for dbus proxy. - ubuntu_update_lock_and_power_settings.patch, update for changed gsettings keys - 11_power-configure_lid_action.patch, remove hibernate lid action this is no longer available with change to logind - input-sources-text-entry.patch: update for moved gsettings key - git_region_update_input_switch.patch, git_keyboard_update_input_switch.patch: added for moved keys * debian/control.in: Bump b-d on gsettings-desktop-schemas for the moved keys [ Jeremy Bicha ] * debian/control.in: Bump minimum gnome-settings-daemon to 3.8.4 * debian/patches/git_rename_natural_scrolling.patch: - Use 'natural scrolling' name instead of 'Content sticks to fingers' -- Tim Lunn Mon, 09 Sep 2013 23:30:49 +1000 gnome-control-center (1:3.6.3-0ubuntu34) saucy; urgency=low * debian/patches: - git-background-remove-unused-widget.patch - git-background-lock-screen.patch: Allow setting a different background for the GNOME Shell lock screen (LP: #1219188) -- Tim Lunn Mon, 09 Sep 2013 11:17:34 +1000 gnome-control-center (1:3.6.3-0ubuntu33) saucy; urgency=low [ Jeremy Bicha ] * Restore 57_use_nonsymbolic_keyboard_icon.patch, the ubuntu-themes merge proposal wasn't accepted yet [ Tim Lunn ] * debian/patches/git_shell_use_view_style_class.patch: git patch to fix mismatched backgrounds (LP: #1218102) -- Tim Lunn Thu, 29 Aug 2013 19:23:56 +1000 gnome-control-center (1:3.6.3-0ubuntu32) saucy; urgency=low * debian/libgnome-control-center1.symbols: - list new symbol from the unity menu change [ Jeremy Bicha ] * debian/rules: - Don't disable cheese webcam integration * debian/patches/57_use_nonsymbolic_keyboard_icon.patch: Dropped, no longer needed (LP: #862027) [ Aron Xu ] * Move ibus from Depends to Recommends. [ Andrea Azzarone ] * debian/patches/unity_menus.patch: - updated menus under unity (lp: #1131664) -- Sebastien Bacher Thu, 29 Aug 2013 18:17:00 +0200 gnome-control-center (1:3.6.3-0ubuntu31) saucy; urgency=low [ Jeremy Bicha ] * debian/control.in: - Build-depend on cheese for webcam integration in User Accounts panel (LP: #853994) - Don't build-depend on gnome-doc-utils - Depend on minimum gnome-settings-daemon built with ibus * debian/patches/git-rename-bluetooth-panel.patch: - Rename the bluetooth panel to its 3.8 filename so that the Bluetooth Settings link in GNOME Shell 3.8 works [ William Hua ] * debian/control.in: - Add IBus (build) dependency. * debian/rules: - Enable IBus. * debian/patches/revert_new_ibus_keyboard_use.patch: * debian/patches/10_keyboard_layout_on_unity.patch: - Drop patches, use input sources panel. * debian/patches/rename_screenshot_media_keys.patch: - Since Ubuntu's gnome-screenshot doesn't save to the Pictures directory automatically, don't say that it does in Keyboard>Shortcuts * debian/patches/input-sources-text-entry.patch: - Implement text entry panel by modifying input sources panel. [ Tim Lunn ] * debian/patches/git-fix-background-panel-crash.patch: git patch to fix crash after selecting new background in gnome background panel (LP: #1196196) -- William Hua Wed, 21 Aug 2013 11:24:36 -0400 gnome-control-center (1:3.6.3-0ubuntu30) saucy; urgency=low * debian/compat: bump to 9 * debian/*.install: fix install paths for arched /usr/lib * debian/source_gnome-control-center.py: fix apport hook for new libdirs * debian/patches/zz_add_fallback_panels_dir.patch: add a patch to look in the old panel dir for compatibility with existing packages * debian/rules: set the correct --libdir (work around apparent cdbs issue) -- Ryan Lortie Mon, 08 Jul 2013 10:13:49 -0400 gnome-control-center (1:3.6.3-0ubuntu29) saucy; urgency=low * debian/UbuntuLogo.png: - updated logo for 13.10 (lp: #1188208), Thanks Xi Zhu! -- Sebastien Bacher Mon, 17 Jun 2013 15:35:17 +0200 gnome-control-center (1:3.6.3-0ubuntu28) saucy; urgency=low * debian/patches/git_new_goa_build.patch: - update for the api change in the new gnome-online-account, fix the build -- Sebastien Bacher Fri, 14 Jun 2013 11:31:15 +0200 gnome-control-center (1:3.6.3-0ubuntu27) saucy; urgency=low * Rebuild for gnome-desktop 3.8 transition (LP: #1184812) - debian/patches/git_move_rr_labeler.patch -- Tim Lunn Tue, 28 May 2013 10:23:39 +1000 gnome-control-center (1:3.6.3-0ubuntu26) saucy; urgency=low * debian/patches/git_no_glxinfo.patch: updated to fix details panel crash on vbox glx driver (LP: #1179659) -- Tim Lunn Mon, 27 May 2013 09:53:26 +0200 gnome-control-center (1:3.6.3-0ubuntu25) saucy; urgency=low * Switch to logind for session tracking. -- Martin Pitt Mon, 29 Apr 2013 10:24:33 -0700 gnome-control-center (1:3.6.3-0ubuntu24) raring; urgency=low * debian/patches/92_ubuntu_system_proxy.patch: - restore the "set system proxy" patch that got commented earlier in the cycle, because it needed to be refactored for the new version. * debian/control.in: Recommends ubuntu-system-service for proxy support -- Sebastien Bacher Tue, 16 Apr 2013 16:30:42 +0200 gnome-control-center (1:3.6.3-0ubuntu23) raring; urgency=low * debian/patches/git_no_glxinfo.patch: - Merged upstream fix for display of nvidia blob info (LP: #1168612) -- Tim Lunn Mon, 15 Apr 2013 18:45:44 +1000 gnome-control-center (1:3.6.3-0ubuntu22) raring; urgency=low * debian/control.in: - Recommend system-config-printer-gnome for the Add Printer feature to work without crashing (LP: #1163674) -- Jeremy Bicha Sat, 13 Apr 2013 20:30:22 -0400 gnome-control-center (1:3.6.3-0ubuntu21) raring; urgency=low * debian/control.in, debian/gnome-control-center-data.install: - don't install the pkla yet, don't recommend libnss-myhostname the FFe got denied for raring (lp #1162478) -- Sebastien Bacher Thu, 11 Apr 2013 17:44:05 +0200 gnome-control-center (1:3.6.3-0ubuntu20) raring; urgency=low * debian/gnome-control-center.pkla, gnome-control-center-data.install: - Install a .pkla to allow admins to set the hostname. This can be dropped when Ubuntu includes policykit >=0.106 since gnome-control-center ships the updated rules already (LP: #962369) * debian/control.in: - Recommend libnss-myhostname (LP: #1162475, #1162478) * debian/patches/62_update_translations_template.patch: Refreshed -- Jeremy Bicha Wed, 10 Apr 2013 16:15:36 -0400 gnome-control-center (1:3.6.3-0ubuntu19) raring; urgency=low * debian/patches/revert_new_ibus_keyboard_use.patch: - updated to include the correct list of files to translate -- Sebastien Bacher Mon, 08 Apr 2013 13:17:15 +0200 gnome-control-center (1:3.6.3-0ubuntu18) raring; urgency=low * debian/control.in: updated the gnome-settings-daemon requirement and stop depending on ubuntu-system-service * debian/patches/revert_git_datetime_port.patch: - drop it since we will use systemd-services -- Sebastien Bacher Tue, 26 Mar 2013 21:28:16 +0100 gnome-control-center (1:3.6.3-0ubuntu17) raring; urgency=low * debian/control.in: - Build-Depends on libgl1-mesa-dev, don't recommends mesa-utils * debian/patches/git_no_glxinfo.patch: - don't use glxinfo but rather use direct calls to get the infos [ Gunnar Hjalmarsson ] * debian/patches/52_region_language.patch: - don't return null value for language (LP: #1157188) -- Sebastien Bacher Tue, 26 Mar 2013 17:04:18 +0100 gnome-control-center (1:3.6.3-0ubuntu16) raring; urgency=low * debian/patches/91_unity_no_printing_panel.patch: - go back to system-config-printer under Unity, the upstream panel has improved this cycle but is still lacking features (like printer sharing) and having issues -- Sebastien Bacher Tue, 19 Mar 2013 12:02:45 +0100 gnome-control-center (1:3.6.3-0ubuntu15) raring; urgency=low * debian/control.in: - Build-Depends on libwebkitgtk-3.0-dev * debian/patches/unity_notice_info.patch: - display "Legal Notice" in the infos dialog (lp: #1130158) * debian/searchingthedashlegalnotice.html, debian/gnome-control-center-data.install: - copy notice text from unity, will be updated later -- Sebastien Bacher Fri, 15 Mar 2013 18:40:53 +0100 gnome-control-center (1:3.6.3-0ubuntu14) raring; urgency=low * debian/patches/52_region_language.patch: - updated to fix some invalid free calls in the updated version [ Gunnar Hjalmarsson ] * debian/patches/52_region_language.patch: - Adapt the region capplet to Ubuntu specific prerequisites. - Take the 'common_name' field into account when parsing the iso-codes XML files for language names (LP: #991002). -- Sebastien Bacher Fri, 15 Mar 2013 17:56:52 +0100 gnome-control-center (1:3.6.3-0ubuntu13) raring; urgency=low * debian/patches/sound_nua_panel.patch: - don't allow to turn bluetooth devices off, or they are dropped from the devices list and there is no way to turn them back on, thanks David Henningsson (lp: #1071561) -- Sebastien Bacher Tue, 12 Feb 2013 10:47:59 +0100 gnome-control-center (1:3.6.3-0ubuntu12) raring; urgency=low * Remove Recommends on gnome-online-accounts — this is unnecessary on Ubuntu (Unity) and gets autostarted if installed, wasting system resources; it's more appropriate for this to be seeded by flavours which want it. -- Iain Lane Mon, 28 Jan 2013 18:06:17 +0000 gnome-control-center (1:3.6.3-0ubuntu11) raring; urgency=low [ Stéphane Graber ] * Add support for 21:9 screen ratio. Cherry-pick from upstream (66576dfe24f93b22146e436aea761bc5a3b547cf) [ Michael Terry ] * debian/patches/55_user_accounts_hide_controls.patch: - Update to work again with 3.6.3 codebase (thus hiding autologin controls for ecryptfs users once more). -- Michael Terry Tue, 22 Jan 2013 14:56:01 -0500 gnome-control-center (1:3.6.3-0ubuntu10) raring; urgency=low * debian/patches/unity_background_is_appareance.patch: - under unity, map "background" to "unity-appereance" (lp: #1093436) [ David Henningsson ] * debian/patches/git-sound-fix-port-handling.patch: - "Fix port handling for the unknown availability case" * debian/patches/sound_nua_panel.patch: - "Select the first item automatically (LP: #1060143)" -- Sebastien Bacher Thu, 10 Jan 2013 16:29:13 +0100 gnome-control-center (1:3.6.3-0ubuntu9) raring; urgency=low * debian/control.in: - Recommend mesa-utils so that the Details panel shows the graphics driver name instead of 'Unknown' (LP: #914631) -- Jeremy Bicha Wed, 19 Dec 2012 14:34:16 -0500 gnome-control-center (1:3.6.3-0ubuntu8) raring; urgency=low * debian/UbuntuLogo.png: - updated to 13.04, thanks Rosie Zhu [ Jeremy Bicha ] * debian/control.in: - Recommend cups-pk-helper (LP: #808829, #1082765) -- Sebastien Bacher Mon, 26 Nov 2012 17:08:25 +0100 gnome-control-center (1:3.6.3-0ubuntu6) raring; urgency=low * debian/patches/58_ubuntu_icon_views_redesign.patch: - Don't make the window wider in GNOME (LP: #974573) * debian/patches/git_set_a11y_wm_theme.patch: - Git patch to set/reset HighContrast window theme too -- Jeremy Bicha Sat, 24 Nov 2012 14:01:28 -0500 gnome-control-center (1:3.6.3-0ubuntu5) raring; urgency=low * debian/patches/10_keyboard_layout_on_unity.patch: * debian/patches/62_update_translations_template.patch - Don't rename Region panel in GNOME * debian/patches/11_power-configure_lid_action.patch: - Fix screen reader accessibility for extra power options (LP: #880886) * debian/gnome-control-center.sgml, debian/gnome-control-center.install debian/rules - Ship improved man page from GNOME (LP: #1036932) -- Jeremy Bicha Fri, 23 Nov 2012 23:15:25 -0500 gnome-control-center (1:3.6.3-0ubuntu4) raring; urgency=low * debian/patches/60_ubuntu_nav_bar.patch: - update shell.ui to fix a formatting issue (lp: #1081826) -- Sebastien Bacher Thu, 22 Nov 2012 10:25:19 +0100 gnome-control-center (1:3.6.3-0ubuntu3) raring; urgency=low * debian/patches/60_ubuntu_nav_bar.patch: - restore the navigation bar interface -- Sebastien Bacher Wed, 21 Nov 2012 21:36:46 +0100 gnome-control-center (1:3.6.3-0ubuntu2) raring; urgency=low * debian/control.in: - Restore libgnomekbd-dev to build-depends, needed for revert_new_ibus_keyboard_use.patch -- Jeremy Bicha Wed, 21 Nov 2012 14:39:31 -0500 gnome-control-center (1:3.6.3-0ubuntu1) raring; urgency=low [ Sebastien Bacher ] * New upstream version * debian/control.in: recommends libcanberra-pulse (lp: #1004973) * debian/patches/58_ubuntu_icon_views_redesign.patch: - drop most of the changes, keep the different grid size though to fit on screen with our extra icons * debian/patches/91_dont_show_in_unity.patch: - dropped, show the upstream printer panel and the layout tab * debian/patches/revert_git_keyboard_gsettings.patch, debian/patches/revert_git_stop_using_gconf.patch: - dropped the gconf->gsettings reverts [ Robert Ancell ] * New upstream release (LP: #1010317) * debian/control: - Bump build-depends on libgnome-desktop-3-dev, libwacom-dev - Add build-depends on libclutter-1.0-dev, libclutter-gtk-1.0-dev, libpwquality-dev - Drop build-depends on libgnomekbd-dev * debian/patches/60_ubuntu_nav_bar.patch: - Disabled for now, doesn't apply * debian/patches/revert_ua_gsettings.patch: - We can use GSettings for universal access now * debian/patches/00git_online_accounts_gtkgrid.patch: * debian/patches/00git_online_accounts_layout.part: * debian/patches/git_wacom_translations.patch: - Applied upstream [ Iain Lane ] * Add Build-Depends on libxkbfile-dev * New upstream release. * Refresh all patches to apply cleanly. [ Edward Donovan ] * debian/source_gnome-control-center.py: Fix for Python 3. (LP: #1013171) [ Rico Tzschichholz ] * debian/control.in: - Build-depend on gtk-doc-tools instead of docbook directly - Bump minimum glib-2.0, gnome-desktop3, gnome-settings-daemon and gsettings-desktop-schemas [ Jeremy Bicha ] * Dropped more patches applied in new version: - git_unmute_sound_event.patch - git_fix_big_editable_labels.patch - 96_sound_nua_panel.patch * debian/patches/04_new_appearance_settings.patch: - Dropped, this is now packaged separately as gnome-control-center-unity * debian/patches/10_keyboard_layout_on_unity.patch: - Don't change the keyboard panel name when not running Unity * debian/patches/52_ubuntu_language_list_mods.patch: - Don't disable adding current language to the list. While this fix shows the current language twice, at least it avoids the "Ubuntu suddenly in Chinese" bug (LP: #1035219) * debian/patches/53_use_ubuntu_help.patch: - Only show Ubuntu help when running Unity * debian/patches/58_hide_gdm_notifications.patch: - Hide "Show notifications when locked" settings when running Unity since it's a GNOME Shell-specific feature * debian/patches/63_normal_scrollbar_in_a11y.patch: - Drop, overlay-scrollbars should handle this instead * debian/patches/91_dont_show_in_unity.patch: - Hide Printers & Region panels in Unity until we're ready to switch to them. * debian/patches/fix-crash-on-user-panel.patch: - Dropped, GNOME says it's obsolete * debian/rules: - Build with -z,defs again - Explicitly disable ibus support since ibus 1.4 isn't supported in this version * debian/control.in: - Drop ubuntu-docs and gnome-user-guide from recommends to suggests - Don't recommend indicators; let's leave that to Unity [ David Henningsson ] * sound_nua_panel.patch: Rebase to gnome 3.6 -- Sebastien Bacher Wed, 21 Nov 2012 19:32:45 +0100 gnome-control-center (1:3.4.2-0ubuntu20) quantal-proposed; urgency=low * debian/patches/04_new_appearance_settings.patch - use g_settings_schema_source_lookup to determine availability of settings schema * debian/patches/63_normal_scrollbar_in_a11y.patch - don't crash in the a11y panel if the overlay scrollbars are not installed (lp: #1070905) -- William Hua Thu, 01 Nov 2012 03:50:07 -0400 gnome-control-center (1:3.4.2-0ubuntu19) quantal; urgency=low * debian/patches/clutter_init.patch: - dropped, don't use clutter for quantal, it was added because ubuntu-online-accounts experimented with animation but they stopped, not using clutter will workaround GL drivers issues (lp: #1058946) -- Sebastien Bacher Tue, 09 Oct 2012 17:03:35 +0200 gnome-control-center (1:3.4.2-0ubuntu18) quantal; urgency=low * debian/patches/04_new_appearance_settings.patch: - don't crash in the appearance capplet if the overlay scrollbars are not installed. -- Didier Roche Wed, 03 Oct 2012 18:38:40 +0200 gnome-control-center (1:3.4.2-0ubuntu17) quantal; urgency=low * debian/patches/04_new_appearance_settings.patch, debian/patches/63_normal_scrollbar_in_a11y.patch: - Use the current overlay-scrollbar gsettings key (lp: #1058936) * debian/patches/97_unity_power_ui.patch: - hide indicator setting under GNOME sessions (lp: #1059369) [ Didier Roche ] * debian/patches/04_new_appearance_settings.patch: - remove an unity-2d key which was unconditionnaly set (even if schema not installed), provoking a warning. -- Sebastien Bacher Tue, 02 Oct 2012 19:26:48 +0200 gnome-control-center (1:3.4.2-0ubuntu16) quantal; urgency=low * debian/patches/git_unmute_sound_event.patch: - "sound: Make sure the event sound stream stays unmuted" (lp: #986692) -- Sebastien Bacher Fri, 28 Sep 2012 20:01:25 +0200 gnome-control-center (1:3.4.2-0ubuntu15) quantal; urgency=low * debian/patches/git_fix_big_editable_labels.patch: - Cherrypick from git to fix unconstrained font growth (LP: #1041756) * debian/control.in: - Bump gtk+3.0 build-deps to 3.5.13 for gtk_entry_set_attributes(). -- Jason Conti Sat, 08 Sep 2012 17:51:05 -0400 gnome-control-center (1:3.4.2-0ubuntu14) quantal; urgency=low * debian/patches/power_cancellable_fixes.patch: - Fix a possible crash in the power panel (LP: #929378) -- Michael Terry Thu, 06 Sep 2012 17:29:43 -0400 gnome-control-center (1:3.4.2-0ubuntu13) quantal; urgency=low * debian/control.in: - don't Build-Depends on libgconf2 - Recommends libcanberra-pulse (lp: #1004973) * debian/patches/58_ubuntu_icon_views_redesign.patch: - updated geometry to avoid scrolling by default by adding space to display an extra icon row * debian/patches/62_update_translations_template.patch: - stop listing deprecated source * debian/patches/96_sound_nua_panel.patch: - stop using gconf there * debian/patches/git_update_mimetypes.patch: - "set related mime types when changing preferred apps" (lp: #876897) * debian/gnome-control-center.postinst: - drop old transitional code -- Sebastien Bacher Tue, 28 Aug 2012 18:24:53 +0200 gnome-control-center (1:3.4.2-0ubuntu12) quantal; urgency=low * 64_restore_terminal_keyboard_shortcut.patch: - The "Launch terminal" keyboard shortcut was dropped in the gconf>gsettings switch. Bring it back. (LP: #1010558, LP: #1040081) * debian/control.in: - Bump minimum gnome-settings-daemon to get the schema needed by the above patch -- Jeremy Bicha Sun, 26 Aug 2012 12:48:31 -0400 gnome-control-center (1:3.4.2-0ubuntu11) quantal; urgency=low * debian/control.in: - updated clutter requirement to match the configure version * debian/patches/96_sound_nua_panel.patch: - drop hacks and merge upstream changes for mouse scrolling (lp: #953757) * debian/patches/git_sound_sliders.patch: - "sound: Fix mouse scrolls on sliders" * debian/patches/git_update_keyring_password.patch * debian/source_gnome-control-center.py: - updated for python3, thanks Edward Donovan (lp: #1013171) * debian/UbuntuLogo.png: - updated logo for 12.10 (lp: #1035501) -- Sebastien Bacher Fri, 24 Aug 2012 18:57:15 +0200 gnome-control-center (1:3.4.2-0ubuntu10) quantal-proposed; urgency=low * debian/patches/clutter_init.patch - added missing include for config.h to get the HAVE_CLUTTER defines -- Ken VanDine Thu, 23 Aug 2012 16:09:35 -0400 gnome-control-center (1:3.4.2-0ubuntu9) quantal-proposed; urgency=low * debian/control.in: - updated gnome-settings-daemon requirement to the gsettings version [ Didier Roche ] * debian/patches/51_unity_options_in_display_panel.patch, debian/patches/04_new_appearance_settings.patch, debian/control: (LP: #1035261) - unity/compiz gconf -> gsettings transition - support now metacity - gsettings version - declare appropriates breaks * debian/patches/revert_git_datetime_port.patch - refresh for above patches * debian/patches/revert_git_stop_using_gconf.patch, debian/patches/revert_ua_gsettings.patch, debian/patches/revert_git_keyboard_gsettings.patch: - removed now as we are using gsettings everywhere, apart from the ua patch * debian/patches/54_enable_alt_tap_in_shortcut.patch: - transition the patch to gsettings to support alt-tap with it. - move it upper to the stack as it doesn't dep on the gconf revert patches anymore. * debian/patches/51_ubuntu_system_keyboard.patch: - removed from the vcs, doesn't apply to any existing file, was never referenced in the changelog, seems just a leftover * debian/patches/new_translations_hack.patch: - removed, not of use anymore [ Ken VanDine ] * debian/patches/clutter_init.patch - added --with-clutter to optionally initiallize clutter-gtk, needed for gnome-control-center-signon * debian/rules - build with --with-clutter * debian/control - added build depends for libclutter-gtk-1.0-dev -- Sebastien Bacher Thu, 23 Aug 2012 17:09:34 +0200 gnome-control-center (1:3.4.2-0ubuntu8) quantal; urgency=low * debian/patches/git_new_bluetooth_api.patch: - updated to gnome-bluetooth api changes -- Sebastien Bacher Fri, 10 Aug 2012 11:43:58 +0200 gnome-control-center (1:3.4.2-0ubuntu7) quantal; urgency=low * debian/control: - updated goa requirement * debian/patches/no_preferred_mode_in_clone.patch: - "Do not add preferred mode to drop down in clone mode." (lp: #1033864) * debian/patches/build_new_cups.patch: - patch from https://bugzilla.gnome.org/show_bug.cgi?id=679759, build with cups 1.6 -- Sebastien Bacher Tue, 07 Aug 2012 18:00:01 +0200 gnome-control-center (1:3.4.2-0ubuntu6) quantal; urgency=low [ David Henningsson ] * debian/patches/96_sound_nua_panel.patch: - update, including profiles get,set rewrite (lp: #1015073) [ Iain Lane ] * Add Build-Depends on libxkbfile-dev -- Sebastien Bacher Mon, 25 Jun 2012 16:49:37 +0200 gnome-control-center (1:3.4.2-0ubuntu5) quantal; urgency=low * debian/patches/51_unity_options_in_display_panel.patch: - updated for the new gnome-desktop as well (lp: #1011056) -- Sebastien Bacher Tue, 12 Jun 2012 21:48:18 +0200 gnome-control-center (1:3.4.2-0ubuntu4) quantal; urgency=low * debian/control.in, debian/patches/git_gnome_desktop_update.patch: update to the new gnome-desktop version (lp: #1011056) -- Sebastien Bacher Mon, 11 Jun 2012 11:34:48 +0200 gnome-control-center (1:3.4.2-0ubuntu3) quantal; urgency=low * Rebuild for the libgnome-desktop SOVER bump. -- Adam Conrad Thu, 07 Jun 2012 15:58:01 -0600 gnome-control-center (1:3.4.2-0ubuntu2) quantal; urgency=low * debian/patches/96_sound_nua_panel.patch: Fix segfault on selecting bluetooth input (LP: #1004384) -- David Henningsson Fri, 25 May 2012 12:08:05 +0200 gnome-control-center (1:3.4.2-0ubuntu1) quantal; urgency=low * New upstream release -- Robert Ancell Tue, 22 May 2012 12:10:45 +1200 gnome-control-center (1:3.4.1-0ubuntu4) quantal; urgency=low * debian/control: - gnome-control-center breaks/replaces gnome-bluetooth (configuration applet moved into the control center) (LP: #1000709) * debian/patches/00git_online_accounts_layout.part: * debian/patches/00git_online_accounts_gtkgrid.patch: - Use new GNOME online accounts API -- Robert Ancell Fri, 18 May 2012 14:55:36 +1200 gnome-control-center (1:3.4.1-0ubuntu3) quantal; urgency=low * debian/control: - Build-depend on libgnome-bluetooth-dev so the Bluetooth panel is compiled -- Robert Ancell Thu, 17 May 2012 11:58:43 +1200 gnome-control-center (1:3.4.1-0ubuntu2) precise-proposed; urgency=low * debian/patches/deal_with_null_ssid.patch: don't try to dereference ssid when it's NULL (i.e. for non-broadcasting APs). (LP: #908670, #912948) [ Conor Curran & David Henningsson ] * debian/patches/96_sound_nua_panel.patch: - updated version including fixes for - "moving running input stream fails" (lp: #984637) - "peak detection on input tab doubles up on level"(lp: #987626) - "SIGSEGV in gvc_mixer_ui_device_get_description()" (lp: #982495) -- Mathieu Trudel-Lapierre Fri, 27 Apr 2012 12:04:53 -0400 gnome-control-center (1:3.4.1-0ubuntu1) precise-proposed; urgency=low [ Sebastien Bacher ] * debian/patches/git_wacom_translations.patch: - updated, list the source files in POTFILES.in as well [ Martin Pitt ] * New upstream bug fix release: - Fix translation of the rotation drop-down - Make controls insensitive when a user is not selected - Fix alignment of the "Map to Monitor..." button - Use PrinterAddOption method to set media size - Updated translations * Drop patches applied upstream: - accounts_handle_system_user.patch - git_rotation_translation.patch -- Martin Pitt Mon, 16 Apr 2012 17:09:05 +0200 gnome-control-center (1:3.4.0-0ubuntu7) precise-proposed; urgency=low * debian/patches/04_new_appearance_settings.patch: - add edge corner reveal support for unity-2d now that it supports it - unref the new gsettings object introduced in a previous upload * debian/patches/54_enable_alt_tap_in_shortcut.patch: - enable assign alt and other key for the HUD shortcut in both Unity 2D and 3D (LP: #969256) (applied very late in the build for now as dep on revert_git_keyboard_gsettings.patch) * debian/patches/96_sound_nua_panel.patch: - quiet debug output, patch from ronoc * debian/patches/50_ubuntu_systemwide_prefs.patch: - fix the patch to really show "apply system wide" for new users -- Didier Roche Thu, 12 Apr 2012 13:55:57 +0200 gnome-control-center (1:3.4.0-0ubuntu6) precise; urgency=low * debian/patches/96_sound_nua_panel.patch: - updated to quiet warnings on start (lp: #973312) * debian/patches/git_wacom_translations.patch: - set wacom strings as translatable (lp: #978153) * debian/patches/git_rotation_translation.patch: - git patch, correctly translation display rotation strings [ Michael Terry ] * debian/patches/accounts_fix_unsetting_icon.patch: - Don't try to send NULL string over DBus when unsetting the user icon. Instead use an empty string. LP: #978049 -- Sebastien Bacher Tue, 10 Apr 2012 21:33:55 +0200 gnome-control-center (1:3.4.0-0ubuntu5) precise; urgency=low [ Jeremy Bicha ] * debian/patches/50_ubuntu_systemwide_prefs.patch: - Network proxy: Show "apply system wide" for sudo group too (LP: #967978, LP: #893842) [ Michael Terry ] * debian/patches/accounts_handle_system_user.patch: - Disable user controls when no user is selected, to prevent crashes in code that doesn't expect that situation. LP: #908140 -- Michael Terry Mon, 09 Apr 2012 22:13:55 -0400 gnome-control-center (1:3.4.0-0ubuntu4) precise; urgency=low * debian/patches/96_sound_nua_panel.patch: - if the "sound" panel is asked under Unity load "sound-nua" rather than bailing out, that's better than patching all softwares calling it - update the tabs enum so command lines call load the right one [ Jeremy Bicha ] * debian/patches/04_new_appearance_settings.patch: - Set the gsettings window theme value also (used by GNOME Shell 3.4) -- Sebastien Bacher Wed, 04 Apr 2012 15:23:59 +0200 gnome-control-center (1:3.4.0-0ubuntu3) precise; urgency=low * debian/patches/96_sound_nua_panel.patch: - change the a11y sound link to open soundnua under unity (lp: #963618) * debian/patches/classic_use_sound_indicator.patch: - don't autostart the sound applet under GNOME classic sessions since indicators are used (lp: #965288) * debian/patches/04_new_appearance_settings.patch: - don't display a (null) background size when a solid color is used (lp: #944076) - set "default" string as translatable (lp: #968290) -- Sebastien Bacher Fri, 30 Mar 2012 12:34:31 +0200 gnome-control-center (1:3.4.0-0ubuntu2) precise-proposed; urgency=low * debian/patches/51_unity_options_in_display_panel.patch: - use the same case that was in debian/patches/new_translations_hack.patch for translators (Sentence case and not Title Case) (LP: #967110) - do not show the panel on the preview, only the launcher (LP: #967027) - Add a separator for the unity settings (LP: #967121) - Fix some missing redrawing call (LP: #967136) * debian/patches/new_translations_hack.patch: - removed the translation as used in the other patch * debian/patches/04_new_appearance_settings.patch: - add launcher sensitivity to 2D settings now that 2D supports it as well - reveal spot won't make it in 2D, hide it in this session - remove a warning on non Unity session -- Didier Roche Wed, 28 Mar 2012 12:39:01 +0200 gnome-control-center (1:3.4.0-0ubuntu1) precise-proposed; urgency=low * New upstream release: - Network: Fix a crash by disconnecting idle sources - Printers: Fix crash in actualize_printers_list -- Robert Ancell Tue, 27 Mar 2012 11:41:31 +1100 gnome-control-center (1:3.3.92-0ubuntu4) precise; urgency=low * debian/patches/fix-crash-on-user-panel.patch: - Fix occasional crash when closing user panel (LP: #873679) -- Michael Terry Fri, 23 Mar 2012 15:26:12 -0400 gnome-control-center (1:3.3.92-0ubuntu3) precise-proposed; urgency=low * debian/patches/51_unity_options_in_display_panel.patch: - add the options to the display panel for unity multimonitor support. Choice where the launcher can be set (one monitor, all monitor) and sticky edges. (LP: #950136) * debian/patches/revert_git_keyboard_gsettings.patch: - refreshed * debian/patches/04_new_appearance_settings.patch: - revert the "click to get directly to a position" on the scroll bar. This should be done in gtk to get the same behavior everywhere. Too late for this cycle though. - fix the scrolling since gtk introduced GDK_SCROLL_SMOOTH. -- Didier Roche Fri, 23 Mar 2012 15:42:22 +0100 gnome-control-center (1:3.3.92-0ubuntu2) precise; urgency=low * debian/patches/dont_download_local_image.patch: - bugzilla patch from Ryan Lortie, should fix public images selected as wallpaper not showing in unity-greeter (lp: #672405) -- Sebastien Bacher Mon, 19 Mar 2012 19:39:08 +0100 gnome-control-center (1:3.3.92-0ubuntu1) precise; urgency=low * New upstream version: - should fix color panel segfault in gcm_prefs_device_changed_cb() (lp: #953145) * debian/patches/git_zoom_shell_only.patch: - dropped, the change is in the new version * debian/patches/new_translations_hack.patch: - updated strings -- Sebastien Bacher Mon, 19 Mar 2012 19:08:41 +0100 gnome-control-center (1:3.3.91-0ubuntu4) precise; urgency=low * debian/patches/96_sound_nua_panel.patch: - updated to r8 of the new vcs, fixes: - columns not correctly aligned (lp: #956888) - some strings were not marked translatable (lp: #957013) - combos resizing on profile changes (lp: #947302) * debian/patches/new_translations_hack.patch: - hack patch to add strings that will probably be added soon to the translation template -- Sebastien Bacher Fri, 16 Mar 2012 19:23:11 +0100 gnome-control-center (1:3.3.91-0ubuntu3) precise; urgency=low * debian/patches/04_new_appearance_settings.patch, debian/patches/63_normal_scrollbar_in_a11y.patch: - disable overlay scrollbars with a11y themes by setting the gsettings to false, thanks Andrea Cimitan (lp: #934123) [ Marc Deslauriers ] * debian/patches/99_add_lock-on-suspend.patch: Add a new preference to lock the screen when the system suspends. (LP: #938076) * debian/control.in: bump gsettings-desktop-schemas Depends -- Sebastien Bacher Fri, 09 Mar 2012 19:41:38 +0100 gnome-control-center (1:3.3.91-0ubuntu2) precise; urgency=low * debian/patches/96_sound_nua_panel.patch: - change X-GNOME-Keywords to Keywords - updated to r273, fixes profile selection issues with bluetooth devices (lp: #948236) * debian/patches/revert_git_drop_library.patch: - simplified, don't copy files or create a new dir * debian/patches/git_zoom_shell_only.patch: - hide zoom option when not under gnome-shell since they do nothing on other environments (lp: #945813) [ Martin Pitt ] * debian/control.in: Only recommend gnome-session-bin, to avoid pulling in all of gnome-session and Unity for derivatives. (LP: #936761) [ Aurélien Gâteau ] * debian/patches/60_ubuntu_nav_bar.patch: Use a GtkBox instead of a GtkGrid so that GTK_STYLE_CLASS_LINKED works. -- Sebastien Bacher Thu, 08 Mar 2012 18:30:18 +0100 gnome-control-center (1:3.3.91-0ubuntu1) precise; urgency=low * New upstream version: - Fix updates buttons never saying "No updates" (lp: #859409) - Fix wacom segfault (lp: #938549) * debian/control.in: - updated gnome-settings-daemon requirement * debian/gnome-control-center-data.install: - updated for the new version * debian/patches/08_dont_crash_on_null_territories.patch: - dropped, the issue is fixed is in the new version * debian/patches/96_sound_nua_panel.patch: - updated to r268, fixes: - "Cannot switch profile on Bluetooth headset" (lp: #940282) * debian/patches/99_fix_display_crash.patch: - dropped, the fix is in the new version -- Sebastien Bacher Tue, 06 Mar 2012 19:10:59 +0100 gnome-control-center (1:3.3.90-0ubuntu5) precise; urgency=low * debian/gnome-control-center-data.postinst: - dropped old postinst, it was required for jaunty * debian/patches/04_new_appearance_settings.patch: - use correct marging (lp: #945192) - use correct capitalization "Restore Default Behaviours" (lp: #944082) * debian/patches/58_ubuntu_icon_views_redesign.patch: - don't segfault when moving to the new category with down (lp: #934053) -- Sebastien Bacher Mon, 05 Mar 2012 16:30:12 +0100 gnome-control-center (1:3.3.90-0ubuntu4) precise; urgency=low * debian/patches/99_fix_display_crash.patch: - Disconnect signal when display panel is closed so we don't crash later. LP: #843274 -- Michael Terry Sat, 25 Feb 2012 09:36:05 -0500 gnome-control-center (1:3.3.90-0ubuntu3) precise; urgency=low * debian/patches/62_update_translations_template.patch: - update POTFILES.in with the ubuntu specific sources for translation -- Sebastien Bacher Sat, 25 Feb 2012 12:39:48 +0100 gnome-control-center (1:3.3.90-0ubuntu2) precise; urgency=low * debian/patches/01_menu_category.patch: - dropped, no need to change the categories with unity * debian/patches/07_make_window_wider.patch: - dropped, the geometry changes are included in the design changes * debian/patches/58_ubuntu_icon_views_redesign.patch: - included geometry changes there * debian/patches/60_ubuntu_nav_bar.patch: - correctly update when opening a panel directly (lp: #934074) - correctly update when following links (lp: #934070) - use a grid rather than a box, fixes buttons spacing (lp: #937397) * debian/patches/lp829673_hide_nm-applet.patch: - dropped (design decision), hiding system indicators is not something most user do and doesn't require a visible ui element, the gconf key is still available though * debian/patches/96_sound_nua_panel.patch: - backported upstream fix for balance use on mouse wheel - changed the tabs order, sound effects is not the most important one - updated to r261 [ Mathieu Trudel-Lapierre ] * debian/patches/lp829673_hide_nm-applet.patch: fix up UI spacing. [ Didier Roche ] * debian/patches/04_new_appearance_settings.patch: - reenable the reveal mode as supported upstream now. Make some tweaking to adapt to new values - hack for "clicking on slider shouldn't increase by steps (LP: #938534) -- Sebastien Bacher Thu, 23 Feb 2012 21:49:45 +0100 gnome-control-center (1:3.3.90-0ubuntu1) precise; urgency=low * New upstream version: - gnome-control-center crashed with SIGSEGV in supply_levels_draw_cb() (lp: #903680) * Refreshed patches for the new version * debian/control.in: - updated g-s-d requirement * debian/patches/91_configure_cheese.patch: - dropped, the fix is in the new version * debian/source_gnome-control-center.py: - don't update the title several times, tag as well [ Ken VanDine ] * debian/patches/96_sound_nua_panel.patch - sound-nua: fixed crashers in gtk_tree_model_get_valist() (LP: #931708) and (LP: #932446) - sound-nua: fixed a failure in profile selection -- Sebastien Bacher Tue, 21 Feb 2012 22:23:29 +0100 gnome-control-center (1:3.3.5-0ubuntu5) precise; urgency=low * debian/patches/lp829673_hide_nm-applet.patch: provide a way for users to hide the network applet from the Network settings panel. (LP: #829673) -- Mathieu Trudel-Lapierre Tue, 21 Feb 2012 10:03:59 -0500 gnome-control-center (1:3.3.5-0ubuntu4) precise; urgency=low * debian/patches/04_new_appearance_settings.patch: - remove the "launcher reveal option" as unsure that the unity side will be ready on time. - make some pixel tweaking as asked by design -- Didier Roche Tue, 21 Feb 2012 13:06:43 +0100 gnome-control-center (1:3.3.5-0ubuntu3) precise; urgency=low * debian/patches/61_workaround_online_account.patch: - hide the gnome-online-accounts icon under unity - workaround to allow calling g-c-c on the online-accounts capplet, we don't want to promote the online accounts under Unity since it's currently creating confusion rather than being useful (our email doesn't use it for example) * debian/source_gnome-control-center.py: - update the title to indicate in what panel the segfaults happen -- Sebastien Bacher Mon, 20 Feb 2012 10:59:08 +0100 gnome-control-center (1:3.3.5-0ubuntu2) precise; urgency=low * debian/patches/58_ubuntu_icon_views_redesign.patch: - updated default height to fit on screen (lp: #929585) [ Aurélien Gâteau ] * debian/patches/58_ubuntu_icon_views_redesign.patch - Refresh for 3.5.5 * debian/patches/60_ubuntu_nav_bar.patch: - First implementation of breadcrumb buttons, without pointy arrows for now (lp: #933482) -- Sebastien Bacher Thu, 16 Feb 2012 23:15:54 +0100 gnome-control-center (1:3.3.5-0ubuntu1) precise; urgency=low * 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 -- Sebastien Bacher Wed, 15 Feb 2012 23:16:31 +0100 gnome-control-center (1:3.2.2-2ubuntu10) precise; urgency=low * debian/patches/97_unity_power_ui.patch: - Patch that adjusts the Power panel to match design's mockups, only when in Unity. And adds a drop down for controlling whether the battery status icon is displayed or not. * debian/patches/97_power_icon_policy.patch: - Drop in favor of above patch -- Michael Terry Wed, 15 Feb 2012 09:14:48 -0500 gnome-control-center (1:3.2.2-2ubuntu9) precise; urgency=low * debian/contol.in: - recommends indicator-sound (>= 0.8.1) since the new indicator option needs the schemas to work - recommends indicator-power (>= 1.90) for similar reasons * debian/patches/96_sound_nua_panel.patch: - drop generated files to simplify the diffs * debian/patches/97_power_icon_policy.patch: - Power Menu should respect icon-policy hide setting (lp: #811769) * debian/patches/98_default_sound_theme.patch: - default to "ubuntu" as a sound theme [ Ken VanDine ] * debian/patches/96_sound_nua_panel.patch - refreshed with latest changes from ronoc -- Sebastien Bacher Tue, 14 Feb 2012 23:46:04 +0100 gnome-control-center (1:3.2.2-2ubuntu8) precise; urgency=low [ Sebastien Bacher ] * debian/patches/git_extra_keywords.patch: - list "preferences" as a keyword for system settings (lp: #921039) * debian/patches/96_sound_nua_panel.patch - Updated with latest changes from ronoc: * protect against null in_profiles in the device * ensure when swapping profiles on a sink that is not the pulse server default that is reset as the default sink when the appropriate new stream is created after the profile swap - head melt -- Ken VanDine Fri, 10 Feb 2012 14:57:36 -0500 gnome-control-center (1:3.2.2-2ubuntu7) precise; urgency=low [ Didier Roche ] * debian/patches/04_new_appearance_settings.patch: - fix a typo (LP: #929070) - new reveal sensitivity default is now 2.0 [ Ken VanDine ] * debian/patches/96_sound_nua_panel.patch - Adding the new sound-nua panel for sound settings, only displayed in Unity, the old sound panel will load in GNOME -- Ken VanDine Thu, 09 Feb 2012 16:44:44 -0500 gnome-control-center (1:3.2.2-2ubuntu6) precise; urgency=low [ Aurélien Gâteau ] * debian/patches/58_ubuntu_icon_views_redesign.patch - Implement the new category headers (LP: #921061) [ Didier Roche ] * debian/patches/04_new_appearance_settings.patch, respect new design requests: - High Contrast misspelled as "HighContrast" etc (LP: #878790) - The scope of "Restore defaults" button in Appearance>Behavior is not clear enough (LP: #924253) - Add a new launcher reveal slider (LP: #923749) - The Background section in Appearance panel should have an option to display the dotted grid (LP: #922544) - Restore Defaults buttons in appearance should be replaced with in context hints (LP: #922543) - Rename tabs to look and User Interface to Background (LP: #918580) [ Christopher James Halse Rogers ] * debian/patches/59_install_gcm_components_on_demand.patch: - Install gnome-color-manager tools on-demand. Fixes the "calibrate" and "View profile" buttons without requiring us to install 33MB of Arygll on the CDs. (LP: #868803) -- Didier Roche Tue, 07 Feb 2012 18:13:21 +0100 gnome-control-center (1:3.2.2-2ubuntu5) precise; urgency=low * debian/patches/04_new_appearance_settings.patch: - Wallpapers grid in appearance should have 4 columns (LP: #922542) - Change the mouse wheel scrolling on slider to the opposite direction (LP: #922299) -- Didier Roche Fri, 27 Jan 2012 15:02:10 +0100 gnome-control-center (1:3.2.2-2ubuntu4) precise; urgency=low * 04_add_theme_selection.patch => 04_new_appearance_settings.patch: (background screen) - rename and add unity officials option to it. Note that those only appears if you are in an unity session. It impacts both unity-2d and unity-3d. unity-3d settings are taken if the options are different on first launch. All options for the settings aren't exposed. If the user specify something else in ccsm for instance, it will be preserved. (LP: #869080) - also add a "restore defauts" on the background screen to reset the user selection change to default. -- Didier Roche Thu, 26 Jan 2012 10:42:38 +0100 gnome-control-center (1:3.2.2-2ubuntu3) precise; urgency=low [ Marco Trevisan (Treviño) ] * debian/patches/93_change_window_role_on_panel_change.patch: - Set the gtk WM window role when changing panel, this is needed to get the real window id and match the gcc in unity (LP: #801784) [ Sebastien Bacher ] * debian/UbuntuLogo.png: - updated logo for 12.04 (lp: #910356) -- Sebastien Bacher Tue, 24 Jan 2012 11:57:55 +0100 gnome-control-center (1:3.2.2-2ubuntu2) precise; urgency=low * debian/libgnome-control-center1.symbols: restore the symbols tracking, since we build external capplets we better check they don't break * debian/rules: don't build shlibs for a library which stopped being distributed in GNOME3 * debian/patches/94_git_adding_shortcuts.patch: - let add custom shortcuts in any categorie * debian/patches/95_git_ctrlw_shortcut.patch: - ctrl-W close capplets and go back to the overwiew (lp: #863549) -- Sebastien Bacher Mon, 23 Jan 2012 15:11:19 +0100 gnome-control-center (1:3.2.2-2ubuntu1) precise; urgency=low * Rebase on Debian, remaining Ubuntu changes: * debian/control: - Build-Depend on hardening-wrapper, dpkg-dev and dh-autoreconf - Add dependency on ubuntu-system-service - Don't depend on cheese, cups-pk-helper, libsocialweb, or mesa-utils since they're in universe - Depend on ubuntu-docs instead of gnome-user-guide * debian/rules: - Add binary-post-install rule for gnome-control-center-data - Don't build with cheese or libsocialweb * debian/gnome-control-center-data.install: * debian/source/include-binaries: - Install UbuntuLogo.png & apport hook * debian/gnome-control-center.dirs: * debian/gnome-control-center.links: - Add a link to the control center shell for indicators * debian/patches/04_add_theme_selection.patch: - Add theme selection to User Interface panel - Refreshed for Precise design and renamed to User Interface * debian/patches/01_allow_external_panels.patch: - Allow running external (non-embedded) panels (LP: #787694) * debian/patches/02_no_assert_on_null_streams.patch: - Temporary patch to not assert on NULL streams (LP: #741155) * debian/patches/03_show_wacom_under_unity.patch: - show the wacom panel under unity (lp: #840555) * debian/patches/05_run_update_manager.patch: - Run update-manager instead of PackageKit updater (LP: #801335) * debian/patches/07_make_window_wider.patch - Make the System Settings window a bit wider to reduce need for scrolling * debian/patches/10_keyboard_layout_on_unity.patch: - Show keyboard layout bits on Unity (LP: #834523) * Add 11_power-configure_lid_action.patch: Add back configuration for lid action. (LP: #792636, GNOME#659045) * debian/patches/12_add_never_turn_screen_off.patch: - Add back the "never turn screen off" option (LP: #862154) * debian/patches/50_ubuntu_systemwide_prefs.patch: - Add back system-wide proxy settings (LP: #795519) * 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/patches/53_use_ubuntu_help.patch: Use gnome-help when running GNOME or GNOME Fallback (LP: #852911) * debian/patches/55_user_accounts_hide_controls.patch: - When not using GDM, hide certain controls in the User Accounts panel that only apply to it. (LP: #821766, LP: #821771) - When a user is using an ecryptfs home directory, do not allow the user to log in without a password * debian/patches/56_use_ubuntu_info_branding.patch: - Use Ubuntu branding in System info panel (LP: #860497) * debian/patches/57_use_nonsymbolic_keyboard_icon.patch: Use the non-monochrome icon for the Keyboard panel (LP: #862027) * debian/patches/90_git_sound_tab_order.patch: Reorder the tabs, the sound effect one is the less used and shouldn't be first in the list * debian/patches/91_git_build_use_fontconfig.patch: - git patch to fix the build of the region capplet * debian/patches/92_git_minimal_output_height.patch: - set a minimal height on the output list (lp: #850032) -- Jeremy Bicha Sun, 15 Jan 2012 13:55:05 -0500 gnome-control-center (1:3.2.2-2) unstable; urgency=low [ Josselin Mouette ] * Recommend cups-pk-helper. Closes: #622688. [ Michael Biebl ] * Add Recommends on mesa-utils. The glxinfo utilitity is required to show details about the graphics card. * Upload to unstable. -- Michael Biebl Fri, 16 Dec 2011 23:55:34 +0100 gnome-control-center (1:3.2.2-1) experimental; urgency=low [ Laurent Bigonville ] * debian/control.in: Bump libgnome-desktop-3-dev build-dependency (Closes: #647954) [ Josselin Mouette ] * Breaks/Replaces g-p-m < 3.2. Closes: #648410. [ Michael Biebl ] * New upstream release. * Refresh debian/patches/91_configure_cheese.patch. * debian/control.in: - Mark Build-Depends on libnm-gtk-dev as linux-any. - Bump Build-Depends on libnotify-dev to (>= 0.7.3). - Bump Depends on gsettings-desktop-schemas to (>= 3.0.2). * Remove debian/libgnome-control-center-dev.install, obsolete. * Remove debian/libgnome-control-center1.symbols and instead add a strict dependency between gnome-control-center and libgnome-control-center1. -- Michael Biebl Wed, 16 Nov 2011 00:45:49 +0100 gnome-control-center (1:3.2.1-1) experimental; urgency=low * New upstream release * Sync with Ubuntu + debian/libgnome-control-center1.symbols: Update symbols + debian/patches/90_force_fallback.patch: Updated + debian/patches/06_handle_passwd_with_ldap.patch: Added + debian/patches/08_dont_crash_on_null_territories.patch: Added * debian/patches/02_https.patch: Removed, fixed upstream * debian/patches/03_ppd_h.patch: Removed, fixed upstream * debian/patches/91_configure_cheese.patch: Include cheese pkg-config flags as symbols of it are being used * debian/control.in: Remove libgnome-control-center-dev package * debian/control.in: Add build-dependency on libgoa-1.0-dev, libcolord-dev, and libnotify-dev * debian/control.in: Tighten libgtk-3-dev build-dependency * debian/control.in: Add libnm-gtk-dev b-d for network panel * debian/control.in: Add libcheese-gtk-dev b-d to take account pictures * debian/control.in: Add libsocialweb-client-dev b-d to use flickr background service -- Sjoerd Simons Sat, 05 Nov 2011 00:46:41 +0000 gnome-control-center (1:3.0.2-3) unstable; urgency=low * debian/control.in: - Also add Breaks/Replaces against gdm (<< 3.0). Closes: #645400 - Update Depends on gnome-desktop-data to gnome-desktop3-data. * Rename control-center2.xpm to gnome-control-center.xpm and refresh the icon based on what's currently shipped in gnome-icon-theme. Update the menu file accordingly. -- Michael Biebl Sat, 15 Oct 2011 20:49:56 +0200 gnome-control-center (1:3.0.2-2) unstable; urgency=low [ Josselin Mouette ] * Drop useless gst-alsa | gst-audiosink suggstion; suggest gst-pulseaudio instead. [ Michael Biebl ] * Upload to unstable. * debian/watch: - Switch to .xz tarballs. - Track stable releases. * Bump debhelper compatibility level to 8. - Update Build-Depends on debhelper. - Strip debian/tmp/ from .install files. * debian/control.in: - Update Vcs-* URLs. - Bump Standards-Version to 3.9.2. No further changes. - Change network-manager build-dependencies to linux-any. - Add Breaks/Replaces against gdm3 (<< 3.0) which shipped the faces in previous versions. - Add Breaks/Replaces against gnome-settings-daemon (<< 3.0). Closes: #625783 * Refresh patches. * debian/gnome-control-center-data.install - Install face pictures. -- Michael Biebl Fri, 14 Oct 2011 16:13:54 +0200 gnome-control-center (1:3.0.2-1) experimental; urgency=low [ Josselin Mouette ] * Break glib < 2.28.6-2 for x-scheme-handler support. [ Sjoerd Simons ] * New upstream release [ Josselin Mouette ] * Break gnome-session < 3.0 because of the sound-applet startup. * 01_menu_category.patch: new patch. Put g-c-c.desktop in the Settings menu instead of the System one. * 90_force_fallback.patch: new patch. Disable the “forced fallback mode” switch, since we already provide a xsession file for it in gnome-session-fallback. * Break gnome-power-manager < 3.0 because of the power panel. * 02_https.patch: patch from upstream git. Correctly register https scheme together with http. * 03_ppd_h.patch: patch from upstream git. Include ppd.h explicitly. * Use dh-autoreconf to go with this patch. -- Josselin Mouette Sun, 04 Sep 2011 19:15:55 +0200 gnome-control-center (1:3.0.1.1-1) experimental; urgency=low * New upstream release. * gnome-control-center-data.install: drop GConf schemas. * gnome-control-center-data.gconf-defaults: dropped, obsolete. -- Josselin Mouette Fri, 29 Apr 2011 02:24:28 +0200 gnome-control-center (1:3.0.0.1-1) experimental; urgency=low * New upstream release. * debian/control.in: + add build dependency on new libnm-glib-dev, libnm-util-dev, and network-manager-dev. + bump build dependency on gnome-settings-daemon-dev. + add dependency on gnome-icon-theme-symbolic. + bump dependency on gnome-settings-daemon, required for new gsettings schema. * debian/patches/00_disable-nm.patch: removed as NM 0.9 is now available. * debian/patches/99_autoreconf.patch: removed. * debian/libgnome-control-center-dev.install: do not install gtk-doc as it was incomplete and got removed. -- Frederic Peters Thu, 31 Mar 2011 01:01:31 +0530 gnome-control-center (1:2.91.93-1) experimental; urgency=low * New upstream release. [ Emilio Pozuelo Monfort ] * debian/control.in: + Build depend on a new enough version of gdk-pixbuf. Closes: #619282. + Drop Breaks on gnome-media-common. [ Frederic Peters ] * debian/patches/00_disable-nm.patch: updated. * debian/patches/99_autoreconf.patch: refreshed. -- Frederic Peters Wed, 30 Mar 2011 23:44:16 +0530 gnome-control-center (1:2.91.92-1) experimental; urgency=low * New upstream release. [ Emilio Pozuelo Monfort ] * debian/control.in: + gnome-control-center-dev belongs in the devel section. [ Laurent Bigonville ] * debian/control.in - Add Vcs-* fields - Bump libglib2.0-dev and gnome-settings-daemon-dev Build-dependencies - Bump gnome-control-center Dependency against gnome-settings-daemon - gnome-control-center-data Breaks gnome-media-common (<< 2.91) [ Frederic Peters ] * debian/patches/00_disable-nm.patch: updated. * debian/images/, debian/patches/12_timezones.patch: merged upstream. * debian/patches/10_libshortcuts-link.patch: merged upstream. * debian/control.in: update build-deps. * debian/control.in: add dependency on gsettings-desktop-schemas. -- Frederic Peters Mon, 21 Mar 2011 22:30:04 +0100 gnome-control-center (1:2.91.91-3) experimental; urgency=low * debian/control.in: add build-dep on locales, required for the datetime test-endianess check. -- Frederic Peters Sun, 13 Mar 2011 20:05:56 +0100 gnome-control-center (1:2.91.91-2) experimental; urgency=low * debian/rules, debian/images/*, debian/patches/12_timezones.patch: ship and install missing timezone graphics. * debian/libgnome-control-center1.symbols: updated with three new symbols. -- Frederic Peters Sat, 12 Mar 2011 21:38:35 +0100 gnome-control-center (1:2.91.91-1) experimental; urgency=low * New upstream release. + debian/patches/00_disable-nm.patch: updated. + debian/patches/10_mouse-panel-link.patch: fixed upstream. + debian/patches/11_keyboard-panel-link.patch: ditto. + debian/patches/10_libshortcuts-link.patch: fix linking of the shortcut code. + debian/patches/99_autoreconf.patch: refreshed. + debian/control.in: build build-dep on libgnomekbd-dev -- Frederic Peters Thu, 10 Mar 2011 17:35:21 +0100 gnome-control-center (1:2.91.90-1) experimental; urgency=low * New upstream release. + debian/patches/00_disable-nm.patch: disable Network Manager 0.9 bits. + debian/patches/10_mouse-panel-link.patch: fix linking of the mouse panel. + debian/patches/11_keyboard-panel-link.patch: fix linking of the keyboard panel. + debian/libgnome-control-center1.symbols: updated with a new symbol. -- Frederic Peters Fri, 25 Feb 2011 10:44:34 +0100 gnome-control-center (1:2.91.6-1) experimental; urgency=low * debian/control.in: + Depend on accountsservice and apg for the User Accounts panel. + Update for the new gtk+ package names. * New upstream release. + debian/patches/01_printers_link.patch: - Fix linking for the printers capplet. + debian/control.in: - Update build dependencies. -- Emilio Pozuelo Monfort Sat, 19 Feb 2011 14:40:15 +0000 gnome-control-center (1:2.91.5-2) experimental; urgency=low * debian/control.in: - Drop gnome-control-center breaks/replaces against gnome-media(-common), they seem unneeded. - capplets-data replaces gnome-media-common. - Build depend on docbook-xml, needed to build the docs. - capplets-data: stop breaking g-c-c, it already depends on a new enough version of the former so this is not needed. - gnome-control-center: no need to manually depend on libgnome-control-center1. The shlibs does that for us. - Don't use tabs for padding. - Drop obsolete dpkg-dev b-d. * debian/control.in, debian/rules, debian/source/format: - Switch to source format 3.0 (quilt). * debian/control.in, debian/{capplets,gnome-control-center}-data.*, debian/rules: - Rename capplets-data to gnome-control-center-data. * debian/index.theme: - Removed, unused. * debian/libgnome-control-center1.symbols: - Add a Build-Depends-Package field. * debian/gnome-keyboard-properties.1, debian/gnome-control-center.manpages: - gnome-keyboard-properties is gone, drop the manpage. -- Emilio Pozuelo Monfort Sun, 16 Jan 2011 23:01:37 +0000 gnome-control-center (1:2.91.5-1) experimental; urgency=low * New upstream release * Based on ubuntu 1:2.91.3.1-0ubuntu1~build2, by Robert Ancell and others * debian/patches/01_ml_po.patch - Removed * patches/25_window_manager_settings.patch - Removed, no longer applicable -- Sjoerd Simons Sat, 15 Jan 2011 12:18:29 +0000 control-center (1:2.30.1-2) unstable; urgency=low * debian/control.in: - Let gnome-control-center depend on evolution-data-server, instead of only recommending it. It's needed by gnome-about-me. Closes: #592525. -- Emilio Pozuelo Monfort Wed, 11 Aug 2010 01:37:07 +0200 control-center (1:2.30.1-1) unstable; urgency=low * New upstream release. * Update build-dependencies. * Require g-s-d 2.30. * 01_fix_libslab_build.patch, 02_xrandr_assert.patch: dropped, merged upstream. * 70_relibtoolize.patch: updated for the new version. * 01_ml_po.patch: new patch. Fix Malayalam translation that causes GConf errors. -- Josselin Mouette Tue, 27 Apr 2010 20:22:38 +0200 control-center (1:2.28.1-2) unstable; urgency=low * Drop libxxf86misc-dev build-dependency, it is not used. Closes: #559694. * 02_xrandr_assert.patch: stolen upstream. Fix assertion when using mirroring. Closes: #563094. -- Josselin Mouette Mon, 04 Jan 2010 18:26:06 +0100 control-center (1:2.28.1-1) unstable; urgency=low * New upstream release. - debian/patches/70_relibtoolize.patch: + Updated. - debian/control.in: + Stop build depending on libhal-dev, it's not needed anymore. * debian/rules: Remove check-dist.mk include to upload to unstable. -- Emilio Pozuelo Monfort Thu, 22 Oct 2009 05:11:23 +0200 control-center (1:2.28.0-2) experimental; urgency=low * Build depend on a recent libslab-dev to build against one that doesn't use libgnomeui, making gnome-control-center start again. Closes: #550461. -- Emilio Pozuelo Monfort Mon, 12 Oct 2009 01:58:10 +0200 control-center (1:2.28.0-1) experimental; urgency=low [ Loic Minier ] * Drop --disable-mime-cache configure flag which was introduced in a Debian specific patch which was dropped in 1:2.18.1-1. [ Emilio Pozuelo Monfort ] * debian/patches/05_ta_po.patch: forwarded, add header. [ Josselin Mouette ] * Require gnome-settings-daemon 2.26. Closes: #540418. [ Emilio Pozuelo Monfort ] * New upstream release. - debian/control.in: + Bump libgtk2.0-dev and libgnomekbd-dev build dependencies. + Build depend on libxklavier-dev >= 4.0 rather than libxklavier12-dev. + Remove libglade2-dev, libpanel-applet2-dev and libgnomeui-dev build dependencies. + Add libunique-dev and libxi-dev build dependencies. + Remove libpolkit-gnome-dev from build depends, recommend policykit-1-gnome for PolicyKit 1 support. - debian/patches/05_ta_po.patch: + Removed, the issue is no longer present in the po file. - debian/patches/01_fix_libslab_build.patch: + Updated from https://bugzilla.gnome.org/show_bug.cgi?id=591428. - debian/patches/25_window_manager_settings.patch, debian/patches/70_relibtoolize.patch: + Updated. - debian/patches/04_path_xtra.patch: + Removed, Debian's autoconf patch doesn't patch AC_PATH_XTRA to check for its arguments anymore, so it's useless. * debian/rules: - Stop touching every file, it was done to workaround a broken tarball. - Include check-dist.mk to avoid uploads to experimental. * debian/control.in: - Tighten libgnome-window-settings-dev dependency on the shared library. - Standards-Version is 3.8.3, no changes needed. - Remove old conflicts/replaces. -- Emilio Pozuelo Monfort Fri, 09 Oct 2009 20:54:05 +0200 control-center (1:2.26.0-1) unstable; urgency=low * Stop mentioning GNOME 2. * Remove scrollkeeper dependency. * New upstream release. * Update build-dependencies. * Remove build-deps unneeded thanks to the external libslab: librsvg, pango. * 02_build_libgnome.patch, 06_gnomedesktop_api.patch: removed, fixed upstream. * 03_a11y_logout.patch: removed, now uses the gnome-session dbus interface. * 05_ta_po.patch, 70_relibtoolize.patch: updated for the new version. * Install the autostart file in /usr/share/gnome/autostart. * capplets-data.postinst: remove the one in the old location. -- Josselin Mouette Fri, 29 May 2009 13:28:19 +0200 control-center (1:2.24.0.1-5) unstable; urgency=low * Remove useless build-dependency on libeel2-dev. -- Josselin Mouette Sat, 25 Apr 2009 13:18:24 +0200 control-center (1:2.24.0.1-4) unstable; urgency=low * Set the team as primary maintainer. Closes: #523535. * 02_build_libgnome.patch: new patch. Fix build failure by linking explicitly to libgnomeui for stuff incorrectly listing gnome-desktop only as a requirement. Closes: #524308. * 06_gnomedesktop_api.patch: patch to cope with the API changes in GnomeRR 2.26. * 70_relibtoolize.patch: regenerated. * Bump build-dependency on gnome-desktop to 2.26. -- Josselin Mouette Thu, 16 Apr 2009 10:34:54 +0200 control-center (1:2.24.0.1-3) unstable; urgency=low * capplets-data.gconf-defaults: remove the keybinding settings. Now that X.org returns correctly the XF86* keys, they must be used instead. * Add missing shortcuts for Home and Help. -- Josselin Mouette Fri, 10 Apr 2009 20:51:39 +0200 control-center (1:2.24.0.1-2) unstable; urgency=low [ Josselin Mouette ] * Depend on gnome-settings-daemon >= 2.24. Closes: #510172. * Standards version is 3.8.1. * Upload to unstable. [ Emilio Pozuelo Monfort ] * debian/rules, debian/shlibs.local: Call dh_makeshlibs for libgnome- window-settings1 instead of using shlibs.local. It was likely there to workaround dpkg-dev setting ignoring the dependency from the Depends line and using that of dpkg-shlibdeps, but it's no longer the case. As a side effect, this makes the shlibs file be versioned as it should be. [ Loic Minier ] * Demote the scrollkeeper dep of capplets-data to a Suggest on rarian-compat | scrollkeeper; the scrollkeeper dep seems to have been added around 2002 due to use of scrollkeeper-update in the postinst. -- Josselin Mouette Tue, 07 Apr 2009 09:11:09 +0200 control-center (1:2.24.0.1-1) experimental; urgency=low * 03_a11y_logout.patch: use gnome-panel-logout for logout when available. * New upstream release. + Correctly sets background without nautilus. Closes: #472902. + The about-me capplet correctly saves emails. Closes: #350651. + Resolutions are sorted in the display capplet. Closes: #509899. * Update build-dependencies. * Build-depend on libeel 2.24 to build against the experimental version. * Suggest libcanberra-gtk-module instead of esound-clients. * Remove obsolete files: libgnome-settings-daemon-dev.install, gnome-control-center.dirs. * Switch to quilt for managing patches; build-depend on quilt. * 01_fix_libslab_build.patch: updated for the new version. * 02_xklavier_utf8.patch: dropped, merged upstream * 25_window_manager_settings.patch: don’t patch the Makefile.in’s. * 70_relibtoolize.patch: regenerated. * capplets-data.gconf-defaults: the /music key is renamed to /media. * Don’t remove the GConf schemas in the installation target. * *.install: simplify a lot the installation files. + Remove the pkg-config files in capplets-data. * Remove -1 suffix in build-deps. * 99_ltmain_as-needed.patch: make --as-needed work for the library as well. * debian/gnome-control-center.postinst: remove gnome-vfs conffiles. * 05_ta_po.patch: new patch. Fix Tamil translation of the GConf defaults. -- Josselin Mouette Sun, 28 Dec 2008 12:38:50 +0100 control-center (1:2.22.2.1-2) unstable; urgency=low * 02_xklavier_utf8.patch: patch from upstream to accommodate the UTF8 changes in libxklavier 3.5-2. * Standards version is 3.8.0, no changes. * Suggest x11-xserver-utils for xrdb instead of xbase-clients. -- Josselin Mouette Wed, 10 Sep 2008 12:34:52 +0200 control-center (1:2.22.2.1-1) unstable; urgency=low [ Josselin Mouette ] * Suggest gstreamer0.10-alsa | gstreamer0.10-audiosink. Closes: #482794. [ Sebastian Dröge ] * New upstream bugfix release: + debian/patches/70_relibtoolize.patch: - Updated to apply cleanly again. + debian/rules: - Run touch on every file to fix up timestamps. -- Sebastian Dröge Thu, 29 May 2008 10:32:54 +0200 control-center (1:2.22.1-1) unstable; urgency=low * New upstream bugfix release: + debian/patches/70_relibtoolize.patch: - Updated for the new version. -- Sebastian Dröge Wed, 16 Apr 2008 11:03:33 +0200 control-center (1:2.22.0-2) unstable; urgency=low * Upload to unstable. * debian/control.in, debian/gnome-control-center.install: + Use nautilus 2.20 for now. -- Sebastian Dröge Wed, 19 Mar 2008 02:14:49 +0100 control-center (1:2.22.0-1) experimental; urgency=low * New upstream stable release: + Upload to experimental first because of intrusive changes. + gnome-settings-daemon moved to it's own source package. + Update build dependencies and dependencies. -- Sebastian Dröge Sat, 15 Mar 2008 19:06:48 +0100 control-center (1:2.20.3-3) unstable; urgency=low [ Josselin Mouette ] * Conflict against gnome-session << 2.20.3-2 because earlier versions require the dbus service file. [ Sebastian Dröge ] * debian/control.in: + Build depend on libxklavier12-dev | libxklavier-dev and rebuild against the new soname. -- Sebastian Dröge Thu, 28 Feb 2008 10:03:20 +0100 control-center (1:2.20.3-2) unstable; urgency=low * capplets-data.install: don’t install the dbus service file, as g-s-d should not be started through dbus. * gnome-keyboard-properties.1: + Fix missing space. + Fix whatis entry. * gnome-control-center.dirs: removed. * Don’t run dh_makeshlibs for g-c-c. * Update menu entry to the latest menu layout. -- Josselin Mouette Sat, 16 Feb 2008 14:58:03 +0100 control-center (1:2.20.3-1) unstable; urgency=low * New upstream bugfix release. * debian/control.in: + Update Standards-Version to 3.7.3, no additional changes needed. * debian/patches/70_relibtoolize.patch: + Updated for the new version. -- Sebastian Dröge Sat, 12 Jan 2008 07:34:06 +0100 control-center (1:2.20.1-2) unstable; urgency=high [ Josselin Mouette ] * 30_pkgconfig-path.patch: provide the path to the gnome-settings-daemon binary in the pkgconfig file. [ Loic Minier ] * Upload with urgency high as we need this minor change for next gnome-session. -- Loic Minier Tue, 27 Nov 2007 13:57:27 +0100 control-center (1:2.20.1-1) unstable; urgency=low * New upstream bugfix release: + debian/patches/70_relibtoolize.patch: - Regenerated for the new version. -- Sebastian Dröge Thu, 25 Oct 2007 19:45:06 +0200 control-center (1:2.20.0.1-1) unstable; urgency=low [ Loic Minier ] * gnome-settings-daemon is in /usr/lib/control-center, not gnome-control-center; closes: #443997. * Drop the version of the scrollkeeper dependency. [ Josselin Mouette ] * Run dh_installmime for capplets-data, otherwise cdbs runs it before dh_install. [ Sven Arvidsson ] * Add man page for gnome-keyboard-properties (Closes: #345818) [ Sebastian Dröge ] * New upstream bugfix release: + debian/patches/70_relibtoolize.patch: - Updated for the new version. -- Sebastian Dröge Fri, 05 Oct 2007 08:45:45 +0200 control-center (1:2.20.0-1) unstable; urgency=low [ Loic Minier ] * Bump up gnome-icon-theme dep to >= 2.16 for applications-internet etc. * Bump up libpango1.0-dev b-dep to >= 1.17 to help experimental's sbuild to install libgtk2.0-dev >= 2.11. [ Sebastian Dröge ] * New upstream release: + debian/patches/27_nobashizms.patch: - Dropped, merged upstream. + 70_relibtoolize.patch: - Updated for the new version. * Upload to unstable, drop check-dist include. -- Sebastian Dröge Sat, 22 Sep 2007 11:06:14 +0200 control-center (1:2.19.6-1) experimental; urgency=low * New upstream development release; no API change. - Bump up libgtk2.0-dev build-dep to >= 2.11.6. - Relibtoolize. - Drop 99_ltmain_as-needed; fails to apply and not easy to update for me. -- Loic Minier Fri, 03 Aug 2007 10:28:44 +0200 control-center (1:2.19.5-2) experimental; urgency=low * Update defaults to string type by explicitely quoting them; closes: #432933. -- Loic Minier Fri, 13 Jul 2007 11:14:52 +0200 control-center (1:2.19.5-1) experimental; urgency=low [ Josselin Mouette ] * capplets-data.gconf-defaults: set the default keybindings, formerly in patches/07_default_keys.patch. * patches/07_default_keys.patch: removed. * 99_ltmain_as-needed.patch: get --as-needed back to work. [ Loic Minier ] * Drop DEB_CONFIGURE_LOCALSTATEDIR which seems to be useless since forever. * Drop Marc Dequènes (Duck) from Uploaders; thanks! * Cleanups. * New upstream release series; these are development releases, the API may still change incompatibly; no API change in this release though. - Target at experimental; include check-dist. - Set GNOME_MODULE and update watch and copyright files as the upstream module was renamed to gnome-control-center; update debian/*.install and *.links files for new pathnames. - Update patch 01_fix_libslab_build. - Update patch 02_xrdb to only patch gnome-settings-daemon/gnome-settings-xrdb.c (same as Ubuntu package). - Update patch 09_locate_pointer (from Ubuntu package). - Drop patch 10_eggaccelerators, merged upstream. - Drop patch 15_gconf_peditor which has no documentation and seems completely obsolete. - Update patch 19_extra_keybindings (from the Ubuntu package). - Drop patch 24_theme_dont_require_metacity, deprecated with the new version (from the Ubuntu package). - Drop patch 36-compiz-keybindings-support, deprecated with the new version (from the Ubuntu package). - Update relibtoolizing patch, 70_relibtoolize. - Drop patch 90_workaround_gnome_doc_utils_bug, workaround not required anymore. - Bump up libglib2.0-dev build-dep to >> 2.13. - Drop private icon dir and png pixmaps from capplets-data.install. - Drop gnome-font-properties, gnome-background-properties, gnome-theme-manager, and gnome-ui-properties from gnome-control-center.install. - Add a (libxklavier11-dev >= 3.2) build-dep. - Update GConf defaults for the music and calculator keybindings and bind the rhythmbox command to the default media player. - Install gnome-keybindings.pc in libgnome-settings-daemon-dev. - Misc updates to *.install files. - New patch, 27_nobashizms, fixes a bashism in gnome-at-commandline; found in the Ubuntu package. - Install all files under usr/bin to gnome-control-center to ease handling of its install file. -- Loic Minier Tue, 10 Jul 2007 18:55:45 +0200 control-center (1:2.18.1-1) unstable; urgency=low [ Marco Cabizza ] * New upstream release: - gswitchit should be working as most of the keyboard-releated stuff has been moved to libgnomekbd ( therefore depending on it ). - dropping 12_sort_entries.patch, 22_bkg_capplet_follow_symlink.patch, and 23_menu_files_conflict.patch due to code reorganisation. - dropping 28_thunderbird-no-compose-flag.patch and 29_iceweasel-icedove-preferred-apps.patch as they're merged upstream. - fixing 02_xrdb.patch for the new upstream. - don't create the libslab* packages, depend on gnome-main-menu's libslab-dev. - don't install the control-center schema as it's provided by slab. * Fixing the .install files. [ Riccardo Setti ] * Built with the libslab-dev package provided by gnome-main-menu instead of the libslab shipped in the source - 01_fix_libslab_build.patch * Removed 06_disable_update_mime_at_install.patch. Use --disable-update-mimedb directly from the configure switch. * Updated 04_path_xtra.patch, 02_xrdb.patch * Added 05_autotools.patch * Dropped 30_pulseaudio.patch, merged upstream. * Added 07_default_keys.patch (patch taken from the ubuntu package) * Added 91_from_svn_fix_gstreamer_warning.patch: patch from SVN, "Initialise threads early, and fix option context translation". (patch taken from the ubuntu package) [ Loic Minier ] * Drop commented out DEB_BUILDDIR completely; seems useless; cleanups. * Set LDFLAGS directly instead of via DEB_CONFIGURE_SCRIPT_ENV; build-dep on cdbs >= 0.4.41. * New upstream release has API additions in gnome-settings-client.h, bump up shlibs to >= 2.17.5. * Suggest xrdb. * Bump up intltool build-dep to 0.35.5. * Build-depend on libpango1.0-dev, libgnomekbdui-dev. * Drop build-dep on liborbit2-dev, libxklavier11-dev. * Bump up dep on gnome-menus to >= 2.12.0. * Version the libgnomekbd and libgnomekbdui build-deps to >= 0.1. * New upstream release; no API change in libgnome-window-settings. - Apply update to patch 07_default_keys, found in the Ubuntu package. - Drop patch 91_from_svn_fix_gstreamer_warning, merged upstream. - Rename patch 05_autotools to 70_relibtoolize and update it. - New patch, 90_workaround_gnome_doc_utils_bug, works around a build failure with newer gnome-doc-utils; from the Ubuntu package. * New patch, 36-compiz-keybindings-support, permits configuring keybindings when using compiz as window manager; from the Ubuntu package. * Upload to unstable; drop check-dist include. * Wrap build-deps and deps. * Fix URL in copyright. * Build-depend on scrollkeeper. -- Loic Minier Sun, 22 Apr 2007 13:48:12 +0200 control-center (1:2.16.3-1) experimental; urgency=low [ Sven Arvidsson ] * New patch, 30_pulseaudio.patch, Polypaudio is now PulseAudio; thanks Mike Hommey. [ Loic Minier ] * Merge 1:2.14.2-6 and 1:2.14.2-7; SVN r7995:8671. * New upstream stable release; bug fixes and translations. - Update patch 25_window_manager_settings. - Drop patch 30_null-terminate-font-list, merged upstream. - Update patch 30_pulseaudio. - Build-depend on scrollkeeper. -- Loic Minier Sat, 17 Mar 2007 15:49:26 +0100 control-center (1:2.16.2-3) experimental; urgency=low * Add a get-orig-source target to retrieve the upstream tarball. * Include the new check-dist Makefile to prevent accidental uploads to unstable; bump build-dep on gnome-pkg-tools to >= 0.10. * Build-depend on libgtk2.0-dev >= 2.10 for multihead support and to build typing-break which uses GtkStatusIcon, par of the 2.10 API. * Bump up libgnomeui-dev build-dep to >= 2.16.0-2 to get a Gtk 2.10 transitionned version. -- Loic Minier Sun, 4 Feb 2007 13:22:54 +0100 control-center (1:2.16.2-2) experimental; urgency=low * Conflict with gnome-session < 2.16. -- Josselin Mouette Mon, 27 Nov 2006 20:55:48 +0100 control-center (1:2.16.2-1) experimental; urgency=low [ Marco Cabizza ] * New upstream release: - gnome-settings-daemon doesn't crash anymore, hooray! (Closes: #372873) - dropping merged patches 26_ignore_pmu_permissions.patch and 27_bzip2.patch - adapting 19_extra_keybindings.patch * Bumping dependencies: libgtk2.0-dev, libxklavier11-dev, libebook-dev * Build-Depends on hal and dbus * Splitting off some stuff (gnome-window-settings.pc and its headers) into libgnome-window-settings-dev, and thus including the dbus .service in capplets-data * Updated the watch file [ Loic Minier ] * Fix watch file to track stable releases and use HTTP. [ Josselin Mouette ] * Merge 2.14.2-5. * rules: call clean-la.mk. * Build-depend on gnome-pkg-tools 0.7. * 29_iceweasel-icedove-preferred-apps.patch: remove the tons of useless translations of iceweasel and icedove by themselves. -- Josselin Mouette Sun, 26 Nov 2006 21:38:20 +0100 control-center (1:2.14.2-7) unstable; urgency=medium * Add a get-orig-source target to retrieve the upstream tarball. * New patch, 30_null-terminate-font-list, fixes crash triggerred by missing NULL terminator in name list; GNOME #356435. -- Loic Minier Mon, 26 Feb 2007 11:00:38 +0100 control-center (1:2.14.2-6) unstable; urgency=low * Update patch 29_iceweasel-icedove-preferred-apps to drop the -compose flag, as in 28_thunderbird-no-compose-flag. -- Loic Minier Mon, 27 Nov 2006 16:52:30 +0100 control-center (1:2.14.2-5) unstable; urgency=low * Update patch 29_iceweasel-icedove-preferred-apps to change the mixed case IceWeasel in Iceweasel. -- Loic Minier Sat, 25 Nov 2006 13:34:41 +0100 control-center (1:2.14.2-4) unstable; urgency=low * New patch, 29_iceweasel-icedove-preferred-apps, to offer IceWeasel and Icedove in the list of preferred applications; thanks Sven Arvidsson; closes: #393549. -- Loic Minier Sat, 25 Nov 2006 11:41:26 +0100 control-center (1:2.14.2-3) unstable; urgency=low [ Loic Minier ] * New patch, 28_thunderbird-no-compose-flag, to fix the way browsers invoke Thunderbird (drop the -compose flag which is added automatically for mailto: URLs); thanks Manuel Bilderbeek. (Closes: #380284) * Recommend gnome-user-guide instead of gnome2-user-guide; thanks Luk Claes. (Closes: #378718) [ Marco Cabizza ] * Set the correct path for bzip2 adding patches/27_bzip2.patch, and Recommends: bzip2, (Closes: #378141) [ Josselin Mouette ] * Suggest gnome-screensaver first, xscreensaver second. * Make libgnome-window-settings-dev tolerate binNMUs. * Depend on gnome-pkg-tools 0.6. * Use ${gnome:Version} and ${gnome:NextVersion}. * Call gnome-version.mk in rules. -- Josselin Mouette Fri, 1 Sep 2006 21:24:32 +0200 control-center (1:2.14.2-2) unstable; urgency=high [ Marco Cabizza ] * debian/control, debian/control.in: - libgnome-window-settings1 replaces capplets (Closes: #372804) [ Sjoerd Simons ] * debian/patches/26_ignore_pmu_permissions.patch - Added. Ignore errors when we can't open or use the pmu device for brightness settings. A better fix would be to use hal instead. (Closes: #373146) [ Loic Minier ] * Fix versioned dependency of capplets-data on gnome-control-center. * Let libgnome-window-settings1 conflict with capplets too. * Drop capplets Provides. -- Loic Minier Fri, 7 Jul 2006 22:28:58 +0200 control-center (1:2.14.2-1) unstable; urgency=low * New upstream release * debian/control, debian/control.in: - libgnome-window-settings1, libgnome-window-settings-dev Replaces gnome-control-center << 1:2.14.0-1 (Closes: #370211) - New maintainer * compat, libgnome-window-settings1.install, gnome-control-center.install: - Debhelper compatibility is 5 - Fixed some missing files errors -- Marco Cabizza Sun, 28 May 2006 18:53:48 +0200 control-center (1:2.14.1-1) unstable; urgency=low [ Marco Cabizza ] * New upstream release. - fixed the xkb releated bugs (Closes: #348809, #349399, #351798) - evdev doesn't crash gnome-settings-daemon any more (Closes: #362107, #362563) - fixed the gnome-settings-daemon crash at startup (Closes: #347796) * debian/control, debian/control.in: - dropped the dependency on xlibs due to its deprecation and since libxklavier depends on xkb-data (Closes: 342536, #365977) - standards version is 3.7.2 - Build-depend on libgtk2.0-dev (>= 2.8.12) and libgstreamer-plugins-base0.10-dev * debian/rules: - append --enable-gstreamer=0.10 to configure * debian/capplets-data.install: - added usr/share/desktop-directories to the list * debian/patches/02_xrdb.patch: - updated to fit upstream * debian/patches/08_pmu_fix.patch: - dropped; already merged upstream * New packages: - Move libgnome-window-settings.so.1 in the newly created libgnome-window-settings1 and add libgnome-window-settings1.shlibs - Move the libwindow-settings' header files in the newly created libgnome-window-settings-dev * debian/patches/25_window_manager_settings.patch: - rename /usr/lib/window-manager-settings to /usr/lib/libgnome-window-settings1. [ Josselin Mouette ] * Make the package binNMU-safe. + Build-depend on dpkg-dev 1.13.19. + Use ${source:Version}. -- Marco Cabizza Sat, 6 May 2006 17:01:39 +0200 control-center (1:2.12.3-2) unstable; urgency=medium * Build-depend on libxrender-dev, libx11-dev, and libxt-dev explicitely as these are used in configure.in, fixes FTBFS. [debian/control, debian/control.in] * Add missing build-deps on libgconf2-dev, libbonoboui2-dev, libesd0-dev, libgnomevfs2-dev, libfontconfig1-dev, libfreetype6-dev, libglib2.0-dev. [debian/control, debian/control.in] * Fix old changelog entries: - Fix the bug number closed in 1:2.12.1-2. - Explain Marillat's joke in 1:2.4.0-8. (Closes: #244288) -- Loic Minier Tue, 21 Feb 2006 11:38:12 +0100 control-center (1:2.12.3-1) unstable; urgency=low * New upstream release. * Recommend evolution-data-server since gnome-about-me seems to require it. (Closes: #340419) [debian/control, debian/control.in] -- Loic Minier Mon, 20 Feb 2006 18:27:00 +0100 control-center (1:2.12.2-2) unstable; urgency=low [ Gustavo Noronha Silva ] * debian/control.in: - increased debhelper b-dep to >= 4.1.0, because of cdbs [ Josselin Mouette ] * Rebuild to get rid of libgamin0 dependency (closes: #348347). -- Josselin Mouette Mon, 16 Jan 2006 20:47:30 +0100 control-center (1:2.12.2-1) unstable; urgency=low * New upstream release * debian/control.in: - removed duplicated build-dep on libgnome-menu-dev, leaving the bigger one (>= 2.12), thanks to Kurt Roeckx for pointing out -- Gustavo Noronha Silva Sun, 8 Jan 2006 12:02:37 -0200 control-center (1:2.12.1-2) UNRELEASED; urgency=low * Only install /usr/share/applications/*.desktop, not /usr/share/applications in capplets-data, and rm -rf /usr/share/applications/mimeinfo.cache in binary-post-install/capplets-data:: to be completely safe (the update-desktop-database can't be deactivated via configure). (Closes: #346062) [debian/capplets-data.install, debian/rules] -- Loic Minier Sat, 7 Jan 2006 15:30:16 +0100 control-center (1:2.12.1-1) experimental; urgency=low [ Loic Minier ] * New upstream releases. - Update watch file. [debian/watch] - Don't run scrollkeeper. [debian/rules] - Bump libgtk2.0-dev build-dep to >= 2.6.0. [debian/control, debian/control.in] - Add a libxft-dev build-dep on >= 2.1.2. [debian/control, debian/control.in] - Version libgnome-menu-dev build-dep on >= 2.10.1. [debian/control, debian/control.in] - Enable about-me capplet. . Update configure flags. [debian/rules] . Add libebook1.2-dev build-dep. [debian/control, debian/control.in] - Suggest gnome-screensaver. [debian/control, debian/control.in] * Add CDBS' utils. [debian/rules] * Don't overwrite DEB_CONFIGURE_EXTRA_FLAGS and DEB_INSTALL_MANPAGES_gnome-control-center. [debian/rules] [ Sjoerd Simons ] * debian/patches/12_sort_entries.patch - Updated for new upstream * debian/patches/20_gswitchit_dont_crash_when_no_xkb_config.patch - Removed. fixed upstream * debian/patches/22_bkg_capplet_follow_symlink.patch - Updated for new upstream (from the ubuntu package) * debian/patches/23_menu_files_conflict.patch - Update for new upstream * debian/patches/99_reautogenization.patch - Removed * Updated build-depends * Install gnome-about-me and the nautilus extensions * Use upstream versions of gnome-font-viewer.desktop and themus-theme-applier.desktop -- Sjoerd Simons Mon, 21 Nov 2005 18:21:32 +0000 control-center (1:2.10.2-1) unstable; urgency=low [ Josselin Mouette ] * Use again --as-needed. [ Marc Dequènes (Duck) ] * New upstream release. * Applied patch for gnome-font-viewer 'fonts:///' url capability from Sam Morris (Closes: #316188). * Fixed 'Apply theme' contextual entry in 'themes://' (corrected 'debian/themus-theme-applier.desktop') (Closes #298360). * Regenerated and merged reautogenization patches. -- Marc Dequènes (Duck) Fri, 30 Sep 2005 15:08:27 +0200 control-center (1:2.10.1-6) unstable; urgency=medium * Urgency medium because of FTBFS on sparc and alpha (binutils issue). * Remove --as-needed from LD_FLAGS. -- Loic Minier Wed, 10 Aug 2005 12:48:11 +0200 control-center (1:2.10.1-5) unstable; urgency=high * Urgency high because of RC bugfix and because this holds the GNOME 2.10 transition. * Add missing build-deps on libxss-dev (Closes: #319971) and libxinerama-dev. -- Loic Minier Tue, 26 Jul 2005 09:52:43 +0200 control-center (1:2.10.1-4) unstable; urgency=medium * Don't overwrite DEB_CONFIGURE_SCRIPT_ENV completely. * 24_theme_dont_require_metacity.patch: make gnome-theme-manager work without metacity being installed (closes: #315730). * Use type-handling's Provides: feature to avoid hacking the control file. * Remove the capplets package, which doesn't have a purpose anymore. Move all package contents back to gnome-control-center. * Remove most Replaces: and Conflicts:, not useful anymore. * Standards-version is 3.6.2. -- Josselin Mouette Sat, 25 Jun 2005 19:11:37 +0200 control-center (1:2.10.1-3) unstable; urgency=low * Fix menu files conflict (renaming 'preferences.menu' to 'gnome- preferences.menu') (causing control-center summary window to be empty). * Now building in 'debian/build/' directory (cleaner & avoid non- idempotency hackerie). * Updated 'debian/copyright' download URL. * 'debian/rules' spring-cleaning. -- Marc Dequènes (Duck) Wed, 15 Jun 2005 00:47:05 +0200 control-center (1:2.10.1-2) unstable; urgency=low * Upload to unstable (GNOME Team upload) (Closes: #313217). * Fixed in 2.10 : + crashes at startup when loading settings (Closes: #251126). + installing files from ~/.themes fails (Closes: #166983). + bad icon themes install path (Closes: #257241). + installing bad theme fails silently (Closes: #166982). + incorrect position of volume dialog (Closes: #260277). + cannot turn off sound events (Closes: #216927). and probably some more... * Buildsys not idempotent breaking next build because of missing schema '.in' file worked around in clean rule (GNOME people should really learn to test before releasing...). -- Marc Dequènes (Duck) Sun, 12 Jun 2005 19:43:28 +0200 control-center (1:2.10.1-1) experimental; urgency=low * New upstream release. * debian/control.in: - Updated build-dependencies * debian/patches: - 01_gnome-default-applications-properties-structs.c.patch: Removed as Debian's default applications are included upstream - 03_gsd_actions_makefile.am.patch: Not more needed - 05_path_xtra-2.patch: Regenerated - 06_disable_update_mime_at_install.patch: - 07_disable_update_mime_at_install-2.patch: Don't call update-desktop-database - 11_sleepkey.patch: patch taken to seb128's package to use gdm-signal - 12_sort_entries.patch: Sort entries in each categories when suspending from keyboard key - 21_show_xkb_warning_one_time.patch: should not be needed anymore - 21_show_xkb_warning_one_time.patch: updated - 17_locate_pointer.patch: - 23_infinite_loop_theme_manager.patch: This upstream version has theses patches -- Arnaud Patard Sat, 9 Apr 2005 01:00:12 +0200 control-center (1:2.8.2-3) unstable; urgency=medium * 20_gswitchit_dont_crash_when_no_xkb_config.patch: + Reverse a wrong test condition. + Don't check the "options" key (closes: #296434). -- Josselin Mouette Thu, 17 Mar 2005 22:28:32 +0100 control-center (1:2.8.2-2) unstable; urgency=low * debian/control: - fixes the Build-Depends (Closes: #299753). -- Sebastien Bacher Wed, 16 Mar 2005 23:29:27 +0100 control-center (1:2.8.2-1) unstable; urgency=low * New upstream version: - Fix theme thumbnailing - Fix widget expansion in the keyboard preferences - Handle backspace in multilayout setups correctly - theme-thumbnailer doesn't require an absolute path * debian/patches: - 05_relibtoolised.patch : Removed as no more accurate - 06_gst-fix.patch: Merged - 14_gst-mixer-grab.patch : Merged - 16_disable_text_editor_tab.patch: Merged - 18_logout.patch: Merged - 04_path_xtra.patch: Updated to patch only the configure.in file. The configure update is now in 05_path_xtra.patch-2.patch - 23_infinite_loop_theme_manager.patch: Forgotten patch in the 2.8.2 release * debian/rules: - Pass --as-needed to LDFLAGS to reduce dependencies and removes dependency upon libhowl0. (Closes: 298805) * debian/control.in: - Depends on libgnomeui >= 2.8.1-3 to be sure to remove the dependency on the libhowl0 -- Arnaud Patard Wed, 9 Mar 2005 23:18:44 +0100 control-center (1:2.8.1-4) unstable; urgency=low * debian/patches: - 17_locate_pointer.patch: fix the "locate pointer" when numlock is activated. - 18_logout.patch: fix the logout shortcut (Closes: #289009). - 01_gnome-default-applications-properties-structs.c.patch: Corrected Thunderbird command (Closes: #278762) - Updated 08_pmu_fix.patch with patches from Sjoerd Simons and Sven Luther as a fix for the pmu error message - 19_extra_keybindings.patch: Add bindings for calculator and music multimedia keys (Closes: #291917) - 20_gswitchit_dont_crash_when_no_xkb_config.patch: Patch from kov to prevent crash when used remotely (Closes: #286220) - 21_show_xkb_warning_one_time.patch: Adopt a similar behaviour as for the xmodmap warning (Closes: #287965) - 22_bkg_capplet_follow_symlink.patch: Resolv symlink to generate the thumbnails (Closes: #281657) -- Arnaud Patard Sun, 6 Feb 2005 19:13:04 +0100 control-center (1:2.8.1-3) unstable; urgency=low * debian/rules: - Corrected erroneous line responsible for not including the .desktop files (Closes: #274401) * debian/patches: - Suppressed 'Text Editor' in the "preferred applications" as it's useless with the new mime type system. -- Arnaud Patard Thu, 25 Nov 2004 21:16:04 +0100 control-center (1:2.8.1-2) unstable; urgency=low * debian/rules,debian/capplets.install: - Added manually a .desktop for fontilus taken from Gnome's cvs (Closes: #274401) - Added manually a .desktop for themes:///. Thanks to Dan Korostelev -- Arnaud Patard Wed, 17 Nov 2004 23:44:21 +0100 control-center (1:2.8.1-1) experimental; urgency=low * New upstream release - Some tweaking of the available default applications - Background capplet fixes - keyboard patchs - Patch leak in XKB code - update translations * Update the package with the modifications from the 2.6 package * Added Evolution 2.0 to preferred applications (Closes: 279198) * debian/patches: - Removed 13_drw_monitor.patch - Re-added an updated version of 14_gst-mixer-grab.patch as the bug isn't fixed upstream -- Arnaud Patard Tue, 9 Nov 2004 00:24:23 +0100 control-center (1:2.8.0-1) experimental; urgency=low * GNOME Team Upload with Rtp's permission. * New upstream release : + fix french typo (Closes: #238387) (or even closed in 2.6). + fix german typo (Closes: #267767) * Removed 07_acme_position.patch and 11_default_app.patch now applied upstream. * Removed part of the 12_custom_browser.patch related to the dead file-types capplet (due to mime system changes). * Corrected 'patch unexpectedly ends in middle of line' in 13_drw_monitor.patch. * Removed 14_gst-mixer-grab.patch recoded upstream. * Updated URL in 'debian/copyright'. * Updated watch file. * 'debian/control.in' : using ${misc:Depends} and updated versions. * Added 'autotools-dev' to build dependencies to take advantage of the CDBS automatic 'config.*' management. * Regenerated relibtoolize patch. * As not (yet) DD i'm not listed as GNOME Team member, so adding myself to Uploaders to avoid this upload to be considered a NMU. -- Marc Dequènes (Duck) Wed, 15 Sep 2004 04:20:24 +0200 control-center (1:2.6.1-13) unstable; urgency=low * debian/patches: - Added a sanity check on the type of gconf value before calling strcmp in gconf_property_editor (Closes: #272358) - Check that one is on a powerpc with a pmu before reporting that's there is no /dev/pmu in 08_pmu_fix.patch (Closes: #273336) - Updated 01_gnome-default-applications-properties-structs.c.patch to add FireFox and ThunderBird (Closes: #265882) - Added a check on self->priv in 14_gst-mixer-grab.patch in order to provent a crash if something went wrong during initialiastion (Closes: #269429) - Updated 09_locate_pointer.patch XUngrabKeyboard call thanks to Sjoerd Simons (Closes: #275723) * debian/control{,.in},debian/rules: - Patch from Robert Millan to build on kfreebsd-gnu (Closes: #272722) -- Arnaud Patard Tue, 12 Oct 2004 13:49:27 +0200 control-center (1:2.6.1-12) unstable; urgency=low * debian/patches: - Corrected patch 11_default_app.patch so that it checks the pointer value before calling strlen (Closes: #264288) - Added a patch that close the mixer devices after 4s of inactivity (Closes: #255793) -- Arnaud Patard Fri, 13 Aug 2004 12:47:09 +0200 control-center (1:2.6.1-11) unstable; urgency=low * debian/patches: - Added a patch for fixing the default applications properties capplet (Closes: #245237) - Added a patch from http://bugzilla.gnome.org/show_bug.cgi?id=123487 for handling http,https, unknow urls with the custom browser setting (Closes: #236297) - Backported a patch from control-center 2.7 for preventing the typing break to starts while watching a movie with totem * debian/control.in: - Updated the libgnomeui-dev build-depends to get gnutls11 (Closes: #263609) -- Arnaud Patard Thu, 5 Aug 2004 17:46:37 +0200 control-center (1:2.6.1-10) unstable; urgency=low * debian/patch - Added a patch so that using the 'locate cursor' mouse option doesn't disable all multimedia keybinding (Closes: #257581) - Corrected the patch for the pmu by suppressing the wrong test, as discussed with upstream (Closes: #258105) - Added a patch from http://bugzilla.gnome.org/show_bug.cgi?id=145271 to ensure that all keysims in shortcuts exists in the keymap (Closes: 254745) * debian - Corrected some errors in the man page. -- Arnaud Patard Mon, 12 Jul 2004 23:32:27 +0200 control-center (1:2.6.1-9) unstable; urgency=low * debian/patch: - Corrected the patch so that all modified files are in the diff (Closes: #257352) - Modified 06_gst-fix.patch to ensure the usage of the first soundcard on system with multiple soundcards -- Arnaud Patard Sat, 3 Jul 2004 12:50:18 +0200 control-center (1:2.6.1-8) unstable; urgency=low * debian/capplets-data.install: - Suppressed the line that was reponsible for copying Xresources two times (Closes: #252324). * debian/control.in: - Added libgstreamer-plugins0.8-dev to build-depends - Added some gstreamer sound plugin for the volume keybindings * debian/patch: - Added a patch from Sjoerd Simons to fix the gstreamer volume code (Closes: #251831,#253416) - Added a patch for setting the position of the volume window after showing it (Closes: #254822) - Added a patch for cleaning error messages for /dev/pmu from http://bugzilla.gnome.org/show_bug.cgi?id=132655. It will be merged in 2.7 (Closes: #252460) -- Arnaud Patard Thu, 1 Jul 2004 22:16:30 +0200 control-center (1:2.6.1-7) unstable; urgency=high * debian/control.in: + removed libgstreamer-plugins0.8-dev from Build-Depends. -- Sebastien Bacher Sat, 19 Jun 2004 15:10:37 +0200 control-center (1:2.6.1-6) unstable; urgency=high * Rebuilt without gstreamer to try to get control-center in testing fast to fix nautilus' breakage. -- Sebastien Bacher Fri, 18 Jun 2004 01:26:12 +0200 control-center (1:2.6.1-5) unstable; urgency=low * Rebuilt in a pbuilder, fix the crashe due to linkage with both libxft (Closes: #254076). -- Sebastien Bacher Sat, 12 Jun 2004 23:22:42 +0200 control-center (1:2.6.1-4) unstable; urgency=low * Gnome Team Upload. * Added a link to the gnome-settings-daemon in /usr/bin (Closes: #251953). * debian/control.in: + Depends on xlibs (Closes: #253287). + Recommends gnome2-user-guide (Closes: #251992). -- Sebastien Bacher Thu, 10 Jun 2004 22:28:02 +0200 control-center (1:2.6.1-3) unstable; urgency=low * debian/rules : - As gstreamer 0.8 as reached unstable, reactivate the default option to use it with the keybindings. * debian/control.in : - Added build dependency on libgstreamer-plugins0.8-dev - Removes dependency on libgnome-keyring-dev since no more needed. - Added libXrandr-dev as build dependency (Closes: #251429). * debian/patch : - Added a patch for resolving conflictings ALSA_CFLAGS problems (Closes: #249357). - Added a pathc for using Debian's ac_path_xtra - Modified the patch for relibtoolizing -- Arnaud Patard Sat, 29 May 2004 18:01:45 +0200 control-center (1:2.6.1-2) unstable; urgency=low * GNOME Team Upload. * Upload in unstable. -- Sebastien Bacher Wed, 26 May 2004 17:30:32 +0200 control-center (1:2.6.1-1) experimental; urgency=low * New upstream release. - Fix uniqueness test for binding special keys with no name - Fix theme manager selection when not running metacity - Match nautilus' interpretation of icons in desktop files - Add Evolution 1.5 and 1.6 to "Preferred Applications" (Closes: #243973). * debian/patches: - Removes patch for keyboards - Updates patch for libtool * debian.control: - Added a dependency on gconf2 for capplets-data (Closes: #243894). -- Arnaud Patard Fri, 16 Apr 2004 12:50:54 +0200 control-center (1:2.6.0.3-2) experimental; urgency=low * debian/patch: - Added a patch from gnome cvs for fixing issues with multimedia keybindings (see http://bugs.gnome.org/show_bug.cgi?id=139190). - Added a patch to regenerate libtool files. -- Arnaud Patard Wed, 7 Apr 2004 01:44:10 +0200 control-center (1:2.6.0.3-1) experimental; urgency=low * New upstream release - Fix some keyboard problems (see http://bugzilla.gnome.org/show_bug.cgi?id=138701). * control.in: - Added versionning informations on depend for capplets (needed to ensure having right version of capplets when upgrapding). -- Arnaud Patard Sun, 4 Apr 2004 15:39:57 +0200 control-center (1:2.6.0.2-1) experimental; urgency=low * New Upstream release. + Disabled GStreamer (as it now depends on it by default and the package is not yet upgraded) * control.in: + Updated dependencies to libnautilus2 2.6.0. + Added a conflict on acme, since it's now a part of control-center + Changed the build dependency on libxrender-dev to libxcursor-dev (Closes #240483) -- Arnaud Patard Thu, 1 Apr 2004 00:09:52 +0200 control-center (1:2.5.4-1) experimental; urgency=low * New maintainer (Closes: #238876) * New upstream release - fix implicitly conversion (Closes: #226554). - support icon themes now (Closes: #215851). * debian/control.in, debian/rules: - now, it uses cdbs. - adapted for the gnome team packaging. * Modified patch 01_gnome-default-applications-properties-structs.c.patch to fit with new version. -- Arnaud Patard Thu, 25 Mar 2004 00:07:35 +0100 control-center (1:2.4.0-9) unstable; urgency=low * Debian/control set Maintainer to Debian QA Group -- Christian Marillat Sat, 20 Mar 2004 09:34:15 +0100 control-center (1:2.4.0-8) unstable; urgency=low * You need * Notes by Loic Minier : the above changelog message was meant to be some sort of joke, a message split between many source packages. No actual change besides orphaning was done in this version. You can read the full story at: -- Christian Marillat Fri, 19 Mar 2004 15:08:21 +0100 control-center (1:2.4.0-7) unstable; urgency=low * debian/control capplets package need to depends on capplets-data (Closes: #237311) -- Christian Marillat Thu, 11 Mar 2004 09:07:06 +0100 control-center (1:2.4.0-6) unstable; urgency=low * Split the package. The gnome-control-center binary like nautilus is simply a front-end for capplets, thus move all capplets in a separate package (capplets) and add a dependency to 'gnome-control-center | nautilus | gnome-panel' for that package. Also move data files in capplets-data package. * Remove /usr/lib/libgnome-window-settings.{a,la,so}, gnome-window-settings-2.0.pc and include files. These files are not needed and should not be packaged (Closes: #221283) -- Christian Marillat Sun, 29 Feb 2004 17:40:37 +0100 control-center (1:2.4.0-5) unstable; urgency=low * debian/prerm Unregister schemas file from the database. * Patch from bugzilla to fix "symlink" in fontilus (Closes: #231639) -- Christian Marillat Thu, 12 Feb 2004 14:35:46 +0100 control-center (1:2.4.0-4) unstable; urgency=low * Move Xresources files in /etc/gnome/config and disable all resources. -- Christian Marillat Mon, 27 Oct 2003 15:51:37 +0100 control-center (1:2.4.0-3) unstable; urgency=low * Update gnome-desktop-data version in Replaces field (Closes: #217284) -- Christian Marillat Fri, 24 Oct 2003 18:56:02 +0200 control-center (1:2.4.0-2) unstable; urgency=low * Suggest xbase-clients for xrdb * Rebuild to remove liblinc dependency in the -dev package (Closes: #216722) * Don't package .la files for modules (Closes: #182873) * Run libtoolize, I don't know but something is broken in the original tarball. -- Christian Marillat Tue, 21 Oct 2003 21:56:55 +0200 control-center (1:2.4.0-1) unstable; urgency=low * New upstream release. * Conflicts with drwright and fontilus. * Need to Build-Depends on libnautilus2-dev * Add gok and gnopernicus in suggests -- Christian Marillat Sat, 18 Oct 2003 16:54:45 +0200 control-center (1:2.2.2-3) unstable; urgency=low * debian/control Should suggests xscreensaver (Closes: #212737) -- Christian Marillat Fri, 26 Sep 2003 14:39:18 +0200 control-center (1:2.2.2-2) unstable; urgency=low * debian/rules fix DEB_BUILD_OPTIONS=noopt (Closes: #199189) * Don't need to depends on xbase-clients * Suggests esound-clients (Closes: #205700) * Create /usr/share/themes/metacity-1 directory to remove warning (Closes: #211182) * Add hack to remove libtool rpath * Add libxrender-dev in Builde-Depends -- Christian Marillat Sun, 21 Sep 2003 10:17:00 +0200 control-center (1:2.2.2-1) unstable; urgency=low * New upstream release. * New patches : * 02_network-preferences fix range of proxy port (Closes: #195644) * 01_gnome-default-applications-properties-structs.c: add epiphany in ww-browser list (Closes: #192241) * Add icon for Debian menu * Fix linkage bug (Closes: #187368) * debian/control Remove Suggests: xscreensaver-gnome -- Christian Marillat Mon, 23 Jun 2003 11:18:45 +0200 control-center (1:2.2.1-2) unstable; urgency=low * Update section * Move metacity-properties package in control-center (Closes: #188077) -- Christian Marillat Mon, 7 Apr 2003 22:42:55 +0200 control-center (1:2.2.1-1) unstable; urgency=low * New upstream release. -- Christian Marillat Fri, 14 Mar 2003 15:17:56 +0100 control-center (1:2.2.0.1-1) unstable; urgency=low * New upstream release. * Hack the Icon tag in Advanced.directory (Closes: #179593) -- Christian Marillat Wed, 5 Feb 2003 09:49:20 +0100 control-center (1:2.2.0-2) unstable; urgency=low * Add flex and autotools-dev in Build-Depends (Closes: #178702) * Move the metacity capplet in a new package metacity-properties -- Christian Marillat Thu, 30 Jan 2003 18:40:33 +0100 control-center (1:2.2.0-1) unstable; urgency=low * New upstream release. * Add a default theme. Thanks to Johannes Rohr * Drag and drop for theme work (Closes: #166980) * Themes aren't sorted case-sensitively (Closes: #166981) * Should fix key gnome binding properties and metacity key bindings (Closes: #172380) -- Christian Marillat Thu, 23 Jan 2003 16:32:09 +0100 control-center (1:2.0.3.2-3) unstable; urgency=low * Remove duplicate advanced-directory.png -- Christian Marillat Sat, 18 Jan 2003 11:54:29 +0100 control-center (1:2.0.3.2-2) unstable; urgency=low * Use sensible-browser as default browser. * Add replaces with gnome-desktop-data (Closes: #177141, #176977) -- Christian Marillat Fri, 17 Jan 2003 16:10:52 +0100 control-center (1:2.0.3.2-1) unstable; urgency=low * New upstream release. -- Christian Marillat Fri, 20 Dec 2002 13:27:59 +0100 control-center (1:2.0.3-2) unstable; urgency=low * Should depends on scrollkeeper (Closes: #169850) -- Christian Marillat Sun, 24 Nov 2002 16:11:14 +0100 control-center (1:2.0.3-1) unstable; urgency=low * New upstream release. -- Christian Marillat Sun, 24 Nov 2002 15:27:52 +0100 control-center (1:2.0.2.91-1) unstable; urgency=low * New upstream release. -- Christian Marillat Sun, 17 Nov 2002 00:52:21 +0100 control-center (1:2.0.1.1-5) unstable; urgency=low * Upload to unstable * Call scrollkeeper-update with -q (Closes: #166625) * New upstream release (Closes: #110004) * keyboard setup are correctly restored (Closes: #156856) * Bugs related to the old interface (Closes: #62491, #81299, #131440, #71042) * No more problem when rescaling an image (Closes: #72602) * Sould build correctly under mips (Closes: #163604) * Can center large image (Closes: #68651) -- Christian Marillat Mon, 28 Oct 2002 11:46:53 +0100 control-center (1:2.0.1.1-4) experimental; urgency=low * Upload with the new original tarball -- Christian Marillat Sun, 29 Sep 2002 17:22:15 +0200 control-center2 (1:2.0.1.1-3) experimental; urgency=low * Update package veriosn to 1:2.0.1.1-3 to supersedes the unstable version which is 1:1.4.0.5-6 -- Christian Marillat Sat, 28 Sep 2002 20:07:45 +0200 control-center2 (2.0.1.1-2) experimental; urgency=low * Update to standards version 3.5.7 * Upload withtout the 2 suffix -- Christian Marillat Sat, 28 Sep 2002 18:05:58 +0200 control-center2 (2.0.1.1-1) experimental; urgency=low * New upstream release. * Remove fam from recommends should be in libgnomevfs2-0 package. -- Christian Marillat Thu, 22 Aug 2002 15:44:13 +0200 control-center2 (2.0.1-2) experimental; urgency=low * Build against the latest libgnomevfs2-dev 2.0.2-4 -- Christian Marillat Fri, 16 Aug 2002 17:44:03 +0200 control-center2 (2.0.1-1) experimental; urgency=low * New upstream release. -- Christian Marillat Wed, 7 Aug 2002 12:33:10 +0200 control-center2 (2.0.0-3) experimental; urgency=low * Should recommends fame. -- Christian Marillat Thu, 25 Jul 2002 15:28:22 +0200 control-center2 (2.0.0-2) experimental; urgency=low * Add x-terminal-emulator in the list of terminal. * Build against the latest libzvt -- Christian Marillat Sun, 7 Jul 2002 20:44:23 +0200 control-center2 (2.0.0-1) experimental; urgency=low * New upstream release. * Add support for DEB_HOST_GNU_TYPE DEB_BUILD_GNU_TYPE and DEB_BUILD_OPTIONS -- Christian Marillat Tue, 18 Jun 2002 12:34:40 +0200 control-center2 (1.99.10-2) experimental; urgency=low * debian/rules Add GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 in install target. * Install schemas file in postinst. * debian/postinst check if schemas files are present before calling gconftool-2 * debian/postrm call scrollkeeper-update with -q * Removed old package in suggests * Update the menu file with the rigth binary name -- Christian Marillat Sun, 9 Jun 2002 20:29:30 +0200 control-center2 (1.99.10-1) experimental; urgency=low * New upstream release. -- Christian Marillat Sun, 12 May 2002 14:59:06 +0200 control-center2 (1.99.9-1) experimental; urgency=low * New upstream release. -- Christian Marillat Tue, 30 Apr 2002 10:47:01 +0200 control-center2 (1.99.7-1) experimental; urgency=low * New upstream release. -- Christian Marillat Mon, 22 Apr 2002 18:17:28 +0200 control-center2 (1.99.6-1) experimental; urgency=low * New upstream release. -- Christian Marillat Sun, 14 Apr 2002 17:43:36 +0200 control-center2 (1.99.4-3) experimental; urgency=low * Need to Depends on gnome-desktop-data -- Christian Marillat Wed, 13 Mar 2002 11:17:58 +0100 control-center2 (1.99.4-2) experimental; urgency=low * Need to Depends on gnome-session2 (Closes: #137961) -- Christian Marillat Wed, 13 Mar 2002 11:05:26 +0100 control-center2 (1.99.4-1) experimental; urgency=low * New upstream release. -- Christian Marillat Mon, 11 Mar 2002 14:49:29 +0100 control-center2 (1.99.3-2) experimental; urgency=low * Remove duplicate session.desktop file. -- Christian Marillat Mon, 25 Feb 2002 18:14:07 +0100 control-center2 (1.99.3-1) experimental; urgency=low * New upstream release -- Christian Marillat Fri, 15 Feb 2002 00:35:49 +0100 control-center2 (1.99.0-1) experimental; urgency=low * New upstream release. -- Christian Marillat Sun, 20 Jan 2002 18:08:37 +0100 control-center (1:1.5.11-1) unstable; urgency=low * New upstream release. -- Christian Marillat Mon, 17 Dec 2001 17:49:00 +0100 control-center (1:1.5.8-1) unstable; urgency=low * New upstream release. -- Christian Marillat Sat, 6 Oct 2001 19:12:41 +0200 control-center (1:1.5.4-1) unstable; urgency=low * New upstream release. * debian/*.sgml Use docbook 4.1 -- Christian Marillat Mon, 6 Aug 2001 15:30:44 +0200 control-center (1:1.4.0.1-11) unstable; urgency=low * Update config.sub and config.guess (Closes: #103733, #103903) * Remove libtool hack. -- Christian Marillat Sun, 8 Jul 2001 11:36:30 +0200 control-center (1:1.4.0.1-10) unstable; urgency=low * Switch to debhelper V3 * Change the WPrefs location in WindowMaker.desktop (Closes: #101148) * Change libraries versionning to (>= 1:1.4.0.1-6) instead of the latest package number. -- Christian Marillat Fri, 22 Jun 2001 16:48:15 +0200 control-center (1:1.4.0.1-9) unstable; urgency=low * Rewrote the callbacks.c patch (not complete) (Closes: #98085) -- Christian Marillat Sun, 20 May 2001 09:36:48 +0200 control-center (1:1.4.0.1-8) unstable; urgency=low * Depends on gnome-bin (Closes: #97677) * Depends on xbase-clients -- Christian Marillat Fri, 18 May 2001 00:06:13 +0200 control-center (1:1.4.0.1-7) unstable; urgency=low * Patch callbacks.c to reflect change in the new xscreensaver package (3.32-1) and update the suggests field. Thaks to Roderich Schupp. (Closes: #96542) -- Christian Marillat Sun, 6 May 2001 22:34:12 +0200 control-center (1:1.4.0.1-6) unstable; urgency=low * Build against the latest gnome-libs 1.2.13-5. -- Christian Marillat Tue, 24 Apr 2001 12:39:50 +0200 control-center (1:1.4.0.1-5) unstable; urgency=low * Typo in build depends (Closes: #93267) * Rewrote Flame.desktop -- Christian Marillat Sat, 14 Apr 2001 15:32:28 +0200 control-center (1:1.4.0.1-4) unstable; urgency=low * Really add docbook-to-man in build-depends (Closes: #93190) * Replace libungif3g-dev by libungif4-dev in build-depends (Closes: #93197) -- Christian Marillat Sat, 7 Apr 2001 12:18:03 +0200 control-center (1:1.4.0.1-3) unstable; urgency=low * Remove unused Flame.desktop (Closes: #92850) * Patch po/Makefile.in.in to use DESTDIR * Add scrollkeeper in depends (Closes: #93007) -- Christian Marillat Thu, 5 Apr 2001 18:30:35 +0200 control-center (1:1.4.0.1-2) unstable; urgency=low * Add docbook-to-man in build-depends (Closes: #92421) * Don't compress control-center.sgml (Closes: #92603) * Call scrollkeeper-update in postinst and prerm for gnome-control-center -- Christian Marillat Mon, 2 Apr 2001 21:35:15 +0200 control-center (1:1.4.0.1-1) unstable; urgency=low * New upstream release. * Write 12 manpages (Closes: #87098) -- Christian Marillat Fri, 30 Mar 2001 19:38:51 +0200 control-center (1:1.4.0-1) unstable; urgency=low * New upstream release. * debian/control build-depends on libgnome-vfs-dev and xml-i18n-tools -- Christian Marillat Mon, 19 Mar 2001 11:10:30 +0100 control-center (1:1.2.4-1) unstable; urgency=low * New upstream release. * Add libgdk-pixbuf-dev in build-depends (Closes: #87416) * debian/menu The session properties capplet is now on the gnome-core package, remove this menu entry. -- Christian Marillat Thu, 8 Mar 2001 00:12:29 +0100 control-center (1:1.2.3-1) unstable; urgency=low * New upstream release. * Removed locale and callback patchs included by upstream. * No more lockup while closing desktop (Closes: #76215) -- Christian Marillat Sun, 18 Feb 2001 15:57:25 +0100 control-center (1:1.2.2-10) unstable; urgency=low * Build against the latest gnome-libs 1.2.11 -- Christian Marillat Mon, 5 Feb 2001 14:53:58 +0100 control-center (1:1.2.2-9) unstable; urgency=low * Remove xpm4g-dev from Build-depends (Closes: #82556) -- Christian Marillat Wed, 17 Jan 2001 10:04:01 +0100 control-center (1:1.2.2-8) unstable; urgency=low * Patch to show the right debian version (Closes: #82391) -- Christian Marillat Mon, 15 Jan 2001 15:35:59 +0100 control-center (1:1.2.2-7) unstable; urgency=low * Remove imlib-progs from depends. Move gnome-core from depends to Suggests. -- Christian Marillat Thu, 30 Nov 2000 11:59:04 +0100 control-center (1:1.2.2-6) unstable; urgency=low * Change fonts attribute in callback.dpatch (Closes: #75320) * Install symlinks in /usr/share/doc for -dev package. -- Christian Marillat Thu, 2 Nov 2000 17:48:11 +0100 control-center (1:1.2.2-5) unstable; urgency=low * Patch all capplets to add a call to setlocale(LC_ALL, ""). -- Christian Marillat Fri, 20 Oct 2000 15:55:34 +0200 control-center (1:1.2.2-4) unstable; urgency=low * Add a patch to display russian and other 8 byte character correctly thanks to ChiDeok Hwang * New version close this old bug (Closes: #58797) -- Christian Marillat Wed, 11 Oct 2000 17:54:29 +0200 control-center (1:1.2.2-3) unstable; urgency=low * Fix bad symlink in gnome-control-center (Closes: #74279) -- Christian Marillat Mon, 9 Oct 2000 15:02:57 +0200 control-center (1:1.2.2-2) unstable; urgency=low * Arrange documentation for dhelp. -- Christian Marillat Fri, 6 Oct 2000 17:09:54 +0200 control-center (1:1.2.2-1) unstable; urgency=low * Return to the 1.2 branch, because 1.3 is ... * Switch to debhelper V2. * New/old GUI (Closes: #71043, #71040, #71039, #71038) -- Christian Marillat Mon, 25 Sep 2000 17:33:23 +0200 control-center (1.3.0-5) unstable; urgency=low * Add debhelper in Build-Depends (Closes: #70220) * Build against libungif4g (Closes: #71236) -- Christian Marillat Sun, 10 Sep 2000 00:48:36 +0200 control-center (1.3.0-4) unstable; urgency=low * Patch configure to install session-properties-capplet. -- Christian Marillat Thu, 24 Aug 2000 20:35:38 +0200 control-center (1.3.0-3) unstable; urgency=low * Install screensaver-properties.desktop in the right place (Closes: #69502). * Install Documents.directory and Session.directory files. -- Christian Marillat Mon, 21 Aug 2000 00:59:43 +0200 control-center (1.3.0-2) unstable; urgency=low * debian/control Added imlib-progs in the dependencies field (Closes: #69427). -- Christian Marillat Sat, 19 Aug 2000 22:31:37 +0200 control-center (1.3.0-1) unstable; urgency=low * New upstream release. -- Christian Marillat Mon, 14 Aug 2000 15:32:43 +0200 control-center (1.2.1-1) unstable; urgency=low * New upstrem release. * debian/patches Added 2 patches for IceWM.desktop and WindowMaker.desktop (Closes: #47353, #48099). * New e-mail address. * Removed 2 undocumented manpages (bell-properties-capplet.1, e-conf.1). * Removed property-background patche. * debian/menu removed entry for bell-properties and put all entrys in System/Gnome. -- Christian Marillat Wed, 2 Aug 2000 09:03:59 +0200 control-center (1.2.0-2) unstable; urgency=low * Updated the Build-depends field. (Closes: #64904) -- Christian Marillat Tue, 30 May 2000 10:15:38 +0200 control-center (1.2.0-1) unstable; urgency=low * New upstream source (Closes: #64584) * debian/control removed depends libcapplet0 provided by shlibs:Depends. * Updated Standards-Version to 3.1.1.1 added Build-depends field. -- Christian Marillat Thu, 25 May 2000 19:21:14 +0200 control-center (1.0.53-1) unstable; urgency=low * New upstream source. -- Christian Marillat Fri, 31 Mar 2000 11:32:47 +0200 control-center (1.0.51-5) frozen unstable; urgency=low * debian/copyright updated to the new directory. -- Christian Marillat Wed, 22 Mar 2000 23:17:17 +0100 control-center (1.0.51-4) frozen unstable; urgency=low * Apply a patch I wrote to fix the RCB. Closes: #51568 * New maintainer. Christian Marillat is taking the package over. I'm sponsoring him for the moment ... * Changed the description. Removed the part about beta software. Closes: #54979 * Applied the patch for centering the background picture. Closes: #54285 * Added patch-on-the-fly support to debian/rules. -- Raphael Hertzog Tue, 21 Mar 2000 20:31:20 +0100 control-center (1.0.51-3) frozen unstable; urgency=low * NMU. * Fixes RC bug #56769, WindowMaker wm settings fixed. -- Chris McKillop Thu, 3 Feb 2000 07:13:39 -0500 control-center (1.0.51-2) frozen unstable; urgency=low * Orphaned. -- Michael Alan Dorman Thu, 3 Feb 2000 07:13:29 -0500 control-center (1.0.51-1) unstable; urgency=low * Officially claimed as my own. * libcapplet has been stripped for a while (closes: bug#31245) * We've updated... (closes: bug#44136) * Correct xworm definition for screensaver (closes: bug#51514) * The libc/libglib issues are resolved now (closes: bug#37535) * control-center is much more stable, and should work with window-maker (closes: bug#38706) * gnomecc seems to respect current bg color better (closes: bug#38917) * Couldn't reproduce this error with current versions (closes: bug#38995) * Invoking individual capplets seems to work now (closes: bug#39135) * Screensavers seem to be more stable now (closes: bug#41992) * URL handler assignments seems to work now (closes: bug#44983) * Fudged dependency on esd to get rid of versioned depends (closes: bug#52353) * Totally revamped build process (closes: bug#33848, bug#38344) * Appears to have been fixed (closes: bug#33736, bug#33472)) -- Michael Alan Dorman Mon, 20 Dec 1999 14:19:48 -0500 control-center (1.0.51-0.2) unstable; urgency=low * Fix from Christian Marillat for wm-properties -- Michael Alan Dorman Tue, 19 Oct 1999 14:22:43 -0400 control-center (1.0.51-0.1) unstable; urgency=low * New upstream version. NMU. -- Michael Alan Dorman Sun, 10 Oct 1999 16:48:39 -0400 control-center (1.0.50-0.1) unstable; urgency=low * New upstream version. NMU -- Michael Alan Dorman Thu, 30 Sep 1999 22:24:11 -0400 control-center (1.0.5-2) unstable; urgency=low * Actually changed maintainer address in debian/control * Fixed up WindowMaker and IceWM paths for wm-properties -- Steve Haslam Thu, 27 May 1999 02:05:10 +0100 control-center (1.0.5-1) unstable; urgency=low * New maintainer. * Moved "xscreensaver" to "Suggests:" field. (Bug#32724) * Called dh_strip when making libcapplet-dev -- Steve Haslam Thu, 20 May 1999 03:50:25 +0100 control-center (1.0.5-0.1) unstable; urgency=low * Non-maintainer upload * New upstream version -- Steve Haslam Mon, 19 Apr 1999 10:08:13 +0100 control-center (1.0.1-0.1) unstable; urgency=low * NMU for GNOME-1.0 -- Jules Bean Fri, 5 Mar 1999 10:34:56 +0000 control-center (0.99.3-3) unstable; urgency=low * Patched to remove #define HAVE_REDHAT_SCREENSAVER_RPM. Also, added Recommends: xscreensaver Fixes: BUG#32462 -- Jim Pick Wed, 27 Jan 1999 21:40:24 -0800 control-center (0.99.3-2) unstable; urgency=low * Recompiled due to dependencies. -- Jim Pick Sun, 24 Jan 1999 01:11:12 -0800 control-center (0.99.3-1) unstable; urgency=low * New upstream release. -- Jim Pick Thu, 21 Jan 1999 21:31:48 -0800 gnome-core (0.30-2) frozen unstable; urgency=low * Recompiled with new libs. * Fixed reference to /usr/X11R6 in README.Debian. * Added warnings (Gnome is ALPHA). * Patched dialer_applet to use pon/poff. * Patched drivemount_applet to default to /floppy. -- Jim Pick Tue, 24 Nov 1998 10:56:08 -0800 gnome-core (0.30-1) unstable; urgency=low * New upstream release. -- Jim Pick Thu, 24 Sep 1998 21:28:02 -0700 gnome-core (0.28.1-1) unstable; urgency=low * New upstream release. * Hopefully fixes panel applet bug. -- Jim Pick Wed, 19 Aug 1998 20:12:25 -0700 gnome-core (0.28-1) unstable; urgency=low * New upstream release. -- Jim Pick Mon, 17 Aug 1998 12:59:26 -0700 gnome-core (0.27-1) unstable; urgency=low * New upstream release. * Added /usr/doc/gnome -- Jim Pick Sat, 15 Aug 1998 14:21:06 -0700 gnome-core (0.25-1) unstable; urgency=low * New upstream release. -- Jim Pick Thu, 6 Aug 1998 22:51:22 -0700 gnome-core (0.20-2) unstable; urgency=low * Added Debian menu-method for gnome-panel. Fixed Bug #24025 (Thanks to Ray Dassen for reporting the bug, and Riku Voipio who wrote the menu method for Gnome 0.12) -- Jim Pick Wed, 22 Jul 1998 20:22:00 -0700 gnome-core (0.20-1) unstable; urgency=low * New upstream release. -- Jim Pick Mon, 8 Jun 1998 12:00:08 -0700 gnome-core (0.13-1) unstable; urgency=low * Initial Release. -- Jim Pick Mon, 16 Mar 1998 15:27:43 -0800 debian/rules0000775000000000000000000000247112321533756010263 0ustar #!/usr/bin/make -f include /usr/share/cdbs/1/rules/autoreconf.mk include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/rules/utils.mk include /usr/share/cdbs/1/class/gnome.mk include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk include /usr/share/gnome-pkg-tools/1/rules/gnome-version.mk include /usr/share/gnome-pkg-tools/1/rules/clean-la.mk include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk export DEB_LDFLAGS_MAINT_APPEND = -Wl,-z,defs -Wl,-O1 -Wl,--as-needed include /usr/share/dpkg/buildflags.mk DEB_CONFIGURE_EXTRA_FLAGS += --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) \ --disable-update-mimedb \ --enable-systemd DEB_DH_MAKESHLIBS_ARGS_gnome-control-center = --no-act # Install a wrapper to run unity-control-center under Unity binary-post-install/gnome-control-center:: mv debian/gnome-control-center/usr/bin/gnome-control-center debian/gnome-control-center/usr/bin/gnome-control-center.real cp debian/gnome-control-center.sh debian/gnome-control-center/usr/bin/gnome-control-center binary-post-install/gnome-control-center-data:: rm -rf debian/capplets-data/usr/share/applications/mimeinfo.cache rm -rf debian/capplets-data/usr/share/pkgconfig dh_installmime -p$(cdbs_curpkg) common-binary-post-install-arch:: list-missing debian/gnome-control-center.pkla0000664000000000000000000000031412321533756014107 0ustar [Allow admins to set the hostname without prompting] Identity=unix-group:admin;unix-group:sudo Action=org.freedesktop.hostname1.set-static-hostname;org.freedesktop.hostname1.set-hostname ResultActive=yes debian/gnome-control-center.install0000664000000000000000000000012412321533756014625 0ustar usr/bin usr/lib/*/control-center-1/panels/*.so usr/share/applications usr/share/man debian/gnome-control-center-data.install0000664000000000000000000000067112321533756015543 0ustar etc/xdg/autostart etc/xdg/menus debian/searchingthedashlegalnotice.html /usr/share/gnome-control-center usr/share/gnome-control-center usr/share/sounds usr/share/desktop-directories usr/share/locale usr/share/icons usr/share/polkit-1 #debian/gnome-control-center.pkla /var/lib/polkit-1/localauthority/10-vendor.d/ debian/source_gnome-control-center.py /usr/share/apport/package-hooks debian/UbuntuLogo.png /usr/share/gnome-control-center/ui debian/UbuntuLogo.png0000664000000000000000000001403712321533756012015 0ustar PNG  IHDR}~tEXtSoftwareAdobe ImageReadyqe<fiTXtXML:com.adobe.xmp DuNOIDATx]E.a ЇSQψ"fϬǙ3'z`NL@0 JPi =ggf陞444BQmhUP+J|"I|{[}DǿQ+~C X67XjY:iβ""9,/;Ea2STDdٙeY6fi;Z`y9'XUįڱ[.Wrzw~Q,oP6ڋAYeٱ:,簼.,+Qdo}4Zn2!,R7K>˭,$^g9#ŠV(CcWQ#cY+E K_,XWw܎]:/$C_,=zYƼf%B+ghaE_&U<_F8%~. d&-r_5L,bYJ4Ɛ ĐM+E=XAq`=~ICIH pf[H&~k]X^(VWgW{_(D?< SդTҤ -_ڎ+ 3iB2(%.@ڌ,g m-?ro}'˂cjZedDnDWO-76%MN@Q%j tLzʜ^8׊n:aLd͕^ekNX<+ 2-e==}ON?"ZԀ'IaK ,/ `5^^2 !P*/N 4suC{FA_+ .A#0((4G< WI&++^l" CC'p(+=]:!·5 #Eq]$2C Jͤ8}DYԥoT%~ QLeUwOrσ9:F8IؽeZ^m=\E2ɚ\ [=֥p9y]|UW>"orTR:kBM:#X=&rR q򗅸f-Js{fKMb `0rIwp|2J s8Rg&yAy/N_GC>eSRJ|ᚈyzi$*hx'y(?سW_{SP zvdG{*]r#u "&UBC#q[2>fnZ#u+m a?{s!00f%~!.ԁoS0G'r,W/b+dBksN%~X'bW'{GGr$ݣJu%g`z?_Mн!514j B7lrz1rW>L&X*B9 ﻱIJ5E ɬ/^@_i`jL(}52[|!") I@YtLir"g6%~Z ErL_P+J|BP( %BW( _P+J|BP((Qx:} U'jP( !QuJ{fbUej>9˳lG&CvgY>d2-Ū4 H~+˟ijr^VO¤Csw|YIKYժN@ȯ-lң-0!d{ o{I2BMsF\L>o:@َLBVC^գXE~W+zr cJz74x|Y}VU/e݃$:{˲3p>-NŽe͖HB&pmrSm3櫷+(K1sD>Ky]/啖܉vЬt4xSe͏G8ȸ8!԰՛odo @QeAWwOیFi_WW$kno}Z@g\s蠟εU{51߻lZֈKveW>"lv\gc%|^۳=RH](d|"P5luJzYu\t|ζ&::zu~[ z'X=Ԡo,Hr .Đ yc2G Eo",<ע#3oɈBz^9o{u(?,[X6œq;pĉY#>"a!/ߑG;14ShPF>">Ob%g/?DFxFu<rpBqPAJC0ϕQhͰ}̑ضV@涺kn)+ E oIENDB`debian/source/0000775000000000000000000000000012321533756010477 5ustar debian/source/format0000664000000000000000000000001412321533756011705 0ustar 3.0 (quilt) debian/source/include-binaries0000664000000000000000000000002612321533756013635 0ustar debian/UbuntuLogo.png debian/libgnome-control-center1.install0000664000000000000000000000004712321533756015401 0ustar usr/lib/*/libgnome-control-center.so.* debian/gnome-control-center-dev.install0000664000000000000000000000002412321533756015400 0ustar usr/share/pkgconfig debian/gnome-control-center.sh0000775000000000000000000000041612321533756013600 0ustar #!/bin/sh # Support legacy applications that still refer to gnome-control-center in Unity if [ "$XDG_CURRENT_DESKTOP" = "Unity" ] && [ -x /usr/bin/unity-control-center ]; then exec /usr/bin/unity-control-center $@ else exec /usr/bin/gnome-control-center.real $@ fi debian/control.in0000664000000000000000000001353012321533756011211 0ustar Source: gnome-control-center Section: gnome Priority: optional Maintainer: Ubuntu Desktop Team XSBC-Original-Maintainer: Debian GNOME Maintainers Uploaders: @GNOME_TEAM@ Standards-Version: 3.9.3 Build-Depends: autotools-dev, cdbs (>= 0.4.41), debhelper (>= 9), desktop-file-utils, dh-autoreconf, gtk-doc-tools, gnome-common, gnome-pkg-tools (>= 0.10), gnome-settings-daemon-dev (>= 3.8.4), gsettings-desktop-schemas-dev (>= 3.7.2.2), hardening-wrapper, intltool (>= 0.37.1), libcanberra-gtk3-dev, libcheese-gtk-dev (>= 2.91.91.1), libcolord-dev, libcups2-dev, libdbus-1-dev (>= 0.32), libdbus-glib-1-dev (>= 0.32), libgdk-pixbuf2.0-dev (>= 2.23.0), libglib2.0-dev (>= 2.31.2), libgnome-bluetooth-dev (>= 3.3.4), libgnome-desktop-3-dev (>= 3.5.91), libgnome-menu-3-dev, libgnomekbd-dev, libgoa-1.0-dev (>= 3.5.90), libgstreamer-plugins-base0.10-dev, libgtk-3-dev (>= 3.5.13), libgtop2-dev, libibus-1.0-dev (>= 1.5.0), libnm-glib-dev (>= 0.9) [linux-any], libnm-gtk-dev (>= 0.9) [linux-any], libnm-util-dev (>= 0.9) [linux-any], libnotify-dev (>= 0.7.3), libpolkit-gobject-1-dev (>= 0.103), libpulse-dev (>= 1:2.0), libpwquality-dev, # libsocialweb-client-dev, libupower-glib-dev (>= 0.9.1), libsystemd-login-dev, libwacom-dev (>= 0.6), libx11-dev, libxft-dev (>= 2.1.2), libxkbfile-dev, libxklavier-dev (>= 5.1), libxml2-dev, locales, network-manager-dev (>= 0.9) [linux-any], shared-mime-info, libwebkitgtk-3.0-dev, libgl1-mesa-dev, Vcs-Bzr: http://code.launchpad.net/~ubuntu-desktop/gnome-control-center/ubuntu Package: gnome-control-center Architecture: any Section: gnome Depends: ${misc:Depends}, ${shlibs:Depends}, accountsservice, apg, desktop-file-utils, gkbd-capplet (>= 3.5.90), gnome-control-center-data (<< ${gnome:NextVersion}), gnome-control-center-data (>= ${source:Version}), gnome-desktop3-data, gnome-icon-theme (>= 2.24), gnome-icon-theme-symbolic, gnome-menus (>= 2.12.0), gnome-settings-daemon (>= 3.8.4), gsettings-desktop-schemas (>= 3.5.91), Recommends: cups-pk-helper, gnome-session-bin, ubuntu-system-service, ibus (>= 1.5.0), iso-codes, mousetweaks, policykit-1-gnome, libcanberra-pulse, system-config-printer-gnome, gnome-control-center-shared-data Replaces: gnome-bluetooth (<< 3.4.0) Breaks: gnome-power-manager (<< 3.0), gnome-session (<< 3.0), libglib2.0-0 (<< 2.28.6-2), gnome-bluetooth (<< 3.4.0), compiz (<< 1:0.9.8+bzr330), metacity (<< 1:2.34.2), unity (<< 6.2-0ubuntu2~), Suggests: gnome-screensaver | xscreensaver, gnome-user-guide | ubuntu-docs, gstreamer0.10-pulseaudio, libcanberra-gtk-module, x11-xserver-utils Description: utilities to configure the GNOME desktop This package contains configuration applets for the GNOME desktop, allowing to set accessibility configuration, desktop fonts, keyboard and mouse properties, sound setup, desktop theme and background, user interface properties, screen resolution, and other GNOME parameters. . It also contains a front end to these applets, which can also be accessed with the GNOME panel or the Nautilus file manager. Package: gnome-control-center-dev Architecture: all Section: devel Depends: ${misc:Depends} Description: utilities to configure the GNOME desktop This package contains the file required to get the keydirs location Package: gnome-control-center-data Architecture: all Section: gnome Depends: ${misc:Depends} Recommends: gnome-control-center (>= ${source:Version}) Provides: capplets-data Conflicts: capplets-data Replaces: capplets-data, gdm (<< 3.0), gdm3 (<< 3.0), gnome-media-common (<< 2.91), gnome-power-manager (<< 3.2), gnome-settings-daemon (<< 3.0) Breaks: gdm (<< 3.0), gdm3 (<< 3.0), gnome-power-manager (<< 3.2), gnome-settings-daemon (<< 3.0) Description: configuration applets for GNOME - data files This package contains data files (icons, pixmaps, locales files) needed by the configuration applets in the gnome-control-center package. Package: gnome-control-center-shared-data Architecture: all Section: gnome Depends: ${misc:Depends} Replaces: gnome-control-center-data (<< 1:3.6.3-0ubuntu54) Conflicts: gnome-control-center-data (<< 1:3.6.3-0ubuntu54) Description: configuration applets for GNOME - shared data This package contains datas that are used by gnome-control-center and the new unity-control-center Package: libgnome-control-center-dev Architecture: any Section: libdevel Depends: ${misc:Depends}, libgnome-control-center1 (= ${binary:Version}) Description: utilities to configure the GNOME desktop This package contains the files needed to build Control Center panels Package: libgnome-control-center1 Architecture: any Section: libs Depends: ${misc:Depends}, ${shlibs:Depends} Description: utilities to configure the GNOME desktop This package contains the library used by Control Center panels debian/control0000664000000000000000000001407512321533762010606 0ustar # This file is autogenerated. DO NOT EDIT! # # Modifications should be made to debian/control.in instead. # This file is regenerated automatically in the clean target. Source: gnome-control-center Section: gnome Priority: optional Maintainer: Ubuntu Desktop Team XSBC-Original-Maintainer: Debian GNOME Maintainers Uploaders: Debian GNOME Maintainers Standards-Version: 3.9.3 Build-Depends: autotools-dev, cdbs (>= 0.4.41), debhelper (>= 9), desktop-file-utils, dh-autoreconf, gtk-doc-tools, gnome-common, gnome-pkg-tools (>= 0.10), gnome-settings-daemon-dev (>= 3.8.4), gsettings-desktop-schemas-dev (>= 3.7.2.2), hardening-wrapper, intltool (>= 0.37.1), libcanberra-gtk3-dev, libcheese-gtk-dev (>= 2.91.91.1), libcolord-dev, libcups2-dev, libdbus-1-dev (>= 0.32), libdbus-glib-1-dev (>= 0.32), libgdk-pixbuf2.0-dev (>= 2.23.0), libglib2.0-dev (>= 2.31.2), libgnome-bluetooth-dev (>= 3.3.4), libgnome-desktop-3-dev (>= 3.5.91), libgnome-menu-3-dev, libgnomekbd-dev, libgoa-1.0-dev (>= 3.5.90), libgstreamer-plugins-base0.10-dev, libgtk-3-dev (>= 3.5.13), libgtop2-dev, libibus-1.0-dev (>= 1.5.0), libnm-glib-dev (>= 0.9) [linux-any], libnm-gtk-dev (>= 0.9) [linux-any], libnm-util-dev (>= 0.9) [linux-any], libnotify-dev (>= 0.7.3), libpolkit-gobject-1-dev (>= 0.103), libpulse-dev (>= 1:2.0), libpwquality-dev, # libsocialweb-client-dev, libupower-glib-dev (>= 0.9.1), libsystemd-login-dev, libwacom-dev (>= 0.6), libx11-dev, libxft-dev (>= 2.1.2), libxkbfile-dev, libxklavier-dev (>= 5.1), libxml2-dev, locales, network-manager-dev (>= 0.9) [linux-any], shared-mime-info, libwebkitgtk-3.0-dev, libgl1-mesa-dev, Vcs-Bzr: http://code.launchpad.net/~ubuntu-desktop/gnome-control-center/ubuntu Package: gnome-control-center Architecture: any Section: gnome Depends: ${misc:Depends}, ${shlibs:Depends}, accountsservice, apg, desktop-file-utils, gkbd-capplet (>= 3.5.90), gnome-control-center-data (<< ${gnome:NextVersion}), gnome-control-center-data (>= ${source:Version}), gnome-desktop3-data, gnome-icon-theme (>= 2.24), gnome-icon-theme-symbolic, gnome-menus (>= 2.12.0), gnome-settings-daemon (>= 3.8.4), gsettings-desktop-schemas (>= 3.5.91), Recommends: cups-pk-helper, gnome-session-bin, ubuntu-system-service, ibus (>= 1.5.0), iso-codes, mousetweaks, policykit-1-gnome, libcanberra-pulse, system-config-printer-gnome, gnome-control-center-shared-data Replaces: gnome-bluetooth (<< 3.4.0) Breaks: gnome-power-manager (<< 3.0), gnome-session (<< 3.0), libglib2.0-0 (<< 2.28.6-2), gnome-bluetooth (<< 3.4.0), compiz (<< 1:0.9.8+bzr330), metacity (<< 1:2.34.2), unity (<< 6.2-0ubuntu2~), Suggests: gnome-screensaver | xscreensaver, gnome-user-guide | ubuntu-docs, gstreamer0.10-pulseaudio, libcanberra-gtk-module, x11-xserver-utils Description: utilities to configure the GNOME desktop This package contains configuration applets for the GNOME desktop, allowing to set accessibility configuration, desktop fonts, keyboard and mouse properties, sound setup, desktop theme and background, user interface properties, screen resolution, and other GNOME parameters. . It also contains a front end to these applets, which can also be accessed with the GNOME panel or the Nautilus file manager. Package: gnome-control-center-dev Architecture: all Section: devel Depends: ${misc:Depends} Description: utilities to configure the GNOME desktop This package contains the file required to get the keydirs location Package: gnome-control-center-data Architecture: all Section: gnome Depends: ${misc:Depends} Recommends: gnome-control-center (>= ${source:Version}) Provides: capplets-data Conflicts: capplets-data Replaces: capplets-data, gdm (<< 3.0), gdm3 (<< 3.0), gnome-media-common (<< 2.91), gnome-power-manager (<< 3.2), gnome-settings-daemon (<< 3.0) Breaks: gdm (<< 3.0), gdm3 (<< 3.0), gnome-power-manager (<< 3.2), gnome-settings-daemon (<< 3.0) Description: configuration applets for GNOME - data files This package contains data files (icons, pixmaps, locales files) needed by the configuration applets in the gnome-control-center package. Package: gnome-control-center-shared-data Architecture: all Section: gnome Depends: ${misc:Depends} Replaces: gnome-control-center-data (<< 1:3.6.3-0ubuntu54) Conflicts: gnome-control-center-data (<< 1:3.6.3-0ubuntu54) Description: configuration applets for GNOME - shared data This package contains datas that are used by gnome-control-center and the new unity-control-center Package: libgnome-control-center-dev Architecture: any Section: libdevel Depends: ${misc:Depends}, libgnome-control-center1 (= ${binary:Version}) Description: utilities to configure the GNOME desktop This package contains the files needed to build Control Center panels Package: libgnome-control-center1 Architecture: any Section: libs Depends: ${misc:Depends}, ${shlibs:Depends} Description: utilities to configure the GNOME desktop This package contains the library used by Control Center panels debian/libgnome-control-center-dev.install0000664000000000000000000000017512321533756016076 0ustar debian/tmp/usr/lib/*/pkgconfig debian/tmp/usr/include/gnome-control-center-1 debian/tmp/usr/lib/*/libgnome-control-center.so debian/compat0000664000000000000000000000000212321533756010375 0ustar 9 debian/gnome-control-center.menu0000664000000000000000000000035212321533756014126 0ustar ?package(gnome-control-center):needs="X11" section="Applications/System/Administration" \ hints="Gnome" title="Gnome Control Center" \ icon="/usr/share/pixmaps/gnome-control-center.xpm" \ command="/usr/bin/gnome-control-center" debian/watch0000664000000000000000000000016312321533756010230 0ustar version=3 http://download.gnome.org/sources/gnome-control-center/([\d\.]+)/gnome-control-center-([\d\.]+)\.tar\.xz debian/searchingthedashlegalnotice.html0000664000000000000000000001400412321533756015577 0ustar searching the dash legal notice

         Searching in the dash - Legal notice

This search function is provided to you by Canonical Group Limited (Canonical). This legal notice applies to searching in the dash and incorporates the terms of Canonical's legal notice (and privacy policy).

Collection and use of data

When you enter a search term into the dash Ubuntu will search your Ubuntu computer and will record the search terms locally.

Unless you have opted out (see the “Online Search” section below), we will also send your keystrokes as a search term to productsearch.ubuntu.com and selected third parties so that we may complement your search results with online search results from such third parties including: Facebook, Twitter, BBC and Amazon. Canonical and these selected third parties will collect your search terms and use them to provide you with search results while using Ubuntu.

By searching in the dash you consent to:

  1. the collection and use of your search terms and IP address in this way; and
  2. the storage of your search terms and IP address by Canonical and such selected third parties (if applicable).

Canonical will only use your search terms and IP address in accordance with this legal notice and our privacy policy. Please see our privacy policy for further information about how Canonical protects your personal information. For information on how our selected third parties may use your information, please see their privacy policies.

Online Search

You may restrict your dash so that we don’t send searches to third parties and you don't receive online search results. To do this go to the Privacy panel and toggle the ‘Include online search results’ option to off. The Privacy panel can be found in your System Settings or via a dash search. For a current list of our selected third parties, please see www.ubuntu.com/privacypolicy/thirdparties.

Changes

Although most changes are likely to be minor, Canonical may change this legal notice from time to time, and at Canonical's sole discretion. Please check this page from time to time for any changes to this legal notice as we will not be able to notify you directly.

How to contact us

Please submit any questions or comments about searching in the dash or this legal notice by contacting us at the following address: Canonical Group Ltd, 5th Floor, Blue Fin Building, 110 Southwark Street, London, England, SE1 0SU.

debian/patches/0000775000000000000000000000000012321533756010626 5ustar debian/patches/51_unity_options_in_display_panel.patch0000664000000000000000000006072212321533756020500 0ustar Index: gnome-control-center-3.4.2/panels/display/cc-display-panel.c =================================================================== --- gnome-control-center-3.4.2.orig/panels/display/cc-display-panel.c 2012-05-15 12:18:30.000000000 +0200 +++ gnome-control-center-3.4.2/panels/display/cc-display-panel.c 2012-07-23 10:26:57.281976435 +0200 @@ -54,6 +54,13 @@ #define MINIMUM_WIDTH 675 #define MINIMUM_HEIGHT 530 +#define UNITY_GSETTINGS_SCHEMA "org.compiz.unityshell" +#define UNITY_GSETTINGS_PATH "/org/compiz/profiles/unity/plugins/unityshell/" +#define UNITY_LAUNCHER_ALL_MONITORS_KEY "num-launchers" +#define UNITY_STICKY_EDGE_KEY "launcher-capture-mouse" +#define UNITY2D_GSETTINGS_MAIN "com.canonical.Unity2d" +#define UNITY2D_GSETTINGS_LAUNCHER "com.canonical.Unity2d.Launcher" + enum { TEXT_COL, WIDTH_COL, @@ -72,6 +79,9 @@ GnomeRROutputInfo *current_output; GSettings *clock_settings; + GSettings *unity_settings; + GSettings *unity2d_settings_main; + GSettings *unity2d_settings_launcher; GtkBuilder *builder; guint focus_id; @@ -119,6 +129,8 @@ guint n_properties, GObjectConstructParam *properties); static void on_screen_changed (GnomeRRScreen *scr, gpointer data); +static void refresh_unity_launcher_placement (CcDisplayPanel *self); +static gboolean unity_launcher_on_all_monitors (GSettings *settings); static void cc_display_panel_get_property (GObject *object, @@ -168,6 +180,13 @@ if (self->priv->clock_settings != NULL) g_object_unref (self->priv->clock_settings); + if (self->priv->unity2d_settings_main != NULL) + g_object_unref (self->priv->unity2d_settings_main); + if (self->priv->unity2d_settings_launcher != NULL) + g_object_unref (self->priv->unity2d_settings_launcher); + if (self->priv->unity_settings != NULL) + g_object_unref (self->priv->unity_settings); + shell = cc_panel_get_shell (CC_PANEL (self)); if (shell != NULL) { @@ -223,6 +242,12 @@ } static gboolean +is_unity_session (void) +{ + return (g_strcmp0 (g_getenv("XDG_CURRENT_DESKTOP"), "Unity") == 0); +} + +static gboolean should_show_resolution (gint output_width, gint output_height, gint width, @@ -262,6 +287,9 @@ gnome_rr_labeler_show (self->priv->labeler); select_current_output_from_dialog_position (self); + + if (is_unity_session ()) + refresh_unity_launcher_placement (self); } static void @@ -599,6 +627,10 @@ gtk_widget_set_sensitive (self->priv->clone_checkbox, mirror_is_supported); gtk_widget_set_sensitive (self->priv->clone_label, mirror_is_supported); + /* set inactive the launcher placement choice */ + gtk_widget_set_sensitive (WID ("launcher_placement_combo"), !mirror_is_active); + gtk_widget_set_sensitive (WID ("stickyedge_switch"), !mirror_is_active); + g_signal_handlers_unblock_by_func (self->priv->clone_checkbox, G_CALLBACK (on_clone_changed), self); } @@ -838,6 +870,7 @@ rebuild_on_off_radios (self); rebuild_resolution_combo (self); rebuild_rotation_combo (self); + refresh_unity_launcher_placement (self); self->priv->ignore_gui_changes = FALSE; } @@ -1722,6 +1755,10 @@ outputs = gnome_rr_config_get_outputs (self->priv->current_configuration); for (i = 0; outputs[i] != NULL; ++i) gnome_rr_output_info_set_primary (outputs[i], outputs[i] == output); + + gtk_widget_queue_draw (WID ("self->priv->area")); + /* refresh the combobox */ + refresh_unity_launcher_placement (self); } static void @@ -2073,7 +2110,30 @@ g_object_unref (layout); cairo_restore (cr); - if (gnome_rr_output_info_get_primary (output)) + /* Only display a launcher on all or primary monitor */ + if (is_unity_session ()) + { + if (gnome_rr_output_info_is_active (output) && (unity_launcher_on_all_monitors (self->priv->unity_settings) || gnome_rr_output_info_get_primary (output))) + { + cairo_rectangle (cr, x, y, 10, h * scale + 0.5); + cairo_set_source_rgb (cr, 0, 0, 0); + foo_scroll_area_add_input_from_fill (FOO_SCROLL_AREA (self->priv->area), + cr, + (FooScrollAreaEventFunc) on_top_bar_event, + self); + cairo_fill (cr); + + cairo_set_source_rgb (cr, 0.25, 0.25, 0.25); + cairo_rectangle (cr, x + 1, y + 6, 8, 8); + cairo_rectangle (cr, x + 1, y + 16, 8, 8); + cairo_rectangle (cr, x + 1, y + 26, 8, 8); + cairo_rectangle (cr, x + 1, y + 36, 8, 8); + cairo_rectangle (cr, x + 1, y + h * scale + 0.5 - 10, 8, 8); + cairo_fill (cr); + } + } + + if (gnome_rr_output_info_get_primary (output) && !is_unity_session ()) { const char *clock_format; char *text; @@ -2556,6 +2616,233 @@ } static void +stickyedge_widget_refresh (GtkSwitch *switcher, GSettings *settings) +{ + gboolean stickyedge_enabled = g_settings_get_boolean (settings, UNITY_STICKY_EDGE_KEY); + + gtk_switch_set_active (switcher, stickyedge_enabled); +} + +static void +ext_stickyedge_changed_callback (GSettings* settings, + guint key, + gpointer user_data) +{ + stickyedge_widget_refresh (GTK_SWITCH (user_data), settings); +} + +static void +on_stickyedge_changed (GtkSwitch *switcher, GParamSpec *pspec, gpointer user_data) +{ + CcDisplayPanel *self = CC_DISPLAY_PANEL (user_data); + gboolean enabled = gtk_switch_get_active (GTK_SWITCH (switcher)); + + /* 3d */ + g_settings_set_boolean (self->priv->unity_settings, UNITY_STICKY_EDGE_KEY, enabled); + /* 2d */ + if (self->priv->unity2d_settings_main) + g_settings_set_boolean (self->priv->unity2d_settings_main, "sticky-edges", enabled); +} + +static gboolean +unity_launcher_on_all_monitors (GSettings *settings) +{ + gint value = g_settings_get_int (settings, UNITY_LAUNCHER_ALL_MONITORS_KEY); + return (value == 0); +} + +static GdkPixbuf* +get_monitor_pixbuf (CcDisplayPanel *self, GnomeRROutputInfo *output) +{ + GdkRGBA color; + cairo_surface_t *cairo_surface; + cairo_t *cr; + int monitor_width = 30; + int monitor_height = 15; + + gnome_rr_labeler_get_rgba_for_output (self->priv->labeler, output, &color); + + cairo_surface = cairo_image_surface_create (CAIRO_FORMAT_RGB24, monitor_width, monitor_height); + cr = cairo_create (cairo_surface); + cairo_surface_destroy (cairo_surface); + cairo_set_operator (cr, CAIRO_OPERATOR_CLEAR); + cairo_paint (cr); + + cairo_set_operator (cr, CAIRO_OPERATOR_OVER); + cairo_set_source_rgb (cr, color.red, color.green, color.blue); + cairo_rectangle (cr, 0.5, 0.5, monitor_width - 1, monitor_height - 1); + cairo_fill (cr); + + cairo_set_line_width (cr, 1); + cairo_set_source_rgba (cr, 0, 0, 0, 1.0); + cairo_rectangle (cr, 0.5, 0.5, monitor_width - 1, monitor_height - 1); + cairo_stroke (cr); + + return gdk_pixbuf_get_from_surface (cairo_get_target (cr), 0, 0, monitor_width, monitor_height); +} + +static void +refresh_unity_launcher_placement (CcDisplayPanel *self) +{ + GtkWidget *launcher_placement_combo = WID ("launcher_placement_combo"); + GtkListStore *liststore; + GtkTreeIter iter; + GList *connected_outputs = NULL; + GList *list; + gboolean launcher_on_all_monitors = unity_launcher_on_all_monitors (self->priv->unity_settings); + gint index_of_primary_screen = 0; + gint i; + + liststore = (GtkListStore *) gtk_builder_get_object (self->priv->builder, "available_launcher_placement_store"); + gtk_list_store_clear (liststore); + + connected_outputs = list_connected_outputs (self, NULL, NULL); + for (list = connected_outputs, i = 0; list != NULL; list = list->next) + { + char *monitor_name; + GdkPixbuf *monitor_pixbuf; + GnomeRROutputInfo *output = list->data; + + if (!gnome_rr_output_info_is_active (output)) + continue; + + gtk_list_store_append (liststore, &iter); + monitor_name = g_strdup (gnome_rr_output_info_get_display_name (output)); + monitor_pixbuf = get_monitor_pixbuf (self, output); + + gtk_list_store_set (liststore, &iter, 0, monitor_pixbuf, 1, monitor_name, -1); + + /* select it if primary and only one launcher */ + if (gnome_rr_output_info_get_primary (output) && (!launcher_on_all_monitors)) + index_of_primary_screen = i; + i++; + + g_object_unref (monitor_pixbuf); + g_free (monitor_name); + } + + // FIXME: check autosort? + gtk_list_store_append (liststore, &iter); + gtk_list_store_set (liststore, &iter, 0, NULL, 1, _("All displays"), -1); + + if (launcher_on_all_monitors) + index_of_primary_screen = i; + + gtk_combo_box_set_active (GTK_COMBO_BOX (launcher_placement_combo), index_of_primary_screen); +} + +static gboolean +switcher_set_to_launcher_on_all_monitors (CcDisplayPanel *self) +{ + GtkComboBox *combo = GTK_COMBO_BOX (WID ("launcher_placement_combo")); + gint active = gtk_combo_box_get_active (combo); + gint number_items = gtk_tree_model_iter_n_children (gtk_combo_box_get_model (combo), + NULL); + return (active == number_items - 1); +} + +static void +ext_launcher_placement_changed_callback (GSettings* settings, + guint key, + gpointer user_data) +{ + // add some crazyness as 2d/3d are not using the same keys + CcDisplayPanel *self = CC_DISPLAY_PANEL (user_data); + gint launcher_unity_value = 0; + + // two options support: all monitors (0)i or just primary desktop (hence set to 1, not any other number) + if (! switcher_set_to_launcher_on_all_monitors (self)) + launcher_unity_value = 1; + + if (g_settings_get_int (settings, UNITY_LAUNCHER_ALL_MONITORS_KEY) != launcher_unity_value) + refresh_unity_launcher_placement (self); +} + +static void +on_launcher_placement_combo_changed (GtkComboBox *combo, CcDisplayPanel *self) +{ + gint active = gtk_combo_box_get_active (combo); + gint i; + gint index_on_combo = 0; + + if (active < 0) + return; + gint value = 0; + gboolean on_all_monitors = switcher_set_to_launcher_on_all_monitors (self); + + if (!on_all_monitors) { + value = 1; + // set the primary output if needed + GnomeRROutputInfo **outputs = gnome_rr_config_get_outputs (self->priv->current_configuration); + + for (i = 0; outputs[i] != NULL; ++i) + { + GnomeRROutputInfo *output = outputs[i]; + if (!gnome_rr_output_info_is_active (output)) + continue; + + if ((active == index_on_combo) && !gnome_rr_output_info_get_primary (output)) + { + set_primary_output (self, output); + break; + } + index_on_combo++; + } + } + + /* 3d */ + if (self->priv->unity_settings) + g_settings_set_int (self->priv->unity_settings, UNITY_LAUNCHER_ALL_MONITORS_KEY, value); + /* 2d */ + if (self->priv->unity2d_settings_launcher) + g_settings_set_boolean (self->priv->unity2d_settings_launcher, "only-one-launcher", !on_all_monitors); +} + +static void +setup_unity_settings (CcDisplayPanel *self) +{ + const gchar * const *schemas; + + /* Only use the unity-2d schema if it's installed */ + schemas = g_settings_list_schemas (); + while (*schemas != NULL) + { + if (g_strcmp0 (*schemas, UNITY2D_GSETTINGS_LAUNCHER) == 0) + { + self->priv->unity2d_settings_main = g_settings_new (UNITY2D_GSETTINGS_MAIN); + self->priv->unity2d_settings_launcher = g_settings_new (UNITY2D_GSETTINGS_LAUNCHER); + break; + } + schemas++; + } + schemas = g_settings_list_relocatable_schemas (); + while (*schemas != NULL) + { + if (g_strcmp0 (*schemas, UNITY_GSETTINGS_SCHEMA) == 0) + { + self->priv->unity_settings = g_settings_new_with_path (UNITY_GSETTINGS_SCHEMA, UNITY_GSETTINGS_PATH); + break; + } + schemas++; + } + + if (!self->priv->unity_settings) + return; + + GtkWidget *sticky_edge_switch = WID ("stickyedge_switch"); + g_signal_connect (sticky_edge_switch, "notify::active", + G_CALLBACK (on_stickyedge_changed), self); + g_signal_connect (self->priv->unity_settings, "changed::" UNITY_STICKY_EDGE_KEY, + G_CALLBACK (ext_stickyedge_changed_callback), sticky_edge_switch); + stickyedge_widget_refresh (GTK_SWITCH (sticky_edge_switch), self->priv->unity_settings); + + g_signal_connect (G_OBJECT (WID ("launcher_placement_combo")), "changed", + G_CALLBACK (on_launcher_placement_combo_changed), self); + g_signal_connect (self->priv->unity_settings, "changed::" UNITY_LAUNCHER_ALL_MONITORS_KEY, + G_CALLBACK (ext_launcher_placement_changed_callback), self); +} + +static void cc_display_panel_init (CcDisplayPanel *self) { } @@ -2572,7 +2859,7 @@ CcDisplayPanel *self; CcShell *shell; GtkWidget *toplevel; - gchar *objects[] = {"display-panel", NULL}; + gchar *objects[] = {"display-panel", "available_launcher_placement_store", NULL}; obj = G_OBJECT_CLASS (cc_display_panel_parent_class)->constructor (gtype, n_properties, properties); self = CC_DISPLAY_PANEL (obj); @@ -2661,6 +2948,18 @@ g_signal_connect_swapped (WID ("apply_button"), "clicked", G_CALLBACK (apply), self); + /* Unity settings */ + if (is_unity_session ()) + setup_unity_settings (self); + else + { + gtk_widget_hide (WID ("unity_launcher_placement_sep")); + gtk_widget_hide (WID ("launcher_placement_label")); + gtk_widget_hide (WID ("sticky_edge_label")); + gtk_widget_hide (WID ("launcher_placement_combo")); + gtk_widget_hide (WID ("stickyedge_switch")); + } + gtk_widget_show (self->priv->panel); gtk_container_add (GTK_CONTAINER (self), self->priv->panel); @@ -2675,4 +2974,3 @@ CC_TYPE_DISPLAY_PANEL, "display", 0); } - Index: gnome-control-center-3.4.2/panels/display/display-capplet.ui =================================================================== --- gnome-control-center-3.4.2.orig/panels/display/display-capplet.ui 2012-03-05 15:04:55.000000000 +0100 +++ gnome-control-center-3.4.2/panels/display/display-capplet.ui 2012-07-23 10:26:45.805976846 +0200 @@ -1,6 +1,14 @@ + + + + + + + + @@ -96,56 +104,89 @@ True - 3 + 5 2 12 6 - + + True + 1 + _Resolution + True + resolution_combo + + + + GTK_FILL + + + + + + True + 1 + R_otation + rotation_combo + True + + + + 1 + 2 + GTK_FILL + + + + + True - - - - 1 - 2 2 3 - + 0 + 2 + GTK_FILL - + True 1 - _Resolution + L_auncher placement + launcher_placement_combo True - resolution_combo + 3 + 4 GTK_FILL - + True 1 - R_otation - rotation_combo + S_ticky edges + stickyedge_switch True - 1 - 2 + 4 + 5 GTK_FILL @@ -179,6 +220,63 @@ + + True + False + available_launcher_placement_store + 1 + + + + 0 + + + + + + 1 + + + + + 1 + 2 + 3 + 4 + + + + + + True + 12 + + + True + True + False + True + + + False + False + end + 1 + + + + + 1 + 2 + 4 + 5 + + False + False + 0 + + + debian/patches/unity_background_is_appareance.patch0000664000000000000000000000117612321533756020075 0ustar Index: gnome-control-center-3.6.3/shell/gnome-control-center.c =================================================================== --- gnome-control-center-3.6.3.orig/shell/gnome-control-center.c 2014-02-26 19:04:06.407683047 +0100 +++ gnome-control-center-3.6.3/shell/gnome-control-center.c 2014-02-26 19:04:09.000000000 +0100 @@ -1000,6 +1000,10 @@ g_clear_pointer (&priv->current_panel_id, g_free); + if (!g_strcmp0 (g_getenv ("XDG_CURRENT_DESKTOP"), "Unity") && + !g_strcmp0(start_id, "background")) + start_id = "unity-appearance"; + /* clear any custom widgets */ _shell_remove_all_custom_widgets (priv); debian/patches/git-fix-background-panel-crash.patch0000664000000000000000000000421712321533756017532 0ustar From cd2495787209cb11492e86ecfbfb1f5505ac4240 Mon Sep 17 00:00:00 2001 From: Bastien Nocera Date: Tue, 26 Mar 2013 14:43:39 +0000 Subject: background: Fix handling of cancellation in async calls A few of the async calls were still handling the user_data before checking that it was still valid (eg. the operation was not cancelled), and also printing warnings when the error was a cancellation. --- --- a/panels/background/bg-pictures-source.c +++ b/panels/background/bg-pictures-source.c @@ -413,7 +413,7 @@ GAsyncResult *res, gpointer user_data) { - BgPicturesSource *bg_source = BG_PICTURES_SOURCE (user_data); + BgPicturesSource *bg_source; GList *files, *l; GError *err = NULL; GFile *parent; @@ -423,7 +423,8 @@ if (err) { - g_warning ("Could not get pictures file information: %s", err->message); + if (!g_error_matches (err, G_IO_ERROR, G_IO_ERROR_CANCELLED)) + g_warning ("Could not get pictures file information: %s", err->message); g_error_free (err); g_list_foreach (files, (GFunc) g_object_unref, NULL); @@ -431,6 +432,8 @@ return; } + bg_source = BG_PICTURES_SOURCE (user_data); + parent = g_file_enumerator_get_container (G_FILE_ENUMERATOR (source)); /* iterate over the available files */ @@ -453,7 +456,7 @@ GAsyncResult *res, gpointer user_data) { - BgPicturesSourcePrivate *priv = BG_PICTURES_SOURCE (user_data)->priv; + BgPicturesSourcePrivate *priv; GFileEnumerator *enumerator; GError *err = NULL; @@ -461,12 +464,15 @@ if (err) { - if (g_error_matches (err, G_IO_ERROR, G_IO_ERROR_NOT_FOUND) == FALSE) + if (!g_error_matches (err, G_IO_ERROR, G_IO_ERROR_NOT_FOUND) && + !g_error_matches (err, G_IO_ERROR, G_IO_ERROR_CANCELLED)) g_warning ("Could not fill pictures source: %s", err->message); g_error_free (err); return; } + priv = BG_PICTURES_SOURCE (user_data)->priv; + /* get the files */ g_file_enumerator_next_files_async (enumerator, G_MAXINT, debian/patches/98_default_sound_theme.patch0000664000000000000000000000107112321533756016204 0ustar # Description: the default sound theme is "ubuntu" for us # UbuntuSpecific: yes # Index: b/panels/sound/gvc-sound-theme-chooser.c =================================================================== --- a/panels/sound/gvc-sound-theme-chooser.c +++ b/panels/sound/gvc-sound-theme-chooser.c @@ -67,7 +67,7 @@ #define DEFAULT_ALERT_ID "__default" #define CUSTOM_THEME_NAME "__custom" #define NO_SOUNDS_THEME_NAME "__no_sounds" -#define DEFAULT_THEME "freedesktop" +#define DEFAULT_THEME "ubuntu" enum { THEME_DISPLAY_COL, debian/patches/git-sound-fix-port-handling.patch0000664000000000000000000000272212321533756017113 0ustar commit 10a0c18b8e3058144586880019b68ab4ea40ce78 Author: David Henningsson Date: Fri Dec 7 16:22:09 2012 +0530 sound: Fix port handling for the unknown availability case The current code assumes that port availability transitions will be between YES and NO, and doesn't account for the fact that it may also be UNKNOWN. This causes spurious entries if the port availability transitions between YES and UNKNOWN. diff --git a/panels/sound/gvc-mixer-control.c b/panels/sound/gvc-mixer-control.c index 34ddc0c..2f6cf34 100644 --- a/panels/sound/gvc-mixer-control.c +++ b/panels/sound/gvc-mixer-control.c @@ -2138,7 +2138,7 @@ update_card (GvcMixerControl *control, else { for (i = 0; i < info->n_ports; i++) { if (g_strcmp0 (card_port->port, info->ports[i]->name) == 0) { - if (card_port->available != info->ports[i]->available) { + if ((card_port->available == PA_PORT_AVAILABLE_NO) != (info->ports[i]->available == PA_PORT_AVAILABLE_NO)) { card_port->available = info->ports[i]->available; g_debug ("sync port availability on card %i, card port name '%s', new available value %i", gvc_mixer_card_get_index (card), debian/patches/dont_download_local_image.patch0000664000000000000000000000215412321533756017020 0ustar From 7b7f35b172e8c604aa723a3cd414088563a7d490 Mon Sep 17 00:00:00 2001 From: Ryan Lortie Date: Mon, 19 Mar 2012 12:55:31 -0400 Subject: [PATCH] background: don't 'download' image files The code for downloading files from remote uris was being triggered in the case of adding a background image file via the file chooser. Don't set the 'source-url' attribute on the image in this case in order to avoid the problem. https://bugzilla.gnome.org/show_bug.cgi?id=672405 --- panels/background/bg-pictures-source.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Index: b/panels/background/bg-pictures-source.c =================================================================== --- a/panels/background/bg-pictures-source.c +++ b/panels/background/bg-pictures-source.c @@ -335,7 +335,7 @@ "shading", G_DESKTOP_BACKGROUND_SHADING_SOLID, "placement", G_DESKTOP_BACKGROUND_STYLE_ZOOM, NULL); - if (source_uri != NULL) + if (source_uri != NULL && !g_file_is_native (file)) g_object_set (G_OBJECT (item), "source-url", source_uri, NULL); g_object_set_data (G_OBJECT (file), "item", item); debian/patches/97_unity_power_ui.patch0000664000000000000000000001350112321533756015247 0ustar Description: When indicator-power is installed, display an extra option in the power panel. Forwarded: not-needed Index: b/panels/power/cc-power-panel.c =================================================================== --- a/panels/power/cc-power-panel.c +++ b/panels/power/cc-power-panel.c @@ -39,6 +39,7 @@ { GSettings *lock_settings; GSettings *gsd_settings; + GSettings *power_settings; GCancellable *cancellable; GtkBuilder *builder; GDBusProxy *proxy; @@ -89,6 +90,11 @@ g_object_unref (priv->gsd_settings); priv->gsd_settings = NULL; } + if (priv->power_settings) + { + g_object_unref (priv->power_settings); + priv->power_settings = NULL; + } if (priv->cancellable != NULL) { g_cancellable_cancel (priv->cancellable); @@ -1112,6 +1118,37 @@ widget = WID (self->priv->builder, "vbox_power"); gtk_widget_reparent (widget, (GtkWidget *) self); + + /* Set up Unity-specific controls */ + /* References: + * https://wiki.ubuntu.com/Power + * https://docs.google.com/document/d/1ILTJDiDCd25Npt2AmgzF8aOnZZECxTfM0hvsbWT2BxA/edit?pli=1#heading=h.i5lg1g344bsb + */ + // First check the schema is installed + GSettingsSchemaSource *schema_source = g_settings_schema_source_ref ( + g_settings_schema_source_get_default ()); + GSettingsSchema *schema = g_settings_schema_source_lookup ( + schema_source, + "com.canonical.indicator.power", + TRUE); + g_settings_schema_source_unref (schema_source); + + if (schema) + { + widget = GTK_WIDGET (gtk_builder_get_object (self->priv->builder, + "combobox_indicator")); + self->priv->power_settings = g_settings_new ("com.canonical.indicator.power"); + g_settings_bind (self->priv->power_settings, "icon-policy", + widget, "active-id", G_SETTINGS_BIND_DEFAULT); + g_settings_schema_unref (schema); + } + else + { + gtk_widget_hide (GTK_WIDGET (gtk_builder_get_object (self->priv->builder, "separator_indicator"))); + gtk_widget_hide (GTK_WIDGET (gtk_builder_get_object (self->priv->builder, "label_indicator"))); + gtk_widget_hide (GTK_WIDGET (gtk_builder_get_object (self->priv->builder, "combobox_indicator"))); + } + } void Index: b/panels/power/power.ui =================================================================== --- a/panels/power/power.ui +++ b/panels/power/power.ui @@ -75,6 +75,28 @@ + + + + + + + + + + When battery is present + present + + + When battery is charging/in use + charge + + + Never + never + + + False False @@ -238,6 +260,48 @@ 3 + + + True + False + + + 0 + 4 + 4 + 1 + + + + + True + False + end + Show battery status in the _menu bar + True + + + 0 + 5 + + + + + True + False + liststore_indicator + True + + + + + + 1 + 5 + 2 + 1 + + False Index: b/configure.ac =================================================================== --- a/configure.ac +++ b/configure.ac @@ -94,7 +94,7 @@ dnl Check that we meet the dependencies dnl ============================================== -GLIB_REQUIRED_VERSION=2.31.0 +GLIB_REQUIRED_VERSION=2.31.2 GTK_REQUIRED_VERSION=3.5.13 PA_REQUIRED_VERSION=2.0 CANBERRA_REQUIRED_VERSION=0.13 debian/patches/rename_screenshot_media_keys.patch0000664000000000000000000000235712321533756017554 0ustar Description: Since Ubuntu's gnome-screenshot doesn't automatically save to the Pictures directory, don't claim that it does in the Keyboard Shortcuts list Author: William Hua --- a/panels/keyboard/01-screenshot.xml.in +++ b/panels/keyboard/01-screenshot.xml.in @@ -1,17 +1,14 @@ - + _description="Take a screenshot"/> - + _description="Take a screenshot of a window"/> - + _description="Take a screenshot of an area"/> debian/patches/64_restore_terminal_keyboard_shortcut.patch0000664000000000000000000000116012321533756021347 0ustar Index: gnome-control-center-3.4.2/panels/keyboard/01-launchers.xml.in =================================================================== --- gnome-control-center-3.4.2.orig/panels/keyboard/01-launchers.xml.in 2011-08-25 11:09:31.000000000 -0400 +++ gnome-control-center-3.4.2/panels/keyboard/01-launchers.xml.in 2012-08-25 23:34:01.889092065 -0400 @@ -7,6 +7,8 @@ + + debian/patches/06_handle_passwd_with_ldap.patch0000664000000000000000000000170212321533756017023 0ustar Description: Handle the case where passwd re-asks for the current password when it was entered incorrectly (when using LDAP) Based on a patch from Ryan Tandy Author: Chris Coulson Bug-Ubuntu: https:/launchpad.net/bugs/607357 Forwarded: no Index: b/panels/user-accounts/run-passwd.c =================================================================== --- a/panels/user-accounts/run-passwd.c +++ b/panels/user-accounts/run-passwd.c @@ -408,7 +408,7 @@ if (is_string_complete (str->str, "assword: ", "failure", "wrong", "error", NULL)) { - if (strstr (str->str, "assword: ") != NULL) { + if (strstr (str->str, "assword: ") != NULL && strstr (str->str, "incorrect") == NULL) { /* Authentication successful */ passwd_handler->backend_state = PASSWD_STATE_NEW; debian/patches/git_power_gsd_proxies.patch0000664000000000000000000000153112321533756016254 0ustar From 5fb7b67ab6d9928ec792b5025f2093529b7f932f Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Sat, 05 Jan 2013 22:45:58 +0000 Subject: power: Construct the gsd proxies properly The code was not using the correct bus name for the screen proxy. https://bugzilla.gnome.org/show_bug.cgi?id=691177 --- --- a/panels/power/cc-power-panel.c +++ b/panels/power/cc-power-panel.c @@ -1029,7 +1029,7 @@ g_dbus_proxy_new_for_bus (G_BUS_TYPE_SESSION, G_DBUS_PROXY_FLAGS_NONE, NULL, - "org.gnome.SettingsDaemon", + "org.gnome.SettingsDaemon.Power", "/org/gnome/SettingsDaemon/Power", "org.gnome.SettingsDaemon.Power", self->priv->cancellable, debian/patches/revert_git_drop_library.patch0000664000000000000000000001254612321533756016601 0ustar Index: gnome-control-center-3.6.2/configure.ac =================================================================== --- gnome-control-center-3.6.2.orig/configure.ac 2012-11-05 11:20:13.107224844 -0500 +++ gnome-control-center-3.6.2/configure.ac 2012-11-05 11:20:21.251224504 -0500 @@ -19,6 +19,14 @@ LT_PREREQ([2.2]) LT_INIT +# .so version for libgnome-control-center +LIBGNOMECONTROLCENTER_CURRENT=1 +LIBGNOMECONTROLCENTER_REVISION=0 +LIBGNOMECONTROLCENTER_AGE=0 +AC_SUBST(LIBGNOMECONTROLCENTER_CURRENT) +AC_SUBST(LIBGNOMECONTROLCENTER_REVISION) +AC_SUBST(LIBGNOMECONTROLCENTER_AGE) + # Internationalization support IT_PROG_INTLTOOL([0.40.1]) @@ -295,7 +303,7 @@ PANEL_CFLAGS="-I\$(top_srcdir)/ -DG_LOG_DOMAIN=\"\\\"\$(cappletname)-cc-panel\\\"\"" AC_SUBST(PANEL_CFLAGS) -PANEL_LIBS="" +PANEL_LIBS="\$(top_builddir)/shell/libgnome-control-center.la" AC_SUBST(PANEL_LIBS) PANEL_LDFLAGS="-export_dynamic -avoid-version -module -no-undefined -export-symbols-regex '^g_io_module_(load|unload)'" @@ -398,6 +406,7 @@ AC_OUTPUT([ Makefile +shell/libgnome-control-center.pc panels/Makefile panels/common/Makefile panels/background/Makefile Index: gnome-control-center-3.6.2/shell/libgnome-control-center.pc.in =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 +++ gnome-control-center-3.6.2/shell/libgnome-control-center.pc.in 2012-11-05 11:20:21.251224504 -0500 @@ -0,0 +1,12 @@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +libdir=@libdir@ +includedir=@includedir@ +extensiondir=@libdir@/control-center-1/panels + +Name: libgnome-control-center +Description: A library to create GNOME Control Center extensions +Version: @VERSION@ +Requires: glib-2.0 gio-2.0 gtk+-3.0 +Libs: -L${libdir} -lgnome-control-center +Cflags: -I${includedir}/gnome-control-center-1 Index: gnome-control-center-3.6.2/panels/common/Makefile.am =================================================================== --- gnome-control-center-3.6.2.orig/panels/common/Makefile.am 2012-11-05 11:19:44.763226029 -0500 +++ gnome-control-center-3.6.2/panels/common/Makefile.am 2012-11-05 11:20:21.251224504 -0500 @@ -23,9 +23,10 @@ cc-language-chooser.h liblanguage_la_LIBADD = \ + $(PANEL_LIBS) \ $(LIBLANGUAGE_LIBS) -liblanguage_la_LDFLAGS = -export_dynamic -avoid-version -module -no-undefined +liblanguage_la_LDFLAGS = $(PANEL_LDFLAGS) list_languages_SOURCES = list-languages.c list_languages_LDADD = liblanguage.la Index: gnome-control-center-3.6.2/shell/gnome-control-center.c =================================================================== --- gnome-control-center-3.6.2.orig/shell/gnome-control-center.c 2012-11-05 11:20:03.515225245 -0500 +++ gnome-control-center-3.6.2/shell/gnome-control-center.c 2012-11-05 11:20:21.251224504 -0500 @@ -214,7 +214,23 @@ if (panel_type == G_TYPE_INVALID) { - g_warning ("Could not find the loadable module for panel '%s'", id); + GKeyFile *key_file; + + /* It might be an external panel */ + key_file = g_key_file_new (); + if (g_key_file_load_from_file (key_file, desktop_file, G_KEY_FILE_NONE, NULL)) + { + gchar *command; + + command = g_key_file_get_string (key_file, G_KEY_FILE_DESKTOP_GROUP, G_KEY_FILE_DESKTOP_KEY_EXEC, NULL); + if (command && command[0]) + { + g_spawn_command_line_async (command, NULL); + g_free (command); + } + } + + g_key_file_free (key_file); return FALSE; } Index: gnome-control-center-3.6.2/shell/Makefile.am =================================================================== --- gnome-control-center-3.6.2.orig/shell/Makefile.am 2012-11-05 11:19:44.763226029 -0500 +++ gnome-control-center-3.6.2/shell/Makefile.am 2012-11-05 11:20:21.251224504 -0500 @@ -26,20 +26,48 @@ cc-shell-model.h \ cc-shell-nav-bar.c \ cc-shell-nav-bar.h \ - cc-editable-entry.c \ - cc-editable-entry.h \ - cc-panel.c \ - cc-panel.h \ - cc-shell.c \ - cc-shell.h \ $(MARSHAL_FILES) gnome_control_center_LDADD = \ + libgnome-control-center.la \ $(SHELL_LIBS) \ $(CHEESE_LIBS) gnome_control_center_LDFLAGS = -export-dynamic +lib_LTLIBRARIES = libgnome-control-center.la + +libgnome_control_center_include_HEADERS = \ + cc-panel.h \ + cc-shell.h \ + cc-editable-entry.h \ + $(NULL) + +libgnome_control_center_la_SOURCES = \ + cc-panel.c \ + cc-panel.h \ + cc-shell.c \ + cc-shell.h \ + cc-editable-entry.c \ + cc-editable-entry.h \ + $(NULL) + +libgnome_control_center_la_LDFLAGS = \ + -no-undefined \ + -version-info $(LIBGNOMECONTROLCENTER_CURRENT):$(LIBGNOMECONTROLCENTER_REVISION):$(LIBGNOMECONTROLCENTER_AGE) \ + $(NULL) + +libgnome_control_center_la_LIBADD = \ + $(LIBGNOME_CONTROL_CENTER_LIBS) \ + $(NULL) + +libgnome_control_center_la_LIBTOOLFLAGS = --tag=disable-static + +libgnome_control_center_includedir = $(includedir)/gnome-control-center-1/libgnome-control-center + +pkgconfigdir=$(libdir)/pkgconfig +pkgconfig_DATA=libgnome-control-center.pc + AM_CPPFLAGS = \ -DGNOMELOCALEDIR="\"$(datadir)/locale\"" \ -DUIDIR="\"$(uidir)\"" \ @@ -70,6 +98,7 @@ gnome-control-center.desktop.in.in \ gnomecc.directory.in \ gnomecc.menu.in \ + libgnome-control-center.pc.in \ cc-shell-marshal.list DISTCLEANFILES = gnome-control-center.desktop gnome-control-center.desktop.in gnomecc.directory gnomecc.menu debian/patches/git_move_rr_labeler.patch0000664000000000000000000006153512321533756015663 0ustar From e35a109d299011b800cb085f3d57ad7c012ed6dc Mon Sep 17 00:00:00 2001 From: Bastien Nocera Date: Wed, 21 Nov 2012 21:13:44 +0000 Subject: display: Move GnomeRRLabeler here And rename to CcRRLabeler. --- Index: gnome-control-center-3.6.3/panels/display/Makefile.am =================================================================== --- gnome-control-center-3.6.3.orig/panels/display/Makefile.am 2014-02-26 19:03:16.059681370 +0100 +++ gnome-control-center-3.6.3/panels/display/Makefile.am 2014-02-26 19:03:16.047681370 +0100 @@ -19,6 +19,8 @@ display-module.c \ cc-display-panel.c \ cc-display-panel.h \ + cc-rr-labeler.c \ + cc-rr-labeler.h \ scrollarea.c \ scrollarea.h \ $(MARSHALFILES) Index: gnome-control-center-3.6.3/panels/display/cc-display-panel.c =================================================================== --- gnome-control-center-3.6.3.orig/panels/display/cc-display-panel.c 2014-02-26 19:03:16.059681370 +0100 +++ gnome-control-center-3.6.3/panels/display/cc-display-panel.c 2014-02-26 19:03:16.051681370 +0100 @@ -31,12 +31,13 @@ #define GNOME_DESKTOP_USE_UNSTABLE_API #include #include -#include #include #include #include #include +#include "cc-rr-labeler.h" + CC_PANEL_REGISTER (CcDisplayPanel, cc_display_panel) #define DISPLAY_PANEL_PRIVATE(o) \ @@ -75,7 +76,7 @@ { GnomeRRScreen *screen; GnomeRRConfig *current_configuration; - GnomeRRLabeler *labeler; + CcRRLabeler *labeler; GnomeRROutputInfo *current_output; GSettings *clock_settings; @@ -196,7 +197,7 @@ self->priv->focus_id); } - gnome_rr_labeler_hide (self->priv->labeler); + cc_rr_labeler_hide (self->priv->labeler); g_object_unref (self->priv->labeler); G_OBJECT_CLASS (cc_display_panel_parent_class)->finalize (object); @@ -289,13 +290,13 @@ self->priv->current_output = NULL; if (self->priv->labeler) { - gnome_rr_labeler_hide (self->priv->labeler); + cc_rr_labeler_hide (self->priv->labeler); g_object_unref (self->priv->labeler); } - self->priv->labeler = gnome_rr_labeler_new (self->priv->current_configuration); + self->priv->labeler = cc_rr_labeler_new (self->priv->current_configuration); if (gtk_widget_has_focus (self->priv->panel)) - gnome_rr_labeler_show (self->priv->labeler); + cc_rr_labeler_show (self->priv->labeler); select_current_output_from_dialog_position (self); @@ -673,7 +674,7 @@ tmp = g_strdup (gnome_rr_output_info_get_display_name (self->priv->current_output)); str = g_strdup_printf ("%s", tmp); - gnome_rr_labeler_get_rgba_for_output (self->priv->labeler, self->priv->current_output, &color); + cc_rr_labeler_get_rgba_for_output (self->priv->labeler, self->priv->current_output, &color); use_color = TRUE; g_free (tmp); } @@ -2073,7 +2074,7 @@ cairo_rectangle (cr, x, y, w * scale + 0.5, h * scale + 0.5); cairo_clip_preserve (cr); - gnome_rr_labeler_get_rgba_for_output (self->priv->labeler, output, &output_color); + cc_rr_labeler_get_rgba_for_output (self->priv->labeler, output, &output_color); r = output_color.red; g = output_color.green; b = output_color.blue; @@ -2581,9 +2582,9 @@ if (self->priv->labeler == NULL) return; if (gtk_window_has_toplevel_focus (window)) - gnome_rr_labeler_show (self->priv->labeler); + cc_rr_labeler_show (self->priv->labeler); else - gnome_rr_labeler_hide (self->priv->labeler); + cc_rr_labeler_hide (self->priv->labeler); } static void @@ -2673,7 +2674,7 @@ int monitor_width = 30; int monitor_height = 15; - gnome_rr_labeler_get_rgba_for_output (self->priv->labeler, output, &color); + cc_rr_labeler_get_rgba_for_output (self->priv->labeler, output, &color); cairo_surface = cairo_image_surface_create (CAIRO_FORMAT_RGB24, monitor_width, monitor_height); cr = cairo_create (cairo_surface); Index: gnome-control-center-3.6.3/panels/display/cc-rr-labeler.c =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 +++ gnome-control-center-3.6.3/panels/display/cc-rr-labeler.c 2014-02-26 19:03:16.051681370 +0100 @@ -0,0 +1,601 @@ +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- + * + * cc-rr-labeler.c - Utility to label monitors to identify them + * while they are being configured. + * + * Copyright 2008, Novell, Inc. + * + * This file is part of the Gnome Library. + * + * The Gnome Library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public License as + * published by the Free Software Foundation; either version 2 of the + * License, or (at your option) any later version. + * + * The Gnome Library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with the Gnome Library; see the file COPYING.LIB. If not, + * write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Boston, MA 02110-1301, USA. + * + * Author: Federico Mena-Quintero + */ + +#include +#include +#include + +#include +#include +#include +#include +#include + +#include "cc-rr-labeler.h" + +struct _CcRRLabelerPrivate { + GnomeRRConfig *config; + + int num_outputs; + + GdkRGBA *palette; + GtkWidget **windows; + + GdkScreen *screen; + Atom workarea_atom; +}; + +enum { + PROP_0, + PROP_CONFIG, + PROP_LAST +}; + +G_DEFINE_TYPE (CcRRLabeler, cc_rr_labeler, G_TYPE_OBJECT); + +static void cc_rr_labeler_finalize (GObject *object); +static void setup_from_config (CcRRLabeler *labeler); + +static GdkFilterReturn +screen_xevent_filter (GdkXEvent *xevent, + GdkEvent *event, + CcRRLabeler *labeler) +{ + XEvent *xev; + + xev = (XEvent *) xevent; + + if (xev->type == PropertyNotify && + xev->xproperty.atom == labeler->priv->workarea_atom) { + /* update label positions */ + if (labeler->priv->windows != NULL) { + cc_rr_labeler_hide (labeler); + cc_rr_labeler_show (labeler); + } + } + + return GDK_FILTER_CONTINUE; +} + +static void +cc_rr_labeler_init (CcRRLabeler *labeler) +{ + GdkWindow *gdkwindow; + + labeler->priv = G_TYPE_INSTANCE_GET_PRIVATE (labeler, GNOME_TYPE_RR_LABELER, CcRRLabelerPrivate); + + labeler->priv->workarea_atom = XInternAtom (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), + "_NET_WORKAREA", + True); + + labeler->priv->screen = gdk_screen_get_default (); + /* code is not really designed to handle multiple screens so *shrug* */ + gdkwindow = gdk_screen_get_root_window (labeler->priv->screen); + gdk_window_add_filter (gdkwindow, (GdkFilterFunc) screen_xevent_filter, labeler); + gdk_window_set_events (gdkwindow, gdk_window_get_events (gdkwindow) | GDK_PROPERTY_CHANGE_MASK); +} + +static void +cc_rr_labeler_set_property (GObject *gobject, guint property_id, const GValue *value, GParamSpec *param_spec) +{ + CcRRLabeler *self = CC_RR_LABELER (gobject); + + switch (property_id) { + case PROP_CONFIG: + self->priv->config = GNOME_RR_CONFIG (g_value_dup_object (value)); + return; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (gobject, property_id, param_spec); + } +} + +static GObject * +cc_rr_labeler_constructor (GType type, guint n_construct_properties, GObjectConstructParam *construct_properties) +{ + CcRRLabeler *self = (CcRRLabeler*) G_OBJECT_CLASS (cc_rr_labeler_parent_class)->constructor (type, n_construct_properties, construct_properties); + + setup_from_config (self); + + return (GObject*) self; +} + +static void +cc_rr_labeler_class_init (CcRRLabelerClass *klass) +{ + GObjectClass *object_class; + + g_type_class_add_private (klass, sizeof (CcRRLabelerPrivate)); + + object_class = (GObjectClass *) klass; + + object_class->set_property = cc_rr_labeler_set_property; + object_class->finalize = cc_rr_labeler_finalize; + object_class->constructor = cc_rr_labeler_constructor; + + g_object_class_install_property (object_class, PROP_CONFIG, g_param_spec_object ("config", + "Configuration", + "RandR configuration to label", + GNOME_TYPE_RR_CONFIG, + G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY | + G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB)); +} + +static void +cc_rr_labeler_finalize (GObject *object) +{ + CcRRLabeler *labeler; + GdkWindow *gdkwindow; + + labeler = CC_RR_LABELER (object); + + gdkwindow = gdk_screen_get_root_window (labeler->priv->screen); + gdk_window_remove_filter (gdkwindow, (GdkFilterFunc) screen_xevent_filter, labeler); + + if (labeler->priv->config != NULL) { + g_object_unref (labeler->priv->config); + } + + if (labeler->priv->windows != NULL) { + cc_rr_labeler_hide (labeler); + g_free (labeler->priv->windows); + } + + g_free (labeler->priv->palette); + + G_OBJECT_CLASS (cc_rr_labeler_parent_class)->finalize (object); +} + +static int +count_outputs (GnomeRRConfig *config) +{ + int i; + GnomeRROutputInfo **outputs = gnome_rr_config_get_outputs (config); + + for (i = 0; outputs[i] != NULL; i++) + ; + + return i; +} + +static void +make_palette (CcRRLabeler *labeler) +{ + /* The idea is that we go around an hue color wheel. We want to start + * at red, go around to green/etc. and stop at blue --- because magenta + * is evil. Eeeeek, no magenta, please! + * + * Purple would be nice, though. Remember that we are watered down + * (i.e. low saturation), so that would be like Like berries with cream. + * Mmmmm, berries. + */ + double start_hue; + double end_hue; + int i; + + g_assert (labeler->priv->num_outputs > 0); + + labeler->priv->palette = g_new (GdkRGBA, labeler->priv->num_outputs); + + start_hue = 0.0; /* red */ + end_hue = 2.0/3; /* blue */ + + for (i = 0; i < labeler->priv->num_outputs; i++) { + double h, s, v; + double r, g, b; + + h = start_hue + (end_hue - start_hue) / labeler->priv->num_outputs * i; + s = 1.0 / 3; + v = 1.0; + + gtk_hsv_to_rgb (h, s, v, &r, &g, &b); + + labeler->priv->palette[i].red = r; + labeler->priv->palette[i].green = g; + labeler->priv->palette[i].blue = b; + labeler->priv->palette[i].alpha = 1.0; + } +} + +static void +rounded_rectangle (cairo_t *cr, + gint x, + gint y, + gint width, + gint height, + gint x_radius, + gint y_radius) +{ + gint x1, x2; + gint y1, y2; + gint xr1, xr2; + gint yr1, yr2; + + x1 = x; + x2 = x1 + width; + y1 = y; + y2 = y1 + height; + + x_radius = MIN (x_radius, width / 2.0); + y_radius = MIN (y_radius, width / 2.0); + + xr1 = x_radius; + xr2 = x_radius / 2.0; + yr1 = y_radius; + yr2 = y_radius / 2.0; + + cairo_move_to (cr, x1 + xr1, y1); + cairo_line_to (cr, x2 - xr1, y1); + cairo_curve_to (cr, x2 - xr2, y1, x2, y1 + yr2, x2, y1 + yr1); + cairo_line_to (cr, x2, y2 - yr1); + cairo_curve_to (cr, x2, y2 - yr2, x2 - xr2, y2, x2 - xr1, y2); + cairo_line_to (cr, x1 + xr1, y2); + cairo_curve_to (cr, x1 + xr2, y2, x1, y2 - yr2, x1, y2 - yr1); + cairo_line_to (cr, x1, y1 + yr1); + cairo_curve_to (cr, x1, y1 + yr2, x1 + xr2, y1, x1 + xr1, y1); + cairo_close_path (cr); +} + +#define LABEL_WINDOW_EDGE_THICKNESS 2 +#define LABEL_WINDOW_PADDING 12 +/* Look for panel-corner in: + * http://git.gnome.org/browse/gnome-shell/tree/data/theme/gnome-shell.css + * to match the corner radius */ +#define LABEL_CORNER_RADIUS 6 + LABEL_WINDOW_EDGE_THICKNESS + +static void +label_draw_background_and_frame (GtkWidget *widget, cairo_t *cr, gboolean for_shape) +{ + GdkRGBA shape_color = { 0, 0, 0, 1 }; + GdkRGBA *rgba; + GtkAllocation allocation; + + rgba = g_object_get_data (G_OBJECT (widget), "rgba"); + gtk_widget_get_allocation (widget, &allocation); + + cairo_save (cr); + cairo_set_operator (cr, CAIRO_OPERATOR_SOURCE); + + /* edge outline */ + if (for_shape) + gdk_cairo_set_source_rgba (cr, &shape_color); + else + cairo_set_source_rgba (cr, 0, 0, 0, 0.5); + + rounded_rectangle (cr, + LABEL_WINDOW_EDGE_THICKNESS / 2.0, + LABEL_WINDOW_EDGE_THICKNESS / 2.0, + allocation.width - LABEL_WINDOW_EDGE_THICKNESS, + allocation.height - LABEL_WINDOW_EDGE_THICKNESS, + LABEL_CORNER_RADIUS, LABEL_CORNER_RADIUS); + cairo_set_line_width (cr, LABEL_WINDOW_EDGE_THICKNESS); + cairo_stroke (cr); + + /* fill */ + if (for_shape) { + gdk_cairo_set_source_rgba (cr, &shape_color); + } else { + rgba->alpha = 0.75; + gdk_cairo_set_source_rgba (cr, rgba); + } + + rounded_rectangle (cr, + LABEL_WINDOW_EDGE_THICKNESS, + LABEL_WINDOW_EDGE_THICKNESS, + allocation.width - LABEL_WINDOW_EDGE_THICKNESS * 2, + allocation.height - LABEL_WINDOW_EDGE_THICKNESS * 2, + LABEL_CORNER_RADIUS - LABEL_WINDOW_EDGE_THICKNESS / 2.0, + LABEL_CORNER_RADIUS - LABEL_WINDOW_EDGE_THICKNESS / 2.0); + cairo_fill (cr); + + cairo_restore (cr); +} + +static void +maybe_update_shape (GtkWidget *widget) +{ + cairo_t *cr; + cairo_surface_t *surface; + cairo_region_t *region; + + /* fallback to XShape only for non-composited clients */ + if (gtk_widget_is_composited (widget)) { + gtk_widget_shape_combine_region (widget, NULL); + return; + } + + surface = gdk_window_create_similar_surface (gtk_widget_get_window (widget), + CAIRO_CONTENT_COLOR_ALPHA, + gtk_widget_get_allocated_width (widget), + gtk_widget_get_allocated_height (widget)); + + cr = cairo_create (surface); + label_draw_background_and_frame (widget, cr, TRUE); + cairo_destroy (cr); + + region = gdk_cairo_region_create_from_surface (surface); + gtk_widget_shape_combine_region (widget, region); + + cairo_surface_destroy (surface); + cairo_region_destroy (region); +} + +static gboolean +label_window_draw_event_cb (GtkWidget *widget, cairo_t *cr, gpointer data) +{ + if (gtk_widget_is_composited (widget)) { + /* clear any content */ + cairo_save (cr); + cairo_set_operator (cr, CAIRO_OPERATOR_SOURCE); + cairo_set_source_rgba (cr, 0, 0, 0, 0); + cairo_paint (cr); + cairo_restore (cr); + } + + maybe_update_shape (widget); + label_draw_background_and_frame (widget, cr, FALSE); + + return FALSE; +} + +static void +position_window (CcRRLabeler *labeler, + GtkWidget *window, + int x, + int y) +{ + GdkRectangle workarea; + GdkRectangle monitor; + int monitor_num; + + monitor_num = gdk_screen_get_monitor_at_point (labeler->priv->screen, x, y); + gdk_screen_get_monitor_workarea (labeler->priv->screen, monitor_num, &workarea); + gdk_screen_get_monitor_geometry (labeler->priv->screen, + monitor_num, + &monitor); + gdk_rectangle_intersect (&monitor, &workarea, &workarea); + + gtk_window_move (GTK_WINDOW (window), workarea.x, workarea.y); +} + +static void +label_window_realize_cb (GtkWidget *widget) +{ + cairo_region_t *region; + + /* make the whole window ignore events */ + region = cairo_region_create (); + gtk_widget_input_shape_combine_region (widget, region); + cairo_region_destroy (region); + + maybe_update_shape (widget); +} + +static void +label_window_composited_changed_cb (GtkWidget *widget, CcRRLabeler *labeler) +{ + if (gtk_widget_get_realized (widget)) + maybe_update_shape (widget); +} + +static GtkWidget * +create_label_window (CcRRLabeler *labeler, GnomeRROutputInfo *output, GdkRGBA *rgba) +{ + GtkWidget *window; + GtkWidget *widget; + char *str; + const char *display_name; + GdkRGBA black = { 0, 0, 0, 1.0 }; + int x, y; + GdkScreen *screen; + GdkVisual *visual; + + window = gtk_window_new (GTK_WINDOW_POPUP); + gtk_window_set_type_hint (GTK_WINDOW (window), GDK_WINDOW_TYPE_HINT_TOOLTIP); + gtk_window_set_resizable (GTK_WINDOW (window), FALSE); + gtk_widget_set_app_paintable (window, TRUE); + screen = gtk_widget_get_screen (window); + visual = gdk_screen_get_rgba_visual (screen); + + if (visual != NULL) + gtk_widget_set_visual (window, visual); + + gtk_container_set_border_width (GTK_CONTAINER (window), LABEL_WINDOW_PADDING + LABEL_WINDOW_EDGE_THICKNESS); + + /* This is semi-dangerous. The color is part of the labeler->palette + * array. Note that in cc_rr_labeler_finalize(), we are careful to + * free the palette only after we free the windows. + */ + g_object_set_data (G_OBJECT (window), "rgba", rgba); + + g_signal_connect (window, "draw", + G_CALLBACK (label_window_draw_event_cb), labeler); + g_signal_connect (window, "realize", + G_CALLBACK (label_window_realize_cb), labeler); + g_signal_connect (window, "composited-changed", + G_CALLBACK (label_window_composited_changed_cb), labeler); + + if (gnome_rr_config_get_clone (labeler->priv->config)) { + /* Keep this string in sync with gnome-control-center/capplets/display/xrandr-capplet.c:get_display_name() */ + + /* Translators: this is the feature where what you see on your + * laptop's screen is the same as your external projector. + * Here, "Mirrored" is being used as an adjective. For example, + * the Spanish translation could be "Pantallas en Espejo". + */ + display_name = _("Mirrored Displays"); + } else + display_name = gnome_rr_output_info_get_display_name (output); + + str = g_strdup_printf ("%s", display_name); + widget = gtk_label_new (NULL); + gtk_label_set_markup (GTK_LABEL (widget), str); + g_free (str); + + /* Make the label explicitly black. We don't want it to follow the + * theme's colors, since the label is always shown against a light + * pastel background. See bgo#556050 + */ + gtk_widget_override_color (widget, + gtk_widget_get_state_flags (widget), + &black); + + gtk_container_add (GTK_CONTAINER (window), widget); + + /* Should we center this at the top edge of the monitor, instead of using the upper-left corner? */ + gnome_rr_output_info_get_geometry (output, &x, &y, NULL, NULL); + position_window (labeler, window, x, y); + + gtk_widget_show_all (window); + + return window; +} + +static void +setup_from_config (CcRRLabeler *labeler) +{ + labeler->priv->num_outputs = count_outputs (labeler->priv->config); + + make_palette (labeler); + + cc_rr_labeler_show (labeler); +} + +/** + * cc_rr_labeler_new: + * @config: Configuration of the screens to label + * + * Create a GUI element that will display colored labels on each connected monitor. + * This is useful when users are required to identify which monitor is which, e.g. for + * for configuring multiple monitors. + * The labels will be shown by default, use cc_rr_labeler_hide to hide them. + * + * Returns: A new #CcRRLabeler + */ +CcRRLabeler * +cc_rr_labeler_new (GnomeRRConfig *config) +{ + g_return_val_if_fail (GNOME_IS_RR_CONFIG (config), NULL); + + return g_object_new (GNOME_TYPE_RR_LABELER, "config", config, NULL); +} + +/** + * cc_rr_labeler_show: + * @labeler: A #CcRRLabeler + * + * Show the labels. + */ +void +cc_rr_labeler_show (CcRRLabeler *labeler) +{ + int i; + gboolean created_window_for_clone; + GnomeRROutputInfo **outputs; + + g_return_if_fail (GNOME_IS_RR_LABELER (labeler)); + + if (labeler->priv->windows != NULL) + return; + + labeler->priv->windows = g_new (GtkWidget *, labeler->priv->num_outputs); + + created_window_for_clone = FALSE; + + outputs = gnome_rr_config_get_outputs (labeler->priv->config); + + for (i = 0; i < labeler->priv->num_outputs; i++) { + if (!created_window_for_clone && gnome_rr_output_info_is_active (outputs[i])) { + labeler->priv->windows[i] = create_label_window (labeler, outputs[i], labeler->priv->palette + i); + + if (gnome_rr_config_get_clone (labeler->priv->config)) + created_window_for_clone = TRUE; + } else + labeler->priv->windows[i] = NULL; + } +} + +/** + * cc_rr_labeler_hide: + * @labeler: A #CcRRLabeler + * + * Hide ouput labels. + */ +void +cc_rr_labeler_hide (CcRRLabeler *labeler) +{ + int i; + CcRRLabelerPrivate *priv; + + g_return_if_fail (GNOME_IS_RR_LABELER (labeler)); + + priv = labeler->priv; + + if (priv->windows == NULL) + return; + + for (i = 0; i < priv->num_outputs; i++) + if (priv->windows[i] != NULL) { + gtk_widget_destroy (priv->windows[i]); + priv->windows[i] = NULL; + } + g_free (priv->windows); + priv->windows = NULL; +} + +/** + * cc_rr_labeler_get_rgba_for_output: + * @labeler: A #CcRRLabeler + * @output: Output device (i.e. monitor) to query + * @rgba_out: (out): Color of selected monitor. + * + * Get the color used for the label on a given output (monitor). + */ +void +cc_rr_labeler_get_rgba_for_output (CcRRLabeler *labeler, GnomeRROutputInfo *output, GdkRGBA *rgba_out) +{ + int i; + GnomeRROutputInfo **outputs; + + g_return_if_fail (GNOME_IS_RR_LABELER (labeler)); + g_return_if_fail (GNOME_IS_RR_OUTPUT_INFO (output)); + g_return_if_fail (rgba_out != NULL); + + outputs = gnome_rr_config_get_outputs (labeler->priv->config); + + for (i = 0; i < labeler->priv->num_outputs; i++) + if (outputs[i] == output) { + *rgba_out = labeler->priv->palette[i]; + return; + } + + g_warning ("trying to get the color for unknown GnomeOutputInfo %p; returning magenta!", output); + + rgba_out->red = 1.0; + rgba_out->green = 0; + rgba_out->blue = 1.0; + rgba_out->alpha = 1.0; +} Index: gnome-control-center-3.6.3/panels/display/cc-rr-labeler.h =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 +++ gnome-control-center-3.6.3/panels/display/cc-rr-labeler.h 2014-02-26 19:03:16.051681370 +0100 @@ -0,0 +1,64 @@ +/* gnome-rr-labeler.h - Utility to label monitors to identify them + * while they are being configured. + * + * Copyright 2008, Novell, Inc. + * + * This file is part of the Gnome Library. + * + * The Gnome Library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public License as + * published by the Free Software Foundation; either version 2 of the + * License, or (at your option) any later version. + * + * The Gnome Library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with the Gnome Library; see the file COPYING.LIB. If not, + * write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Boston, MA 02110-1301, USA. + * + * Author: Federico Mena-Quintero + */ + +#ifndef CC_RR_LABELER_H +#define CC_RR_LABELER_H + +#define GNOME_DESKTOP_USE_UNSTABLE_API +#include + +#define GNOME_TYPE_RR_LABELER (cc_rr_labeler_get_type ()) +#define CC_RR_LABELER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GNOME_TYPE_RR_LABELER, CcRRLabeler)) +#define CC_RR_LABELER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GNOME_TYPE_RR_LABELER, CcRRLabelerClass)) +#define GNOME_IS_RR_LABELER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GNOME_TYPE_RR_LABELER)) +#define GNOME_IS_RR_LABELER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GNOME_TYPE_RR_LABELER)) +#define CC_RR_LABELER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GNOME_TYPE_RR_LABELER, CcRRLabelerClass)) + +typedef struct _CcRRLabeler CcRRLabeler; +typedef struct _CcRRLabelerClass CcRRLabelerClass; +typedef struct _CcRRLabelerPrivate CcRRLabelerPrivate; + +struct _CcRRLabeler { + GObject parent; + + /*< private >*/ + CcRRLabelerPrivate *priv; +}; + +struct _CcRRLabelerClass { + GObjectClass parent_class; +}; + +GType cc_rr_labeler_get_type (void); + +CcRRLabeler *cc_rr_labeler_new (GnomeRRConfig *config); + +void cc_rr_labeler_show (CcRRLabeler *labeler); + +void cc_rr_labeler_hide (CcRRLabeler *labeler); + +void cc_rr_labeler_get_rgba_for_output (CcRRLabeler *labeler, GnomeRROutputInfo *output, GdkRGBA *rgba_out); + +#endif Index: gnome-control-center-3.6.3/configure.ac =================================================================== --- gnome-control-center-3.6.3.orig/configure.ac 2014-02-26 19:03:16.059681370 +0100 +++ gnome-control-center-3.6.3/configure.ac 2014-02-26 19:03:19.000000000 +0100 @@ -135,7 +135,7 @@ gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION gdk-pixbuf-2.0 >= $GDKPIXBUF_REQUIRED_VERSION) -PKG_CHECK_MODULES(DISPLAY_PANEL, $COMMON_MODULES gnome-desktop-3.0 >= 3.1.0) +PKG_CHECK_MODULES(DISPLAY_PANEL, $COMMON_MODULES gnome-desktop-3.0 >= 3.1.0 x11) PKG_CHECK_MODULES(INFO_PANEL, $COMMON_MODULES libgtop-2.0 gl x11 polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION) PKG_CHECK_MODULES(KEYBOARD_PANEL, $COMMON_MODULES debian/patches/git_drop_ibus_engine_whitelist.patch0000664000000000000000000001242712321533756020127 0ustar From c87d5883787c8727fcdd4ae0d61d59a89b5d4813 Mon Sep 17 00:00:00 2001 From: Rui Matos Date: Sat, 09 Feb 2013 02:17:42 +0000 Subject: region: Remove the IBus engines whitelist And just blacklist IBus' "xkb:" engines which basically duplicate all the XKB layouts. Index: gnome-control-center-3.6.3/panels/region/gnome-region-panel-input.c =================================================================== --- gnome-control-center-3.6.3.orig/panels/region/gnome-region-panel-input.c 2013-09-14 10:19:07.811746123 -0400 +++ gnome-control-center-3.6.3/panels/region/gnome-region-panel-input.c 2013-09-14 10:21:59.727738932 -0400 @@ -87,218 +87,6 @@ static GCancellable *ibus_cancellable = NULL; static guint shell_name_watch_id = 0; -static const gchar *supported_ibus_engines[] = { - /* Simplified Chinese */ - "pinyin", - "bopomofo", - "wubi", - "erbi", - /* Default in Fedora, where ibus-libpinyin replaces ibus-pinyin */ - "libpinyin", - "libbopomofo", - - /* Traditional Chinese */ - /* https://bugzilla.gnome.org/show_bug.cgi?id=680840 */ - "chewing", - "cangjie5", - "cangjie3", - "quick5", - "quick3", - "stroke5", - - /* Japanese */ - "anthy", - "mozc-jp", - "skk", - - /* Korean */ - "hangul", - - /* Thai */ - "m17n:th:kesmanee", - "m17n:th:pattachote", - "m17n:th:tis820", - - /* Vietnamese */ - "m17n:vi:tcvn", - "m17n:vi:telex", - "m17n:vi:viqr", - "m17n:vi:vni", - "Unikey", - - /* Sinhala */ - "m17n:si:wijesekera", - "m17n:si:phonetic-dynamic", - "m17n:si:trans", - "sayura", - - /* Indic */ - /* https://fedoraproject.org/wiki/I18N/Indic#Keyboard_Layouts */ - - /* Assamese */ - "m17n:as:phonetic", - "m17n:as:inscript", - "m17n:as:itrans", - - /* Bengali */ - "m17n:bn:inscript", - "m17n:bn:itrans", - "m17n:bn:probhat", - - /* Gujarati */ - "m17n:gu:inscript", - "m17n:gu:itrans", - "m17n:gu:phonetic", - - /* Hindi */ - "m17n:hi:inscript", - "m17n:hi:itrans", - "m17n:hi:phonetic", - "m17n:hi:remington", - "m17n:hi:typewriter", - "m17n:hi:vedmata", - - /* Kannada */ - "m17n:kn:kgp", - "m17n:kn:inscript", - "m17n:kn:itrans", - - /* Kashmiri */ - "m17n:ks:inscript", - - /* Maithili */ - "m17n:mai:inscript", - - /* Malayalam */ - "m17n:ml:inscript", - "m17n:ml:itrans", - "m17n:ml:mozhi", - "m17n:ml:swanalekha", - - /* Marathi */ - "m17n:mr:inscript", - "m17n:mr:itrans", - "m17n:mr:phonetic", - - /* Nepali */ - "m17n:ne:rom", - "m17n:ne:trad", - - /* Oriya */ - "m17n:or:inscript", - "m17n:or:itrans", - "m17n:or:phonetic", - - /* Punjabi */ - "m17n:pa:inscript", - "m17n:pa:itrans", - "m17n:pa:phonetic", - "m17n:pa:jhelum", - - /* Sanskrit */ - "m17n:sa:harvard-kyoto", - - /* Sindhi */ - "m17n:sd:inscript", - - /* Tamil */ - "m17n:ta:tamil99", - "m17n:ta:inscript", - "m17n:ta:itrans", - "m17n:ta:phonetic", - "m17n:ta:lk-renganathan", - "m17n:ta:vutam", - "m17n:ta:typewriter", - - /* Telugu */ - "m17n:te:inscript", - "m17n:te:apple", - "m17n:te:pothana", - "m17n:te:rts", - - /* Urdu */ - "m17n:ur:phonetic", - - /* Inscript2 - https://bugzilla.gnome.org/show_bug.cgi?id=684854 */ - "m17n:as:inscript2", - "m17n:bn:inscript2", - "m17n:brx:inscript2-deva", - "m17n:doi:inscript2-deva", - "m17n:gu:inscript2", - "m17n:hi:inscript2", - "m17n:kn:inscript2", - "m17n:kok:inscript2-deva", - "m17n:mai:inscript2", - "m17n:ml:inscript2", - "m17n:mni:inscript2-beng", - "m17n:mni:inscript2-mtei", - "m17n:mr:inscript2", - "m17n:ne:inscript2-deva", - "m17n:or:inscript2", - "m17n:pa:inscript2-guru", - "m17n:sa:inscript2", - "m17n:sat:inscript2-deva", - "m17n:sat:inscript2-olck", - "m17n:sd:inscript2-deva", - "m17n:ta:inscript2", - "m17n:te:inscript2", - - /* No corresponding XKB map available for the languages */ - - /* Chinese Yi */ - "m17n:ii:phonetic", - - /* Tai-Viet */ - "m17n:tai:sonla", - - /* Kazakh in Arabic script */ - "m17n:kk:arabic", - - /* Yiddish */ - "m17n:yi:yivo", - - /* Canadian Aboriginal languages */ - "m17n:ath:phonetic", - "m17n:bla:phonetic", - "m17n:cr:western", - "m17n:iu:phonetic", - "m17n:nsk:phonetic", - "m17n:oj:phonetic", - - /* Non-trivial engines, like transliteration-based instead of - keymap-based. Confirmation needed that the engines below are - actually used by local language users. */ - - /* Tibetan */ - "m17n:bo:ewts", - "m17n:bo:tcrc", - "m17n:bo:wylie", - - /* Esperanto */ - "m17n:eo:h-f", - "m17n:eo:h", - "m17n:eo:plena", - "m17n:eo:q", - "m17n:eo:vi", - "m17n:eo:x", - - /* Amharic */ - "m17n:am:sera", - - /* Russian */ - "m17n:ru:translit", - - /* Classical Greek */ - "m17n:grc:mizuochi", - - /* Lao */ - "m17n:lo:lrt", - - /* Postfix modifier input methods */ - "m17n:da:post", - "m17n:sv:post", - NULL -}; #endif /* HAVE_IBUS */ static void populate_model (GtkListStore *store, @@ -475,10 +263,10 @@ IBusEngineDesc *engine = l->data; const gchar *engine_id = ibus_engine_desc_get_name (engine); - if (show_all_sources || strv_contains (supported_ibus_engines, engine_id)) - g_hash_table_replace (ibus_engines, (gpointer)engine_id, engine); - else + if (g_str_has_prefix (engine_id, "xkb:")) g_object_unref (engine); + else + g_hash_table_replace (ibus_engines, (gpointer)engine_id, engine); } g_list_free (list); debian/patches/05_run_update_manager.patch0000664000000000000000000000071112321533756016012 0ustar Index: b/panels/info/cc-info-panel.c =================================================================== --- a/panels/info/cc-info-panel.c +++ b/panels/info/cc-info-panel.c @@ -1900,7 +1900,7 @@ { GError *error; error = NULL; - g_spawn_command_line_async ("gpk-update-viewer", &error); + g_spawn_command_line_async ("update-manager", &error); if (error != NULL) { g_warning ("unable to launch Software Updates: %s", error->message); debian/patches/92_ubuntu_system_proxy.patch0000664000000000000000000002011012321533756016342 0ustar Index: gnome-control-center-3.6.3/panels/network/net-proxy.c =================================================================== --- gnome-control-center-3.6.3.orig/panels/network/net-proxy.c 2013-04-16 16:14:41.159226157 +0200 +++ gnome-control-center-3.6.3/panels/network/net-proxy.c 2013-04-16 16:14:59.847226780 +0200 @@ -25,8 +25,14 @@ #include #include +#include +#include +#include + #include "net-proxy.h" + + #define NET_PROXY_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NET_TYPE_PROXY, NetProxyPrivate)) struct _NetProxyPrivate @@ -250,6 +256,148 @@ g_type_class_add_private (klass, sizeof (NetProxyPrivate)); } + +static gboolean +ubuntu_is_in_admin_group (int id_group) +{ + gid_t groups [1024]; + int i, ngroups; + + ngroups = getgroups (1024, groups); + if (ngroups < 0) { + perror ("getgroups"); + return FALSE; + } + + for (i = 0; i < ngroups; ++i) { + if (groups[i] == id_group) + return TRUE; + } + + return FALSE; +} + +static gboolean +ubuntu_is_admin () +{ + struct group *admin_group; + + admin_group = getgrnam ("admin"); + if (admin_group != NULL && ubuntu_is_in_admin_group (admin_group->gr_gid)) + return TRUE; + + admin_group = getgrnam ("sudo"); + if (admin_group != NULL && ubuntu_is_in_admin_group (admin_group->gr_gid)) + return TRUE; + + return FALSE; +} + +static void +ubuntu_reset_system_proxy (GDBusProxy *proxy, const gchar *protocol) +{ + GVariant *result; + GError *error = NULL; + + result = g_dbus_proxy_call_sync (proxy, "set_proxy", + g_variant_new ("(ss)", protocol, ""), + G_DBUS_CALL_FLAGS_NONE, + -1, NULL, &error); + if (result) + g_variant_unref (result); + else { + g_warning ("Error while calling set_proxy for %s protocol: %s", protocol, error->message); + g_error_free (error); + } +} + +static void +ubuntu_set_proxy_for_protocol (GDBusProxy *proxy, const gchar *protocol, GSettings *settings) +{ + GVariant *result; + gchar *proxy_str, *host; + GError *error = NULL; + gint port; + + host = g_settings_get_string (settings, "host"); + port = g_settings_get_int (settings, "port"); + + if (host && *host == '\0') { + ubuntu_reset_system_proxy (proxy, protocol); + } else { + proxy_str = g_strdup_printf ("%s://%s:%i/", protocol, host, port); + + result = g_dbus_proxy_call_sync (proxy, "set_proxy", + g_variant_new ("(ss)", protocol, proxy_str), + G_DBUS_CALL_FLAGS_NONE, + -1, NULL, &error); + if (result) + g_variant_unref (result); + else { + g_warning ("Error while calling set_proxy for %s protocol: %s", protocol, error->message); + g_error_free (error); + } + g_free (proxy_str); + } + + /* Free memory */ + g_free (host); + g_object_unref (settings); +} + +static void +ubuntu_on_proxy_apply_system_settings (GtkButton *button, gpointer user_data) +{ + GDBusConnection *bus; + GDBusProxy *dbus_proxy; + GError *error; + GDesktopProxyMode proxy_mode; + NetProxy *proxy = NET_PROXY (user_data); + + error = NULL; + bus = g_bus_get_sync (G_BUS_TYPE_SYSTEM, NULL, &error); + if (!bus) { + g_warning ("Could not retrieve system bus: %s", error->message); + g_error_free (error); + + return; + } + + dbus_proxy = g_dbus_proxy_new_sync (bus, 0, NULL, + "com.ubuntu.SystemService", + "/", + "com.ubuntu.SystemService", + NULL, + &error); + if (!dbus_proxy) { + g_warning ("Could not retrieve bus object: %s", error->message); + g_error_free (error); + + return; + } + + /* Retrieve the current settings */ + proxy_mode = g_settings_get_enum (proxy->priv->settings, "mode"); + switch (proxy_mode) { + case G_DESKTOP_PROXY_MODE_AUTO: + case G_DESKTOP_PROXY_MODE_NONE: + ubuntu_reset_system_proxy (dbus_proxy, "http"); + ubuntu_reset_system_proxy (dbus_proxy, "https"); + ubuntu_reset_system_proxy (dbus_proxy, "ftp"); + ubuntu_reset_system_proxy (dbus_proxy, "socks"); + break; + case G_DESKTOP_PROXY_MODE_MANUAL: + ubuntu_set_proxy_for_protocol (dbus_proxy, "http", g_settings_get_child (proxy->priv->settings, "http")); + ubuntu_set_proxy_for_protocol (dbus_proxy, "https", g_settings_get_child (proxy->priv->settings, "https")); + ubuntu_set_proxy_for_protocol (dbus_proxy, "ftp", g_settings_get_child (proxy->priv->settings, "ftp")); + ubuntu_set_proxy_for_protocol (dbus_proxy, "socks", g_settings_get_child (proxy->priv->settings, "socks")); + break; + } + + /* Free memory */ + g_object_unref (dbus_proxy); +} + static void net_proxy_init (NetProxy *proxy) { @@ -369,6 +517,13 @@ "label_proxy_status")); gtk_label_set_label (GTK_LABEL (widget), ""); + /* Ubuntu button for system proxy settings */ + if (ubuntu_is_admin ()) { + g_signal_connect (G_OBJECT (gtk_builder_get_object (proxy->priv->builder, "system_proxy_button")), "clicked", + G_CALLBACK (ubuntu_on_proxy_apply_system_settings), proxy); + } else + gtk_widget_hide (GTK_WIDGET (gtk_builder_get_object (proxy->priv->builder, "system_proxy_button"))); + /* hide the switch until we get some more detail in the mockup */ widget = GTK_WIDGET (gtk_builder_get_object (proxy->priv->builder, "device_proxy_off_switch")); Index: gnome-control-center-3.6.3/panels/network/network-proxy.ui =================================================================== --- gnome-control-center-3.6.3.orig/panels/network/network-proxy.ui 2013-04-16 16:14:41.159226157 +0200 +++ gnome-control-center-3.6.3/panels/network/network-proxy.ui 2013-04-16 16:14:41.155226157 +0200 @@ -280,6 +280,21 @@ + + Apply system wide + True + True + True + False + + + 0 + 7 + 3 + 1 + + + True False @@ -290,7 +305,7 @@ 0 - 7 + 8 3 1 debian/patches/git_shell_use_view_style_class.patch0000664000000000000000000000224212321533756020134 0ustar From 688695dbec168b55d9510818d8197ccbdcdf45e4 Mon Sep 17 00:00:00 2001 From: Cosimo Cecchi Date: Wed, 5 Dec 2012 09:36:12 -0500 Subject: [PATCH] shell: use the "view" style class for the main viewport Currently, gnome-themes-standard sets a white background on all GtkViewport widgets. We want to stop rendering one by default, so add a style class to the main viewport that ensures it gets the same background as the icon views it packs inside. https://bugzilla.gnome.org/show_bug.cgi?id=689700 --- shell/shell.ui | 3 +++ 1 file changed, 3 insertions(+) diff --git a/shell/shell.ui b/shell/shell.ui index 60b084c..718cc16 100644 --- a/shell/shell.ui +++ b/shell/shell.ui @@ -129,6 +129,9 @@ True queue none + True -- 1.8.0.1 debian/patches/54_enable_alt_tap_in_shortcut.patch0000664000000000000000000000507312321533756017537 0ustar Index: gnome-control-center-3.6.3/panels/keyboard/keyboard-shortcuts.c =================================================================== --- gnome-control-center-3.6.3.orig/panels/keyboard/keyboard-shortcuts.c 2012-11-21 18:09:33.690816155 +0100 +++ gnome-control-center-3.6.3/panels/keyboard/keyboard-shortcuts.c 2012-11-21 18:09:34.222816183 +0100 @@ -1716,7 +1716,7 @@ gtk_tree_view_append_column (treeview, column); renderer = (GtkCellRenderer *) g_object_new (GTK_TYPE_CELL_RENDERER_ACCEL, - "accel-mode", GTK_CELL_RENDERER_ACCEL_MODE_OTHER, + "accel-mode", GTK_CELL_RENDERER_ACCEL_MODE_MODIFIER_TAP, NULL); g_signal_connect (treeview, "button_press_event", Index: gnome-control-center-3.6.3/panels/keyboard/cc-keyboard-item.c =================================================================== --- gnome-control-center-3.6.3.orig/panels/keyboard/cc-keyboard-item.c 2012-05-24 16:20:10.000000000 +0200 +++ gnome-control-center-3.6.3/panels/keyboard/cc-keyboard-item.c 2012-11-21 18:09:34.222816183 +0100 @@ -143,14 +143,25 @@ const char *value, gboolean set_backend) { + /* don't reassign or key in the callback to the binding itself (as it's invalid for the cell renderer) */ + if ((g_strcmp0 (value, "") == 0) || (g_strcmp0 (value, "") == 0)) + return; + g_free (item->binding); item->binding = g_strdup (value); binding_from_string (item->binding, &item->keyval, &item->keycode, &item->mask); + const char *key; + char *cheated_modifier = NULL; + if (g_strcmp0 (item->binding, "Alt_L") == 0) + cheated_modifier = g_strdup_printf ("<%s>", item->binding); + if (set_backend == FALSE) return; - settings_set_binding (item->settings, item->key, item->binding); + settings_set_binding (item->settings, item->key, cheated_modifier ? cheated_modifier: item->binding); + + g_free (cheated_modifier); } const char * @@ -441,6 +452,13 @@ item->settings = g_settings_new (item->schema); item->binding = settings_get_binding (item->settings, item->key); item->editable = g_settings_is_writable (item->settings, item->key); + + if ((g_strcmp0 (item->binding, "") == 0) || (g_strcmp0 (item->binding, "") == 0)) + { + g_free (item->binding); + item->binding = g_strdup ("Alt_L"); + } + binding_from_string (item->binding, &item->keyval, &item->keycode, &item->mask); signal_name = g_strdup_printf ("changed::%s", item->key); debian/patches/deal_with_null_ssid.patch0000664000000000000000000000307512321533756015670 0ustar From: Dan Williams Subject: Avoid crashing when SSIDs are NULL. Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/gnome-control-center/+bug/908670 Bug: https://bugzilla.gnome.org/show_bug.cgi?id=672922 --- panels/network/cc-network-panel.c | 6 ++++++ 1 file changed, 6 insertions(+) Index: gnome-control-center-3.5.2/panels/network/cc-network-panel.c =================================================================== --- gnome-control-center-3.5.2.orig/panels/network/cc-network-panel.c 2012-06-08 16:49:24.888332382 +1200 +++ gnome-control-center-3.5.2/panels/network/cc-network-panel.c 2012-06-08 17:00:13.600309923 +1200 @@ -1128,13 +1128,19 @@ if (aps != NULL) for (i = 0; i < aps->len; i++) { ap = NM_ACCESS_POINT (g_ptr_array_index (aps, i)); + + /* Hidden SSIDs don't get shown in the list */ ssid = nm_access_point_get_ssid (ap); + if (!ssid) + continue; + add_ap = TRUE; /* get already added list */ for (j=0; jlen; j++) { ap_tmp = NM_ACCESS_POINT (g_ptr_array_index (aps_unique, j)); ssid_tmp = nm_access_point_get_ssid (ap_tmp); + g_assert (ssid_tmp); /* is this the same type and data? */ if (nm_utils_same_ssid (ssid, ssid_tmp, TRUE)) { debian/patches/sanitize_ssid_convert_utf8.patch0000664000000000000000000000627512321533756017237 0ustar From: Mathieu Trudel-Lapierre Subject: Properly convert an access point SSID into a format that can be displayed. Use nm_utils_ssid_to_utf8() as used elsewhere in the code, rather than using nm_utils_escape_ssid() (which doesn't in fact convert into an UTF8 string), so that we have something sane that can be passed to g_markup_escape_text(). --- panels/network/net-device-wifi.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) Index: b/panels/network/net-device-wifi.c =================================================================== --- a/panels/network/net-device-wifi.c +++ b/panels/network/net-device-wifi.c @@ -150,7 +150,7 @@ add_access_point (NetDeviceWifi *device_ ssid = nm_access_point_get_ssid (ap); if (ssid == NULL) return; - ssid_text = nm_utils_escape_ssid (ssid->data, ssid->len); + ssid_text = nm_utils_ssid_to_utf8 (ssid); title = g_markup_escape_text (ssid_text, -1); is_active_ap = active && nm_utils_same_ssid (ssid, nm_access_point_get_ssid (active), TRUE); @@ -172,6 +172,7 @@ add_access_point (NetDeviceWifi *device_ COLUMN_AP_OUT_OF_RANGE, FALSE, COLUMN_AP_IS_SAVED, FALSE, -1); + g_free (ssid_text); g_free (title); } @@ -531,7 +532,7 @@ add_saved_connection (NetDeviceWifi *dev return; ssid = nm_setting_wireless_get_ssid (NM_SETTING_WIRELESS (setting)); - ssid_text = nm_utils_escape_ssid (ssid->data, ssid->len); + ssid_text = nm_utils_ssid_to_utf8 (ssid); title = g_markup_escape_text (ssid_text, -1); g_debug ("got saved %s", title); @@ -559,6 +560,7 @@ add_saved_connection (NetDeviceWifi *dev COLUMN_AP_IS_SAVED, TRUE, -1); g_free (title); + g_free (ssid_text); } static void @@ -1074,7 +1076,7 @@ wireless_try_to_connect (NetDeviceWifi * const gchar *ap_object_path) { const GByteArray *ssid; - const gchar *ssid_tmp; + const gchar *ssid_tmp = NULL; GSList *list, *l; GSList *filtered; NMConnection *connection_activate = NULL; @@ -1112,15 +1114,18 @@ wireless_try_to_connect (NetDeviceWifi * ssid = nm_setting_wireless_get_ssid (setting_wireless); if (ssid == NULL) continue; - ssid_tmp = nm_utils_escape_ssid (ssid->data, ssid->len); + ssid_tmp = nm_utils_ssid_to_utf8 (ssid); if (g_strcmp0 (ssid_target, ssid_tmp) == 0) { g_debug ("we found an existing connection %s to activate!", nm_connection_get_id (connection)); connection_activate = connection; break; } + g_free (ssid_tmp); + ssid_tmp = NULL; } + g_free (ssid_tmp); g_slist_free (list); g_slist_free (filtered); debian/patches/more-power-suspend-options.patch0000664000000000000000000000171612321533756017120 0ustar Description: Add 20 minutes and 2 hours options to give the user more fine-grained controls. Author: Jian-Ding Chen (timchen119) Last-Update: 2013-10-24 Bug-Ubuntu: https:/launchpad.net/bugs/1244065 Index: b/panels/power/power.ui =================================================================== --- a/panels/power/power.ui +++ b/panels/power/power.ui @@ -40,6 +40,10 @@ 600 + 20 minutes + 1200 + + 30 minutes 1800 @@ -48,6 +52,10 @@ 3600 + 2 hours + 7200 + + Don't suspend 0 debian/patches/git_keyboard_grp_xkb_option.patch0000664000000000000000000000526612321533756017427 0ustar From 5b98213b04627f57c55d54b10f03351c9381ccc9 Mon Sep 17 00:00:00 2001 From: Rui Matos Date: Mon, 1 Apr 2013 20:22:16 +0200 Subject: [PATCH] keyboard: Add the XKB option for the input source switch shortcut Mutter now uses the "grp" XKB option to implement a special modifiers-only shortcut use by gnome-shell to switch input sources. https://bugzilla.gnome.org/show_bug.cgi?id=700346 --- panels/keyboard/cc-keyboard-option.c | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/panels/keyboard/cc-keyboard-option.c b/panels/keyboard/cc-keyboard-option.c index 33cb415..7a94f66 100644 --- a/panels/keyboard/cc-keyboard-option.c +++ b/panels/keyboard/cc-keyboard-option.c @@ -39,6 +39,7 @@ #define XKB_OPTION_GROUP_LVL3 "lv3" #define XKB_OPTION_GROUP_COMP "Compose key" +#define XKB_OPTION_GROUP_GRP "grp" enum { @@ -97,6 +98,32 @@ static const gchar *xkb_option_comp_whitelist[] = { NULL }; +/* This list must be kept in sync with what mutter is able to + * handle. */ +static const gchar *xkb_option_grp_whitelist[] = { + "grp:toggle", + "grp:lalt_toggle", + "grp:lwin_toggle", + "grp:rwin_toggle", + "grp:lshift_toggle", + "grp:rshift_toggle", + "grp:lctrl_toggle", + "grp:rctrl_toggle", + "grp:sclk_toggle", + "grp:menu_toggle", + "grp:caps_toggle", + "grp:shift_caps_toggle", + "grp:alt_caps_toggle", + "grp:alt_space_toggle", + "grp:ctrl_shift_toggle", + "grp:lctrl_lshift_toggle", + "grp:rctrl_rshift_toggle", + "grp:ctrl_alt_toggle", + "grp:alt_shift_toggle", + "grp:lalt_lshift_toggle", + NULL +}; + static GList *objects_list = NULL; GType cc_keyboard_option_get_type (void); @@ -233,6 +260,8 @@ cc_keyboard_option_constructed (GObject *object) self->whitelist = xkb_option_lvl3_whitelist; else if (g_str_equal (self->group, XKB_OPTION_GROUP_COMP)) self->whitelist = xkb_option_comp_whitelist; + else if (g_str_equal (self->group, XKB_OPTION_GROUP_GRP)) + self->whitelist = xkb_option_grp_whitelist; else g_assert_not_reached (); @@ -328,6 +357,11 @@ cc_keyboard_option_get_all (void) "group", XKB_OPTION_GROUP_COMP, "description", _("Compose Key"), NULL)); + objects_list = g_list_prepend (objects_list, + g_object_new (CC_TYPE_KEYBOARD_OPTION, + "group", XKB_OPTION_GROUP_GRP, + "description", _("Modifiers-only switch to next source"), + NULL)); return objects_list; } -- 1.9.1 debian/patches/git_new_goa_build.patch0000664000000000000000000000601612321533756015313 0ustar https://bugzilla.gnome.org/show_bug.cgi?id=693261 --- Index: gnome-control-center-3.6.3/panels/online-accounts/cc-online-accounts-model.c =================================================================== --- gnome-control-center-3.6.3.orig/panels/online-accounts/cc-online-accounts-model.c 2013-06-14 11:32:21.024067503 +0200 +++ gnome-control-center-3.6.3/panels/online-accounts/cc-online-accounts-model.c 2013-06-14 11:32:21.016067502 +0200 @@ -330,8 +330,8 @@ icon = g_icon_new_for_string (goa_account_get_provider_icon (account), &error); if (icon == NULL) { - goa_warning ("Error creating GIcon for account: %s (%s, %d)", - error->message, g_quark_to_string (error->domain), error->code); + g_warning ("Error creating GIcon for account: %s (%s, %d)", + error->message, g_quark_to_string (error->domain), error->code); g_error_free (error); } @@ -370,7 +370,7 @@ GtkTreeIter iter; if (!find_iter_for_object (model, object, &iter)) { - goa_warning ("Error removing object %s - not in tree", g_dbus_object_get_object_path (G_DBUS_OBJECT (object))); + g_warning ("Error removing object %s - not in tree", g_dbus_object_get_object_path (G_DBUS_OBJECT (object))); } else { @@ -385,7 +385,7 @@ GtkTreeIter iter; if (!find_iter_for_object (model, object, &iter)) { - goa_warning ("Error updating object %s - not in tree", g_dbus_object_get_object_path (G_DBUS_OBJECT (object))); + g_warning ("Error updating object %s - not in tree", g_dbus_object_get_object_path (G_DBUS_OBJECT (object))); } else { Index: gnome-control-center-3.6.3/panels/online-accounts/cc-online-accounts-panel.c =================================================================== --- gnome-control-center-3.6.3.orig/panels/online-accounts/cc-online-accounts-panel.c 2013-06-14 11:32:21.024067503 +0200 +++ gnome-control-center-3.6.3/panels/online-accounts/cc-online-accounts-panel.c 2013-06-14 11:32:21.020067502 +0200 @@ -147,8 +147,8 @@ GNOMECC_UI_DIR "/online-accounts.ui", &error) == 0) { - goa_warning ("Error loading UI file: %s (%s, %d)", - error->message, g_quark_to_string (error->domain), error->code); + g_warning ("Error loading UI file: %s (%s, %d)", + error->message, g_quark_to_string (error->domain), error->code); g_error_free (error); goto out; } @@ -189,8 +189,8 @@ panel->client = goa_client_new_sync (NULL /* GCancellable */, &error); if (panel->client == NULL) { - goa_warning ("Error getting a GoaClient: %s (%s, %d)", - error->message, g_quark_to_string (error->domain), error->code); + g_warning ("Error getting a GoaClient: %s (%s, %d)", + error->message, g_quark_to_string (error->domain), error->code); w = GTK_WIDGET (gtk_builder_get_object (panel->builder, "goa-top-widget")); gtk_widget_set_sensitive (w, FALSE); g_error_free (error); debian/patches/53_use_ubuntu_help.patch0000664000000000000000000002656712321533756015404 0ustar Description: Use pre-installed Ubuntu Desktop Guide instead of GNOME help when running Unity Forwarded: not-needed Author: Jeremy Bicha Index: gnome-control-center-3.6.2/panels/bluetooth/cc-bluetooth-panel.c =================================================================== --- gnome-control-center-3.6.2.orig/panels/bluetooth/cc-bluetooth-panel.c 2012-11-02 19:29:55.031315523 -0400 +++ gnome-control-center-3.6.2/panels/bluetooth/cc-bluetooth-panel.c 2012-11-02 19:29:57.639315414 -0400 @@ -72,7 +72,10 @@ static const char * cc_bluetooth_panel_get_help_uri (CcPanel *panel) { - return "help:gnome-help/bluetooth"; + if (!g_strcmp0(g_getenv("XDG_CURRENT_DESKTOP"), "Unity")) + return "help:ubuntu-help/bluetooth"; + else + return "help:gnome-help/bluetooth"; } static void Index: gnome-control-center-3.6.2/panels/color/cc-color-panel.c =================================================================== --- gnome-control-center-3.6.2.orig/panels/color/cc-color-panel.c 2012-11-02 19:29:55.031315523 -0400 +++ gnome-control-center-3.6.2/panels/color/cc-color-panel.c 2012-11-02 19:30:52.679313112 -0400 @@ -2285,7 +2285,10 @@ static const char * cc_color_panel_get_help_uri (CcPanel *panel) { - return "help:gnome-help/color"; + if (!g_strcmp0(g_getenv("XDG_CURRENT_DESKTOP"), "Unity")) + return "help:ubuntu-help/color"; + else + return "help:gnome-help/color"; } static void @@ -2567,6 +2570,12 @@ g_signal_connect (widget, "realize", G_CALLBACK (gcm_prefs_window_realize_cb), prefs); + + widget = WID (priv->builder, "linkbutton_help"); + if (!g_strcmp0(g_getenv("XDG_CURRENT_DESKTOP"), "Unity")) + g_object_set (G_OBJECT (widget), + "uri", "help:ubuntu-help/color-whyimportant", + NULL); } void Index: gnome-control-center-3.6.2/panels/datetime/cc-datetime-panel.c =================================================================== --- gnome-control-center-3.6.2.orig/panels/datetime/cc-datetime-panel.c 2012-11-02 19:29:55.031315523 -0400 +++ gnome-control-center-3.6.2/panels/datetime/cc-datetime-panel.c 2012-11-02 19:29:57.639315414 -0400 @@ -178,7 +178,10 @@ static const char * cc_date_time_panel_get_help_uri (CcPanel *panel) { - return "help:gnome-help/clock"; + if (!g_strcmp0(g_getenv("XDG_CURRENT_DESKTOP"), "Unity")) + return "help:ubuntu-help/clock"; + else + return "help:gnome-help/clock"; } static void Index: gnome-control-center-3.6.2/panels/display/cc-display-panel.c =================================================================== --- gnome-control-center-3.6.2.orig/panels/display/cc-display-panel.c 2012-11-02 19:29:55.031315523 -0400 +++ gnome-control-center-3.6.2/panels/display/cc-display-panel.c 2012-11-02 19:29:57.643315414 -0400 @@ -205,7 +205,10 @@ static const char * cc_display_panel_get_help_uri (CcPanel *panel) { - return "help:gnome-help/prefs-display"; + if (!g_strcmp0(g_getenv("XDG_CURRENT_DESKTOP"), "Unity")) + return "help:ubuntu-help/prefs-display"; + else + return "help:gnome-help/prefs-display"; } static void Index: gnome-control-center-3.6.2/panels/mouse/cc-mouse-panel.c =================================================================== --- gnome-control-center-3.6.2.orig/panels/mouse/cc-mouse-panel.c 2012-11-02 19:29:55.031315523 -0400 +++ gnome-control-center-3.6.2/panels/mouse/cc-mouse-panel.c 2012-11-02 19:29:57.643315414 -0400 @@ -107,7 +107,10 @@ static const char * cc_mouse_panel_get_help_uri (CcPanel *panel) { - return "help:gnome-help/mouse"; + if (!g_strcmp0(g_getenv("XDG_CURRENT_DESKTOP"), "Unity")) + return "help:ubuntu-help/mouse"; + else + return "help:gnome-help/mouse"; } static void Index: gnome-control-center-3.6.2/panels/network/cc-network-panel.c =================================================================== --- gnome-control-center-3.6.2.orig/panels/network/cc-network-panel.c 2012-11-02 19:29:55.031315523 -0400 +++ gnome-control-center-3.6.2/panels/network/cc-network-panel.c 2012-11-02 19:29:57.643315414 -0400 @@ -232,7 +232,10 @@ static const char * cc_network_panel_get_help_uri (CcPanel *panel) { - return "help:gnome-help/net"; + if (!g_strcmp0(g_getenv("XDG_CURRENT_DESKTOP"), "Unity")) + return "help:ubuntu-help/net"; + else + return "help:gnome-help/net"; } static void Index: gnome-control-center-3.6.2/panels/online-accounts/cc-online-accounts-panel.c =================================================================== --- gnome-control-center-3.6.2.orig/panels/online-accounts/cc-online-accounts-panel.c 2012-11-02 19:29:55.031315523 -0400 +++ gnome-control-center-3.6.2/panels/online-accounts/cc-online-accounts-panel.c 2012-11-02 19:29:57.643315414 -0400 @@ -256,7 +256,10 @@ static const char * goa_panel_get_help_uri (CcPanel *panel) { - return "help:gnome-help/accounts"; + if (!g_strcmp0(g_getenv("XDG_CURRENT_DESKTOP"), "Unity")) + return "help:ubuntu-help/accounts"; + else + return "help:gnome-help/accounts"; } static void Index: gnome-control-center-3.6.2/panels/power/cc-power-panel.c =================================================================== --- gnome-control-center-3.6.2.orig/panels/power/cc-power-panel.c 2012-11-02 19:29:55.031315523 -0400 +++ gnome-control-center-3.6.2/panels/power/cc-power-panel.c 2012-11-02 19:29:57.647315413 -0400 @@ -124,7 +124,10 @@ static const char * cc_power_panel_get_help_uri (CcPanel *panel) { - return "help:gnome-help/power"; + if (!g_strcmp0(g_getenv("XDG_CURRENT_DESKTOP"), "Unity")) + return "help:ubuntu-help/power"; + else + return "help:gnome-help/power"; } static void Index: gnome-control-center-3.6.2/panels/printers/cc-printers-panel.c =================================================================== --- gnome-control-center-3.6.2.orig/panels/printers/cc-printers-panel.c 2012-11-02 19:29:55.031315523 -0400 +++ gnome-control-center-3.6.2/panels/printers/cc-printers-panel.c 2012-11-02 19:29:57.647315413 -0400 @@ -251,7 +251,10 @@ static const char * cc_printers_panel_get_help_uri (CcPanel *panel) { - return "help:gnome-help/printing"; + if (!g_strcmp0(g_getenv("XDG_CURRENT_DESKTOP"), "Unity")) + return "help:ubuntu-help/printing"; + else + return "help:gnome-help/printing"; } static void Index: gnome-control-center-3.6.2/panels/screen/cc-screen-panel.c =================================================================== --- gnome-control-center-3.6.2.orig/panels/screen/cc-screen-panel.c 2012-11-02 19:29:55.031315523 -0400 +++ gnome-control-center-3.6.2/panels/screen/cc-screen-panel.c 2012-11-02 19:29:57.647315413 -0400 @@ -146,7 +146,10 @@ static const char * cc_screen_panel_get_help_uri (CcPanel *panel) { - return "help:gnome-help/prefs-display"; + if (!g_strcmp0(g_getenv("XDG_CURRENT_DESKTOP"), "Unity")) + return "help:ubuntu-help/prefs-display"; + else + return "help:gnome-help/prefs-display"; } static void Index: gnome-control-center-3.6.2/panels/sound/cc-sound-panel.c =================================================================== --- gnome-control-center-3.6.2.orig/panels/sound/cc-sound-panel.c 2012-11-02 19:29:55.031315523 -0400 +++ gnome-control-center-3.6.2/panels/sound/cc-sound-panel.c 2012-11-02 19:29:57.647315413 -0400 @@ -70,7 +70,10 @@ static const char * cc_sound_panel_get_help_uri (CcPanel *panel) { - return "help:gnome-help/media#sound"; + if (!g_strcmp0(g_getenv("XDG_CURRENT_DESKTOP"), "Unity")) + return "help:ubuntu-help/media#sound"; + else + return "help:gnome-help/media#sound"; } static void Index: gnome-control-center-3.6.2/panels/universal-access/cc-ua-panel.c =================================================================== --- gnome-control-center-3.6.2.orig/panels/universal-access/cc-ua-panel.c 2012-11-02 19:29:55.031315523 -0400 +++ gnome-control-center-3.6.2/panels/universal-access/cc-ua-panel.c 2012-11-02 19:29:57.651315413 -0400 @@ -159,7 +159,10 @@ static const char * cc_ua_panel_get_help_uri (CcPanel *panel) { - return "help:gnome-help/a11y"; + if (!g_strcmp0(g_getenv("XDG_CURRENT_DESKTOP"), "Unity")) + return "help:ubuntu-help/a11y"; + else + return "help:gnome-help/a11y"; } static void Index: gnome-control-center-3.6.2/panels/user-accounts/um-password-dialog.c =================================================================== --- gnome-control-center-3.6.2.orig/panels/user-accounts/um-password-dialog.c 2012-11-02 19:29:55.031315523 -0400 +++ gnome-control-center-3.6.2/panels/user-accounts/um-password-dialog.c 2012-11-02 19:29:57.651315413 -0400 @@ -523,9 +523,14 @@ widget = (GtkWidget *) gtk_builder_get_object (builder, "password-normal-strength-hints-label"); old_label = gtk_label_get_label (GTK_LABEL (widget)); - label = g_strdup_printf ("%s", - "help:gnome-help/user-goodpassword", - old_label); + if (!g_strcmp0(g_getenv("XDG_CURRENT_DESKTOP"), "Unity")) + label = g_strdup_printf ("%s", + "help:ubuntu-help/user-goodpassword", + old_label); + else + label = g_strdup_printf ("%s", + "help:gnome-help/user-goodpassword", + old_label); gtk_label_set_markup (GTK_LABEL (widget), label); g_free (label); Index: gnome-control-center-3.6.2/panels/user-accounts/um-user-panel.c =================================================================== --- gnome-control-center-3.6.2.orig/panels/user-accounts/um-user-panel.c 2012-11-02 19:29:55.031315523 -0400 +++ gnome-control-center-3.6.2/panels/user-accounts/um-user-panel.c 2012-11-02 19:29:57.651315413 -0400 @@ -1372,7 +1372,10 @@ static const char * um_user_panel_get_help_uri (CcPanel *panel) { - return "help:gnome-help/user-accounts"; + if (!g_strcmp0(g_getenv("XDG_CURRENT_DESKTOP"), "Unity")) + return "help:ubuntu-help/user-accounts"; + else + return "help:gnome-help/user-accounts"; } static void Index: gnome-control-center-3.6.2/panels/wacom/cc-wacom-panel.c =================================================================== --- gnome-control-center-3.6.2.orig/panels/wacom/cc-wacom-panel.c 2012-11-02 19:29:55.031315523 -0400 +++ gnome-control-center-3.6.2/panels/wacom/cc-wacom-panel.c 2012-11-02 19:29:57.651315413 -0400 @@ -123,7 +123,10 @@ static const char * cc_wacom_panel_get_help_uri (CcPanel *panel) { - return "help:gnome-help/wacom"; + if (!g_strcmp0(g_getenv("XDG_CURRENT_DESKTOP"), "Unity")) + return "help:ubuntu-help/wacom"; + else + return "help:gnome-help/wacom"; } static void Index: gnome-control-center-3.6.2/shell/control-center.c =================================================================== --- gnome-control-center-3.6.2.orig/shell/control-center.c 2012-11-02 19:29:55.031315523 -0400 +++ gnome-control-center-3.6.2/shell/control-center.c 2012-11-02 19:30:16.431314628 -0400 @@ -175,8 +175,12 @@ if (panel) uri = cc_panel_get_help_uri (panel); - - gtk_show_uri (gtk_widget_get_screen (window), + if (!g_strcmp0(g_getenv("XDG_CURRENT_DESKTOP"), "Unity")) + gtk_show_uri (gtk_widget_get_screen (window), + uri ? uri : "help:ubuntu-help/prefs", + GDK_CURRENT_TIME, NULL); + else + gtk_show_uri (gtk_widget_get_screen (window), uri ? uri : "help:gnome-help/prefs", GDK_CURRENT_TIME, NULL); } debian/patches/ubuntu_update_translations_template.patch0000664000000000000000000000214312321533756021227 0ustar # Description: files to translate from ubuntu patches Index: gnome-control-center-3.6.3/po/POTFILES.in =================================================================== --- gnome-control-center-3.6.3.orig/po/POTFILES.in 2014-02-26 19:01:53.387678617 +0100 +++ gnome-control-center-3.6.3/po/POTFILES.in 2014-02-26 19:02:22.587679589 +0100 @@ -98,6 +98,9 @@ panels/sound/gvc-speaker-test.c panels/sound/gvc-stream-status-icon.c panels/sound/sound-theme-file-utils.c +panels/sound-nua/data/gnome-sound-nua-panel.desktop.in.in +panels/sound-nua/gvc-balance-bar.c +panels/sound-nua/gvc-mixer-dialog.c panels/universal-access/cc-ua-panel.c panels/universal-access/gnome-universal-access-panel.desktop.in.in [type: gettext/glade]panels/universal-access/uap.ui @@ -131,7 +134,10 @@ [type: gettext/glade]panels/wacom/gnome-wacom-properties.ui panels/wacom/gsd-wacom-device.c [type: gettext/glade]panels/wacom/wacom-stylus-page.ui +shell/cc-shell-nav-bar.c shell/control-center.c shell/gnomecc.directory.in shell/gnome-control-center.desktop.in.in [type: gettext/glade]shell/shell.ui +panels/display/cc-rr-labeler.c + debian/patches/99_add_lock-on-suspend.patch0000664000000000000000000000740112321533756016023 0ustar Description: Add a new preference to lock the screen when the system suspends. Author: Marc Deslauriers Forwarded: no, likely a Ubuntu-specific preference Bug-Ubuntu: https://bugs.launchpad.net/bugs/938076 Index: b/panels/screen/cc-screen-panel.c =================================================================== --- a/panels/screen/cc-screen-panel.c +++ b/panels/screen/cc-screen-panel.c @@ -540,6 +540,13 @@ update_lock_screen_sensitivity (self); + /* bind the screen lock suspend checkbutton */ + widget = WID ("screen_lock_suspend_checkbutton"); + g_settings_bind (self->priv->lock_settings, + "ubuntu-lock-on-suspend", + widget, "active", + G_SETTINGS_BIND_DEFAULT); + widget = WID ("screen_vbox"); gtk_widget_reparent (widget, (GtkWidget *) self); g_object_set (self, "valign", GTK_ALIGN_START, NULL); Index: b/panels/screen/screen.ui =================================================================== --- a/panels/screen/screen.ui +++ b/panels/screen/screen.ui @@ -299,6 +299,31 @@ + + True + False + 6 + + + Require my password when waking from suspend + False + True + True + + + False + False + 0 + + + + + False + False + 2 + + + False True @@ -340,7 +365,7 @@ True True - 2 + 3 @@ -357,7 +382,7 @@ True True - 3 + 4 debian/patches/60_ubuntu_nav_bar.patch0000664000000000000000000003455112321533756015176 0ustar # Description: set a navigation bar in the g-c-c shell # UbuntuSpecific: yes # === modified file 'shell/Makefile.am' Index: gnome-control-center-3.6.3/shell/Makefile.am =================================================================== --- gnome-control-center-3.6.3.orig/shell/Makefile.am 2012-10-01 11:39:00.000000000 +0200 +++ gnome-control-center-3.6.3/shell/Makefile.am 2012-11-22 10:20:59.485282338 +0100 @@ -26,6 +26,8 @@ cc-shell-item-view.h \ cc-shell-model.c \ cc-shell-model.h \ + cc-shell-nav-bar.c \ + cc-shell-nav-bar.h \ cc-editable-entry.c \ cc-editable-entry.h \ cc-panel.c \ Index: gnome-control-center-3.6.3/shell/cc-shell-marshal.list =================================================================== --- gnome-control-center-3.6.3.orig/shell/cc-shell-marshal.list 2011-11-07 18:22:02.000000000 +0100 +++ gnome-control-center-3.6.3/shell/cc-shell-marshal.list 2012-11-22 10:20:56.873282212 +0100 @@ -1 +1,2 @@ VOID:STRING,STRING,STRING +VOID:VOID Index: gnome-control-center-3.6.3/shell/cc-shell-nav-bar.c =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 +++ gnome-control-center-3.6.3/shell/cc-shell-nav-bar.c 2012-11-22 10:20:56.873282212 +0100 @@ -0,0 +1,150 @@ +/* + * Copyright 2012 Canonical + * + * The Control Center is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by the + * Free Software Foundation; either version 2 of the License, or (at your + * option) any later version. + * + * The Control Center is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * for more details. + * + * You should have received a copy of the GNU General Public License along + * with the Control Center; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + * + * Author: Aurélien Gâteau + */ + +#include "cc-shell-nav-bar.h" +#include "cc-shell-marshal.h" + +#include + +G_DEFINE_TYPE (CcShellNavBar, cc_shell_nav_bar, GTK_TYPE_BOX) + +#define SHELL_NAV_BAR_PRIVATE(o) \ + (G_TYPE_INSTANCE_GET_PRIVATE ((o), CC_TYPE_SHELL_NAV_BAR, CcShellNavBarPrivate)) + +struct _CcShellNavBarPrivate +{ + GtkWidget *home_button; + GtkWidget *detail_button; +}; + +enum +{ + HOME_CLICKED, + LAST_SIGNAL +}; + +static guint signals[LAST_SIGNAL] = {0,}; + +static void +cc_shell_nav_bar_get_property (GObject *object, + guint property_id, + GValue *value, + GParamSpec *pspec) +{ + switch (property_id) + { + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); + } +} + +static void +cc_shell_nav_bar_set_property (GObject *object, + guint property_id, + const GValue *value, + GParamSpec *pspec) +{ + switch (property_id) + { + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); + } +} + +static void +cc_shell_nav_bar_dispose (GObject *object) +{ + G_OBJECT_CLASS (cc_shell_nav_bar_parent_class)->dispose (object); +} + +static void +cc_shell_nav_bar_finalize (GObject *object) +{ + G_OBJECT_CLASS (cc_shell_nav_bar_parent_class)->finalize (object); +} + +static void +home_button_clicked_cb (GtkButton *button, + CcShellNavBar *bar) +{ + g_signal_emit (bar, signals[HOME_CLICKED], 0); +} + +static void +cc_shell_nav_bar_class_init (CcShellNavBarClass *klass) +{ + GObjectClass *object_class = G_OBJECT_CLASS (klass); + + g_type_class_add_private (klass, sizeof (CcShellNavBarPrivate)); + + object_class->get_property = cc_shell_nav_bar_get_property; + object_class->set_property = cc_shell_nav_bar_set_property; + object_class->dispose = cc_shell_nav_bar_dispose; + object_class->finalize = cc_shell_nav_bar_finalize; + + signals[HOME_CLICKED] = g_signal_new ("home-clicked", + CC_TYPE_SHELL_NAV_BAR, + G_SIGNAL_RUN_FIRST, + 0, + NULL, + NULL, + cc_shell_marshal_VOID__VOID, + G_TYPE_NONE, + 0); +} + +static void +cc_shell_nav_bar_init (CcShellNavBar *self) +{ + self->priv = SHELL_NAV_BAR_PRIVATE (self); + self->priv->home_button = gtk_button_new_with_mnemonic (_("_All Settings")); + self->priv->detail_button = gtk_button_new(); + + gtk_box_pack_start (GTK_BOX(self), self->priv->home_button, FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX(self), self->priv->detail_button, FALSE, FALSE, 0); + + gtk_widget_show (self->priv->home_button); + + g_signal_connect (self->priv->home_button, "clicked", + G_CALLBACK (home_button_clicked_cb), self); + + GtkStyleContext *context = gtk_widget_get_style_context (GTK_WIDGET(self)); + gtk_style_context_add_class (context, GTK_STYLE_CLASS_LINKED); + gtk_style_context_add_class (context, "breadcrumbs"); +} + +GtkWidget * +cc_shell_nav_bar_new (void) +{ + return g_object_new (CC_TYPE_SHELL_NAV_BAR, NULL); +} + +void +cc_shell_nav_bar_show_detail_button (CcShellNavBar *bar, const gchar *label) +{ + gtk_widget_show (bar->priv->detail_button); + gtk_button_set_label (GTK_BUTTON (bar->priv->detail_button), label); +} + +void +cc_shell_nav_bar_hide_detail_button (CcShellNavBar *bar) +{ + gtk_widget_hide (bar->priv->detail_button); +} Index: gnome-control-center-3.6.3/shell/cc-shell-nav-bar.h =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 +++ gnome-control-center-3.6.3/shell/cc-shell-nav-bar.h 2012-11-22 10:20:56.877282212 +0100 @@ -0,0 +1,76 @@ +/* + * Copyright 2012 Canonical + * + * The Control Center is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by the + * Free Software Foundation; either version 2 of the License, or (at your + * option) any later version. + * + * The Control Center is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * for more details. + * + * You should have received a copy of the GNU General Public License along + * with the Control Center; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + * + * Author: Aurélien Gâteau + */ + +#ifndef _CC_SHELL_NAV_BAR_H +#define _CC_SHELL_NAV_BAR_H + +#include + +G_BEGIN_DECLS + +#define CC_TYPE_SHELL_NAV_BAR cc_shell_nav_bar_get_type() + +#define CC_SHELL_NAV_BAR(obj) \ + (G_TYPE_CHECK_INSTANCE_CAST ((obj), \ + CC_TYPE_SHELL_NAV_BAR, CcShellNavBar)) + +#define CC_SHELL_NAV_BAR_CLASS(klass) \ + (G_TYPE_CHECK_CLASS_CAST ((klass), \ + CC_TYPE_SHELL_NAV_BAR, CcShellNavBarClass)) + +#define CC_IS_SHELL_NAV_BAR(obj) \ + (G_TYPE_CHECK_INSTANCE_TYPE ((obj), \ + CC_TYPE_SHELL_NAV_BAR)) + +#define CC_IS_SHELL_NAV_BAR_CLASS(klass) \ + (G_TYPE_CHECK_CLASS_TYPE ((klass), \ + CC_TYPE_SHELL_NAV_BAR)) + +#define CC_SHELL_NAV_BAR_GET_CLASS(obj) \ + (G_TYPE_INSTANCE_GET_CLASS ((obj), \ + CC_TYPE_SHELL_NAV_BAR, CcShellNavBarClass)) + +typedef struct _CcShellNavBar CcShellNavBar; +typedef struct _CcShellNavBarClass CcShellNavBarClass; +typedef struct _CcShellNavBarPrivate CcShellNavBarPrivate; + +struct _CcShellNavBar +{ + GtkBox parent; + + CcShellNavBarPrivate *priv; +}; + +struct _CcShellNavBarClass +{ + GtkBoxClass parent_class; +}; + +GType cc_shell_nav_bar_get_type (void) G_GNUC_CONST; + +GtkWidget *cc_shell_nav_bar_new (void); + +void cc_shell_nav_bar_show_detail_button (CcShellNavBar *bar, const gchar *label); + +void cc_shell_nav_bar_hide_detail_button (CcShellNavBar *bar); + +G_END_DECLS + +#endif /* _CC_SHELL_NAV_BAR_H */ Index: gnome-control-center-3.6.3/shell/gnome-control-center.c =================================================================== --- gnome-control-center-3.6.3.orig/shell/gnome-control-center.c 2012-11-22 10:20:56.833282210 +0100 +++ gnome-control-center-3.6.3/shell/gnome-control-center.c 2012-11-22 10:20:59.485282338 +0100 @@ -38,6 +38,7 @@ #include "cc-shell.h" #include "cc-shell-category-view.h" #include "cc-shell-model.h" +#include "cc-shell-nav-bar.h" G_DEFINE_TYPE (GnomeControlCenter, gnome_control_center, CC_TYPE_SHELL) @@ -75,6 +76,7 @@ GtkWidget *search_entry; GtkWidget *lock_button; GPtrArray *custom_widgets; + GtkWidget *nav_bar; GMenuTree *menu_tree; GtkListStore *store; @@ -237,6 +239,7 @@ /* switch to the new panel */ gtk_widget_show (box); notebook_select_page (priv->notebook, box); + cc_shell_nav_bar_show_detail_button (CC_SHELL_NAV_BAR(shell->priv->nav_bar), name); /* set the title of the window */ icon_name = get_icon_name_from_g_icon (gicon); @@ -299,6 +302,8 @@ /* clear any custom widgets */ _shell_remove_all_custom_widgets (priv); + + cc_shell_nav_bar_hide_detail_button (CC_SHELL_NAV_BAR (priv->nav_bar)); } void @@ -902,11 +907,8 @@ child = notebook_get_selected_page (GTK_WIDGET (notebook)); - /* make sure the home button is shown on all pages except the overview page */ - if (child == priv->scrolled_window || child == priv->search_scrolled) { - gtk_widget_hide (W (priv->builder, "home-button")); gtk_widget_show (W (priv->builder, "search-entry")); gtk_widget_hide (W (priv->builder, "lock-button")); @@ -917,7 +919,6 @@ } else { - gtk_widget_show (W (priv->builder, "home-button")); gtk_widget_hide (W (priv->builder, "search-entry")); /* set the scrolled window small so that it doesn't force the window to be larger than this panel */ @@ -1332,6 +1333,7 @@ GError *err = NULL; GnomeControlCenterPrivate *priv; GdkScreen *screen; + GtkWidget *widget; priv = self->priv = CONTROL_CENTER_PRIVATE (self); @@ -1378,8 +1380,14 @@ g_signal_connect (priv->notebook, "notify::page", G_CALLBACK (notebook_page_notify_cb), priv); - g_signal_connect (gtk_builder_get_object (priv->builder, "home-button"), - "clicked", G_CALLBACK (home_button_clicked_cb), self); + priv->nav_bar = cc_shell_nav_bar_new (); + widget = W (priv->builder, "hbox1"); + gtk_box_pack_start (GTK_BOX (widget), priv->nav_bar, FALSE, FALSE, 0); + gtk_box_reorder_child (GTK_BOX (widget), priv->nav_bar, 0); + gtk_widget_show (priv->nav_bar); + + g_signal_connect (priv->nav_bar, + "home-clicked", G_CALLBACK (home_button_clicked_cb), self); /* keep a list of custom widgets to unload on panel change */ priv->custom_widgets = g_ptr_array_new_with_free_func ((GDestroyNotify) g_object_unref); Index: gnome-control-center-3.6.3/shell/shell.ui =================================================================== --- gnome-control-center-3.6.3.orig/shell/shell.ui 2012-11-14 12:42:44.000000000 +0100 +++ gnome-control-center-3.6.3/shell/shell.ui 2012-11-22 10:21:52.369284899 +0100 @@ -34,36 +34,6 @@ True - - True - False - 0 - 1 - none - False - - - False - True - True - True - False - image1 - True - - - All Settings - - - - - - - False - 0 - - - True 1 @@ -93,7 +63,7 @@ - 1 + 0 @@ -172,13 +142,6 @@ - - vertical - - - - - True False debian/patches/12_add_never_turn_screen_off.patch0000664000000000000000000000171712321533756017347 0ustar Index: b/panels/screen/cc-screen-panel.c =================================================================== --- a/panels/screen/cc-screen-panel.c +++ b/panels/screen/cc-screen-panel.c @@ -402,8 +402,7 @@ gtk_tree_model_get (model, &iter, 1, &value_tmp, -1); - if (value == value_tmp || - (value_tmp > value_prev && value < value_tmp)) + if (value == value_tmp) { gtk_combo_box_set_active_iter (combo_box, &iter); return; Index: b/panels/screen/screen.ui =================================================================== --- a/panels/screen/screen.ui +++ b/panels/screen/screen.ui @@ -84,6 +84,10 @@ 1 hour 3600 + + Never + 0 + debian/patches/git_keyboard_update_input_switch.patch0000664000000000000000000000145312321533756020457 0ustar From 4fbf1da650224fa2dda989b8c2935a4267c8e9cc Mon Sep 17 00:00:00 2001 From: Rui Matos Date: Tue, 18 Dec 2012 16:44:34 +0000 Subject: keyboard: Update for the input source switching keybindings move These are now provided by gsettings-desktop-schemas. --- diff --git a/panels/keyboard/01-input-sources.xml.in b/panels/keyboard/01-input-sources.xml.in index b3c4268..2877c48 100644 --- a/panels/keyboard/01-input-sources.xml.in +++ b/panels/keyboard/01-input-sources.xml.in @@ -1,6 +1,6 @@ Date: Thu, 16 May 2013 15:41:17 +0200 Subject: [PATCH] rfkill-glib: Don't use g_assert_not_reached in type_to_string New kernel versions can add new RFKILL types, we should now crash here, just say that we don't know what the switch is. --- panels/network/rfkill-glib.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/panels/network/rfkill-glib.c b/panels/network/rfkill-glib.c index e27ca40..7c9ee3c 100644 --- a/panels/network/rfkill-glib.c +++ b/panels/network/rfkill-glib.c @@ -80,7 +80,7 @@ type_to_string (unsigned int type) case RFKILL_TYPE_WWAN: return "WWAN"; default: - g_assert_not_reached (); + return "UNKNOWN"; } } -- 1.8.3.2 debian/patches/git-add-21_9_display.patch0000664000000000000000000000110112321533756015346 0ustar commit 66576dfe24f93b22146e436aea761bc5a3b547cf Author: Stéphane Graber Date: 2013-01-16 10:18:20 (GMT) display: Add support for 21:9 displays https://bugzilla.gnome.org/show_bug.cgi?id=691803 --- gnome-control-center-3.6.3.orig/panels/display/cc-display-panel.c +++ gnome-control-center-3.6.3/panels/display/cc-display-panel.c @@ -763,6 +763,9 @@ make_resolution_string (int width, int h case 17: aspect = "16:9"; break; + case 23: + aspect = "21:9"; + break; case 12: aspect = "5:4"; break; debian/patches/52_region_language.patch0000664000000000000000000006337512321533756015321 0ustar Description: Adapts the region capplet and the language chooser in the user accounts capplet Forwarded: https://bugzilla.gnome.org/695939, https://bugzilla.gnome.org/695940 Author: Gunnar Hjalmarsson Last-Update: 2013-03-21 Some background that explains the need for this patch: * Ubuntu isn't shipped with all languages installed and all locales generated. Instead the users install the needed language pack(s), and the corresponding locales are generated. * The code in accountsservice for handling languages has been extended via Ubuntu specific patches. That code is shared by multiple packages. Currently those packages are: - gnome-control-center - language-selector (Xubuntu and Lubuntu will keep using the language-selector UI for now) - lightdm (for the language chooser in lightdm-gtk-greeter) With this patch applied, the g-c-c region capplet and the language chooser in the user accounts capplet behave approximately the same way as language-selector. No migration code needed when standard Ubuntu drops the language-selector UI. Compared with how the region capplet in g-c-c works out of the box, this patch results in: * Languages are dealt with using 'll' and 'll_CC' language codes instead of complete locale names. * Selected language is stored in both LANGUAGE and LANG. * Only one language list that shows the translations belonging to the installed language packs (not a 'short' and a 'long' list). * User level settings of language and regional formats are stored as accountsservice properties and in ~/.pam_environment. * All the formats related locale categories set, not just a subset. * Translation @variants, e.g. ca@valencia, are displayed properly. * Locales stored with codeset '.UTF-8' instead of '.utf8'. * The 'common_name' field taken into account when parsing the iso-codes XML files for language names. Index: gnome-control-center-3.6.3/panels/common/cc-common-language.c =================================================================== --- gnome-control-center-3.6.3.orig/panels/common/cc-common-language.c 2013-03-15 17:20:48.939849976 +0100 +++ gnome-control-center-3.6.3/panels/common/cc-common-language.c 2013-03-21 14:22:09.358586554 +0100 @@ -326,6 +326,66 @@ return language; } +gchar * +cc_common_language_get_property (const gchar *prop_name) +{ + GDBusConnection *bus; + gchar *user_path; + GError *error = NULL; + GVariant *properties; + GVariantIter *iter; + gchar *key; + GVariant *value; + gchar *ret = NULL; + + if (g_strcmp0 (prop_name, "Language") != 0 && g_strcmp0 (prop_name, "FormatsLocale") != 0) { + g_warning ("Invalid argument: '%s'", prop_name); + return ret; + } + + bus = g_bus_get_sync (G_BUS_TYPE_SYSTEM, NULL, NULL); + user_path = g_strdup_printf ("/org/freedesktop/Accounts/User%i", getuid ()); + + properties = g_dbus_connection_call_sync (bus, + "org.freedesktop.Accounts", + user_path, + "org.freedesktop.DBus.Properties", + "GetAll", + g_variant_new ("(s)", "org.freedesktop.Accounts.User"), + G_VARIANT_TYPE ("(a{sv})"), + G_DBUS_CALL_FLAGS_NONE, + -1, + NULL, + &error); + if (!properties) { + g_warning ("Error calling GetAll() when retrieving properties for %s: %s", user_path, error->message); + g_error_free (error); + /* g_hash_table_lookup() is not NULL-safe, so don't return NULL */ + if (g_strcmp0 (prop_name, "Language") == 0) + ret = g_strdup ("en"); + else + ret = g_strdup ("en_US.UTF-8"); + goto out; + } + + g_variant_get (properties, "(a{sv})", &iter); + while (g_variant_iter_loop (iter, "{&sv}", &key, &value)) { + if (g_strcmp0 (key, prop_name) == 0) { + g_variant_get (value, "s", &ret); + break; + } + } + + g_variant_unref (properties); + g_variant_iter_free (iter); + +out: + g_object_unref (bus); + g_free (user_path); + + return ret; +} + static void languages_foreach_cb (gpointer key, gpointer value, @@ -407,7 +467,7 @@ char *lang; gboolean found; - lang = cc_common_language_get_current_language (); + lang = cc_common_language_get_property ("Language"); g_debug ("Trying to select lang '%s' in treeview", lang); model = gtk_tree_view_get_model (treeview); found = FALSE; @@ -440,6 +500,7 @@ g_warning ("Could not find current language '%s' in the treeview", lang); } +/* static void add_other_users_language (GHashTable *ht) { @@ -519,6 +580,7 @@ g_object_unref (proxy); } +*/ GHashTable * cc_common_language_get_initial_languages (void) @@ -530,6 +592,7 @@ ht = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_free); /* Add some common languages first */ +/* g_hash_table_insert (ht, g_strdup ("en_US.utf8"), g_strdup (_("English"))); if (gdm_language_has_translations ("en_GB")) g_hash_table_insert (ht, g_strdup ("en_GB.utf8"), g_strdup (_("British English"))); @@ -550,12 +613,29 @@ if (gdm_language_has_translations ("ar") || gdm_language_has_translations ("ar_EG")) g_hash_table_insert (ht, g_strdup ("ar_EG.utf8"), g_strdup (_("Arabic"))); - +*/ /* Add the languages used by other users on the system */ - add_other_users_language (ht); +// add_other_users_language (ht); + + /* Add installed languages */ + gchar *avail_languages; + GError *error = NULL; + if (g_spawn_command_line_sync ("/usr/share/language-tools/language-options", + &avail_languages, NULL, NULL, &error)) { + name = strtok (avail_languages, "\n"); + while (name != NULL) { + language = gdm_get_language_from_name (name, NULL); + g_hash_table_insert (ht, g_strdup (name), language); + name = strtok (NULL, "\n"); + } + g_free (avail_languages); + } else { + g_warning ("Couldn't get available languages: %s", error->message); + g_error_free (error); + } - /* Add current locale */ - name = cc_common_language_get_current_language (); + /* Add current language */ + name = cc_common_language_get_property ("Language"); if (g_hash_table_lookup (ht, name) == NULL) { language = gdm_get_language_from_name (name, NULL); g_hash_table_insert (ht, name, language); Index: gnome-control-center-3.6.3/panels/common/cc-common-language.h =================================================================== --- gnome-control-center-3.6.3.orig/panels/common/cc-common-language.h 2013-03-15 17:20:48.939849976 +0100 +++ gnome-control-center-3.6.3/panels/common/cc-common-language.h 2013-03-15 17:20:48.903849975 +0100 @@ -45,6 +45,7 @@ GHashTable *user_langs); gboolean cc_common_language_has_font (const gchar *locale); gchar *cc_common_language_get_current_language (void); +gchar *cc_common_language_get_property (const gchar *prop_name); GHashTable *cc_common_language_get_initial_languages (void); GHashTable *cc_common_language_get_initial_regions (const gchar *lang); Index: gnome-control-center-3.6.3/panels/common/cc-language-chooser.c =================================================================== --- gnome-control-center-3.6.3.orig/panels/common/cc-language-chooser.c 2013-03-15 17:20:48.939849976 +0100 +++ gnome-control-center-3.6.3/panels/common/cc-language-chooser.c 2013-03-15 17:20:48.919849976 +0100 @@ -105,8 +105,8 @@ user_langs = cc_common_language_get_initial_languages (); - /* Add the current locale first */ - name = cc_common_language_get_current_language (); + /* Add the current language first */ + name = cc_common_language_get_property ("Language"); display = g_hash_table_lookup (user_langs, name); gtk_list_store_append (store, &iter); @@ -118,8 +118,8 @@ g_hash_table_foreach (user_langs, (GHFunc) languages_foreach_cb, store); /* And now the "Other..." selection */ - gtk_list_store_append (store, &iter); - gtk_list_store_set (store, &iter, LOCALE_COL, NULL, DISPLAY_LOCALE_COL, _("Other..."), -1); +// gtk_list_store_append (store, &iter); +// gtk_list_store_set (store, &iter, LOCALE_COL, NULL, DISPLAY_LOCALE_COL, _("Other..."), -1); g_hash_table_destroy (user_langs); } Index: gnome-control-center-3.6.3/panels/common/gdm-languages.c =================================================================== --- gnome-control-center-3.6.3.orig/panels/common/gdm-languages.c 2013-03-15 17:20:48.939849976 +0100 +++ gnome-control-center-3.6.3/panels/common/gdm-languages.c 2013-03-15 17:20:48.923849976 +0100 @@ -224,6 +224,7 @@ const char *codeset, const char *modifier) { + const char *adj_codeset; char *name; g_assert (language[0] != 0); @@ -231,12 +232,17 @@ g_assert (codeset == NULL || codeset[0] != 0); g_assert (modifier == NULL || modifier[0] != 0); + if (g_strcmp0 (codeset, "utf8") == 0) { + adj_codeset = "UTF-8"; + } else + adj_codeset = codeset; + name = g_strdup_printf ("%s%s%s%s%s%s%s", language, territory != NULL? "_" : "", territory != NULL? territory : "", codeset != NULL? "." : "", - codeset != NULL? codeset : "", + codeset != NULL? adj_codeset : "", modifier != NULL? "@" : "", modifier != NULL? modifier : ""); @@ -854,6 +860,7 @@ const char *ccode_longT; const char *ccode; const char *ccode_id; + const char *lang_common_name; const char *lang_name; if (! (g_str_equal (element_name, "iso_639_entry") || g_str_equal (element_name, "iso_639_3_entry")) @@ -865,6 +872,7 @@ ccode_longB = NULL; ccode_longT = NULL; ccode_id = NULL; + lang_common_name = NULL; lang_name = NULL; while (*attr_names && *attr_values) { @@ -901,6 +909,11 @@ } ccode_id = *attr_values; } + } else if (g_str_equal (*attr_names, "common_name")) { + /* skip if empty */ + if (**attr_values) { + lang_common_name = *attr_values; + } } else if (g_str_equal (*attr_names, "name")) { lang_name = *attr_values; } @@ -909,6 +922,10 @@ ++attr_values; } + if (lang_common_name != NULL) { + lang_name = lang_common_name; + } + if (lang_name == NULL) { return; } @@ -1131,6 +1148,7 @@ char *langinfo_codeset; char *translated_language; char *translated_territory; + char *modifier; gboolean is_utf8 = TRUE; g_return_val_if_fail (name != NULL, NULL); @@ -1153,12 +1171,13 @@ language_code = NULL; territory_code = NULL; codeset_code = NULL; + modifier = NULL; gdm_parse_language_name (name, &language_code, &territory_code, &codeset_code, - NULL); + &modifier); if (language_code == NULL) { goto out; @@ -1184,7 +1203,7 @@ translated_territory); } - language_name_get_codeset_details (name, &langinfo_codeset, &is_utf8); +// language_name_get_codeset_details (name, &langinfo_codeset, &is_utf8); if (codeset_code == NULL && langinfo_codeset != NULL) { codeset_code = g_strdup (langinfo_codeset); @@ -1196,6 +1215,10 @@ codeset_code); } + if (modifier != NULL) { + g_string_append_printf (full_language, " - %s", modifier); + } + out: g_free (language_code); g_free (territory_code); @@ -1203,6 +1226,7 @@ g_free (langinfo_codeset); g_free (translated_language); g_free (translated_territory); + g_free (modifier); if (full_language->len == 0) { g_string_free (full_language, TRUE); Index: gnome-control-center-3.6.3/panels/region/gnome-region-panel-formats.c =================================================================== --- gnome-control-center-3.6.3.orig/panels/region/gnome-region-panel-formats.c 2013-03-15 17:20:48.939849976 +0100 +++ gnome-control-center-3.6.3/panels/region/gnome-region-panel-formats.c 2013-03-15 17:20:48.927849976 +0100 @@ -31,6 +31,7 @@ #include "cc-language-chooser.h" #include "gdm-languages.h" #include "gnome-region-panel-formats.h" +#include "gnome-region-panel-system.h" static void display_date (GtkLabel *label, GDateTime *dt, const gchar *format) @@ -149,6 +150,46 @@ g_free (active_id); } +static void +set_formats_locale (const gchar *formats_locale) +{ + GDBusProxy *proxy; + GError *error = NULL; + gchar *user_path; + GVariant *ret; + + user_path = g_strdup_printf ("/org/freedesktop/Accounts/User%i", getuid ()); + proxy = g_dbus_proxy_new_for_bus_sync (G_BUS_TYPE_SYSTEM, + G_DBUS_PROXY_FLAGS_NONE, + NULL, + "org.freedesktop.Accounts", + user_path, + "org.freedesktop.Accounts.User", + NULL, + &error); + if (!proxy) { + g_warning ("Couldn't get accountsservice proxy for %s: %s", user_path, error->message); + g_error_free (error); + g_free (user_path); + return; + } + + ret = g_dbus_proxy_call_sync (proxy, + "SetFormatsLocale", + g_variant_new ("(s)", formats_locale), + G_DBUS_CALL_FLAGS_NONE, + -1, + NULL, + &error); + if (!ret) { + g_warning ("Couldn't set FormatsLocale: %s", error->message); + g_error_free (error); + } else + g_variant_unref (ret); + + g_object_unref (proxy); + g_free (user_path); +} static void update_settings_cb (GtkTreeSelection *selection, gpointer user_data) @@ -159,7 +200,6 @@ gchar *active_id; GtkWidget *treeview; GSettings *locale_settings; - gchar *current_setting; if (!gtk_tree_selection_get_selected (selection, &model, &iter)) { return; @@ -169,13 +209,10 @@ treeview = GTK_WIDGET (gtk_builder_get_object (builder, "region_selector")); locale_settings = g_object_get_data (G_OBJECT (treeview), "settings"); - current_setting = g_settings_get_string (locale_settings, "region"); - if (g_strcmp0 (active_id, current_setting) != 0) { - g_settings_set_string (locale_settings, "region", active_id); - } + set_formats_locale (active_id); + locale_settings_changed (locale_settings, NULL, builder); - g_free (current_setting); g_free (active_id); } @@ -184,7 +221,7 @@ { gchar *current_setting; - current_setting = g_settings_get_string (locale_settings, "region"); + current_setting = cc_common_language_get_property ("FormatsLocale"); select_region (treeview, current_setting); g_free (current_setting); } @@ -213,7 +250,6 @@ populate_regions (GtkBuilder *builder, const gchar *current_lang) { gchar *current_region; - GSettings *locale_settings; GHashTable *ht; GHashTableIter htiter; GtkTreeModel *model; @@ -228,11 +264,10 @@ g_signal_handlers_block_by_func (selection, update_settings_cb, builder); model = gtk_tree_view_get_model (GTK_TREE_VIEW (treeview)); - locale_settings = g_object_get_data (G_OBJECT (treeview), "settings"); ht = cc_common_language_get_initial_regions (current_lang); - current_region = g_settings_get_string (locale_settings, "region"); + current_region = cc_common_language_get_property ("FormatsLocale"); if (!current_region || !current_region[0]) { current_region = g_strdup (current_lang); } Index: gnome-control-center-3.6.3/panels/region/gnome-region-panel-system.c =================================================================== --- gnome-control-center-3.6.3.orig/panels/region/gnome-region-panel-system.c 2013-03-15 17:20:48.939849976 +0100 +++ gnome-control-center-3.6.3/panels/region/gnome-region-panel-system.c 2013-03-15 17:48:09.379904608 +0100 @@ -88,7 +88,7 @@ gtk_widget_set_sensitive (button, TRUE); } -static void +void locale_settings_changed (GSettings *settings, const gchar *key, GtkBuilder *dialog) @@ -96,7 +96,7 @@ GtkWidget *label; gchar *region, *display_region; - region = g_settings_get_string (locale_settings, "region"); + region = cc_common_language_get_property ("FormatsLocale"); if (!region || !region[0]) { label = WID ("user_display_language"); region = g_strdup ((gchar*)g_object_get_data (G_OBJECT (label), "language")); @@ -216,6 +216,16 @@ } } +static gchar * +strip_quotes (const gchar *str) +{ + if ((g_str_has_prefix (str, "\"") && g_str_has_suffix (str, "\"")) + || (g_str_has_prefix (str, "'") && g_str_has_suffix (str, "'"))) + return g_strndup (str + 1, strlen (str) - 2); + else + return g_strdup (str); +} + static void on_localed_properties_changed (GDBusProxy *proxy, GVariant *changed_properties, @@ -244,33 +254,43 @@ const gchar **strv; gsize len; gint i; - const gchar *lang, *messages, *time; + gchar *lang, *language, *messages, *time; gchar *name; GtkWidget *label; strv = g_variant_get_strv (v, &len); - lang = messages = time = NULL; + lang = language = messages = time = NULL; for (i = 0; strv[i]; i++) { if (g_str_has_prefix (strv[i], "LANG=")) { - lang = strv[i] + strlen ("LANG="); + lang = strip_quotes (strv[i] + strlen ("LANG=")); + } + else if (g_str_has_prefix (strv[i], "LANGUAGE=")) { + gchar *tmp = strip_quotes (strv[i] + strlen ("LANGUAGE=")); + gchar **tokens = g_strsplit (tmp, ":", 2); + language = g_strdup (tokens[0]); + g_free (tmp); + g_strfreev (tokens); } else if (g_str_has_prefix (strv[i], "LC_MESSAGES=")) { - messages = strv[i] + strlen ("LC_MESSAGES="); + messages = strip_quotes (strv[i] + strlen ("LC_MESSAGES=")); } else if (g_str_has_prefix (strv[i], "LC_TIME=")) { - time = strv[i] + strlen ("LC_TIME="); + time = strip_quotes (strv[i] + strlen ("LC_TIME=")); } } - if (!messages) { - messages = lang; + if (!language) { + if (messages) + language = g_strdup (messages); + else + language = g_strdup (lang); } if (!time) { - time = lang; + time = g_strdup (lang); } - if (messages) { - name = gdm_get_language_from_name (messages, NULL); + if (language) { + name = gdm_get_language_from_name (language, NULL); label = WID ("system_display_language"); gtk_label_set_text (GTK_LABEL (label), name); g_free (name); @@ -285,6 +305,10 @@ g_object_set_data_full (G_OBJECT (label), "region", g_strdup (time), g_free); } g_variant_unref (v); + g_free (lang); + g_free (language); + g_free (messages); + g_free (time); } label = WID ("system_input_source"); @@ -350,27 +374,44 @@ GtkWidget *label; GVariantBuilder *b; gchar *s; + gchar *command; + gchar *lang; + GError *error = NULL; + gint i; label = WID ("user_display_language"); language = g_object_get_data (G_OBJECT (label), "language"); label = WID ("user_format"); region = g_object_get_data (G_OBJECT (label), "region"); + /* Get locale that corresponds to the language */ + command = g_strconcat ("/usr/share/language-tools/language2locale ", language, NULL); + if (!g_spawn_command_line_sync (command, &lang, NULL, NULL, &error)) { + g_warning ("Couldn't get LANG locale: %s", error->message); + g_error_free (error); + g_free (command); + return; + } + g_free (command); + g_strchomp (lang); + if (strlen (lang) == 0) { + g_warning ("Couldn't get LANG locale -- Copying interrupted"); + return; + } + b = g_variant_builder_new (G_VARIANT_TYPE ("as")); - s = g_strconcat ("LANG=", language, NULL); + s = g_strconcat ("LANG=", lang, NULL); g_variant_builder_add (b, "s", s); + g_free (lang); g_free (s); - if (g_strcmp0 (language, region) != 0) { - s = g_strconcat ("LC_TIME=", region, NULL); - g_variant_builder_add (b, "s", s); - g_free (s); - s = g_strconcat ("LC_NUMERIC=", region, NULL); - g_variant_builder_add (b, "s", s); - g_free (s); - s = g_strconcat ("LC_MONETARY=", region, NULL); - g_variant_builder_add (b, "s", s); - g_free (s); - s = g_strconcat ("LC_MEASUREMENT=", region, NULL); + s = g_strconcat ("LANGUAGE=", language, NULL); + g_variant_builder_add (b, "s", s); + g_free (s); + const gchar *format_categories[] = { "LC_NUMERIC", "LC_TIME", + "LC_MONETARY", "LC_PAPER", "LC_IDENTIFICATION", "LC_NAME", + "LC_ADDRESS", "LC_TELEPHONE", "LC_MEASUREMENT", NULL }; + for (i = 0; format_categories[i] != NULL; i++) { + s = g_strconcat (format_categories[i], "=", region, NULL); g_variant_builder_add (b, "s", s); g_free (s); } @@ -525,7 +566,7 @@ g_object_weak_ref (G_OBJECT (dialog), (GWeakNotify) g_object_unref, input_sources_settings); /* Display user settings */ - language = cc_common_language_get_current_language (); + language = cc_common_language_get_property ("Language"); system_update_language (dialog, language); g_free (language); Index: gnome-control-center-3.6.3/panels/region/gnome-region-panel-system.h =================================================================== --- gnome-control-center-3.6.3.orig/panels/region/gnome-region-panel-system.h 2013-03-15 17:20:48.939849976 +0100 +++ gnome-control-center-3.6.3/panels/region/gnome-region-panel-system.h 2013-03-15 17:20:48.927849976 +0100 @@ -27,5 +27,8 @@ void setup_system (GtkBuilder *builder); void system_update_language (GtkBuilder *builder, const gchar *language); +void locale_settings_changed (GSettings *settings, + const gchar *key, + GtkBuilder *dialog); #endif Index: gnome-control-center-3.6.3/panels/region/gnome-region-panel.ui =================================================================== --- gnome-control-center-3.6.3.orig/panels/region/gnome-region-panel.ui 2013-03-15 17:20:48.939849976 +0100 +++ gnome-control-center-3.6.3/panels/region/gnome-region-panel.ui 2013-03-15 17:20:48.931849976 +0100 @@ -192,7 +192,7 @@ - True + False False icons False debian/patches/git-rename-bluetooth-panel.patch0000664000000000000000000001046512321533756017005 0ustar Description: Use the 3.8 filename for the Bluetooth panel so that the Bluetooth Settings link in GNOME Shell 3.8 works Index: gnome-control-center-3.6.3/configure.ac =================================================================== --- gnome-control-center-3.6.3.orig/configure.ac 2013-07-04 00:08:46.849899534 -0400 +++ gnome-control-center-3.6.3/configure.ac 2013-07-04 00:08:46.841899534 -0400 @@ -393,7 +393,7 @@ panels/background/Makefile panels/background/gnome-background-panel.desktop.in panels/bluetooth/Makefile -panels/bluetooth/bluetooth-properties.desktop.in +panels/bluetooth/gnome-bluetooth-panel.desktop.in panels/datetime/Makefile panels/datetime/gnome-datetime-panel.desktop.in panels/datetime/po-timezones/Makefile Index: gnome-control-center-3.6.3/panels/bluetooth/Makefile.am =================================================================== --- gnome-control-center-3.6.3.orig/panels/bluetooth/Makefile.am 2013-07-04 00:08:46.849899534 -0400 +++ gnome-control-center-3.6.3/panels/bluetooth/Makefile.am 2013-07-04 00:08:46.845899534 -0400 @@ -19,8 +19,8 @@ libbluetooth_la_LDFLAGS = $(PANEL_LDFLAGS) desktopdir = $(datadir)/applications -desktop_in_in_files = bluetooth-properties.desktop.in.in -desktop_in_files = bluetooth-properties.desktop.in +desktop_in_in_files = gnome-bluetooth-panel.desktop.in.in +desktop_in_files = gnome-bluetooth-panel.desktop.in desktop_DATA = $(desktop_in_files:.desktop.in=.desktop) @INTLTOOL_DESKTOP_RULE@ Index: gnome-control-center-3.6.3/panels/bluetooth/bluetooth-properties.desktop.in.in =================================================================== --- gnome-control-center-3.6.3.orig/panels/bluetooth/bluetooth-properties.desktop.in.in 2013-07-04 00:08:46.849899534 -0400 +++ /dev/null 1970-01-01 00:00:00.000000000 +0000 @@ -1,15 +0,0 @@ -[Desktop Entry] -_Name=Bluetooth -_Comment=Configure Bluetooth settings -Icon=bluetooth -Exec=gnome-control-center bluetooth -Terminal=false -Type=Application -Categories=GTK;GNOME;Settings;X-GNOME-NetworkSettings;HardwareSettings;X-GNOME-Settings-Panel; -OnlyShowIn=GNOME;Unity; -StartupNotify=true -X-GNOME-Bugzilla-Bugzilla=GNOME -X-GNOME-Bugzilla-Product=gnome-bluetooth -X-GNOME-Bugzilla-Component=properties -X-GNOME-Bugzilla-Version=@VERSION@ -X-GNOME-Settings-Panel=bluetooth Index: gnome-control-center-3.6.3/panels/bluetooth/gnome-bluetooth-panel.desktop.in.in =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 +++ gnome-control-center-3.6.3/panels/bluetooth/gnome-bluetooth-panel.desktop.in.in 2013-07-04 00:08:46.845899534 -0400 @@ -0,0 +1,15 @@ +[Desktop Entry] +_Name=Bluetooth +_Comment=Configure Bluetooth settings +Icon=bluetooth +Exec=gnome-control-center bluetooth +Terminal=false +Type=Application +Categories=GTK;GNOME;Settings;X-GNOME-NetworkSettings;HardwareSettings;X-GNOME-Settings-Panel; +OnlyShowIn=GNOME;Unity; +StartupNotify=true +X-GNOME-Bugzilla-Bugzilla=GNOME +X-GNOME-Bugzilla-Product=gnome-bluetooth +X-GNOME-Bugzilla-Component=properties +X-GNOME-Bugzilla-Version=@VERSION@ +X-GNOME-Settings-Panel=bluetooth Index: gnome-control-center-3.6.3/po/POTFILES.in =================================================================== --- gnome-control-center-3.6.3.orig/po/POTFILES.in 2013-07-04 00:08:46.849899534 -0400 +++ gnome-control-center-3.6.3/po/POTFILES.in 2013-07-04 00:08:46.845899534 -0400 @@ -7,7 +7,7 @@ panels/background/cc-background-item.c panels/background/cc-background-panel.c panels/background/gnome-background-panel.desktop.in.in -panels/bluetooth/bluetooth-properties.desktop.in.in +panels/bluetooth/gnome-bluetooth-panel.desktop.in.in [type: gettext/glade]panels/bluetooth/bluetooth.ui panels/bluetooth/cc-bluetooth-panel.c panels/color/cc-color-panel.c Index: gnome-control-center-3.6.3/po/POTFILES.skip =================================================================== --- gnome-control-center-3.6.3.orig/po/POTFILES.skip 2012-05-24 10:20:11.000000000 -0400 +++ gnome-control-center-3.6.3/po/POTFILES.skip 2013-07-04 00:10:38.653901911 -0400 @@ -1,5 +1,5 @@ panels/background/gnome-background-panel.desktop.in -panels/bluetooth/bluetooth-properties.desktop.in +panels/bluetooth/gnome-bluetooth-panel.desktop.in panels/color/gnome-color-panel.desktop.in panels/datetime/gnome-datetime-panel.desktop.in panels/display/gnome-display-panel.desktop.in debian/patches/gcc_not_in_unity.patch0000664000000000000000000002367612321533756015217 0ustar Index: gnome-control-center-3.6.3/panels/bluetooth/gnome-bluetooth-panel.desktop.in.in =================================================================== --- gnome-control-center-3.6.3.orig/panels/bluetooth/gnome-bluetooth-panel.desktop.in.in 2014-03-04 19:17:38.334473755 +0100 +++ gnome-control-center-3.6.3/panels/bluetooth/gnome-bluetooth-panel.desktop.in.in 2014-03-04 19:17:38.322473754 +0100 @@ -6,7 +6,7 @@ Terminal=false Type=Application Categories=GTK;GNOME;Settings;X-GNOME-NetworkSettings;HardwareSettings;X-GNOME-Settings-Panel; -OnlyShowIn=GNOME;Unity; +OnlyShowIn=GNOME; StartupNotify=true X-GNOME-Bugzilla-Bugzilla=GNOME X-GNOME-Bugzilla-Product=gnome-bluetooth Index: gnome-control-center-3.6.3/panels/color/gnome-color-panel.desktop.in.in =================================================================== --- gnome-control-center-3.6.3.orig/panels/color/gnome-color-panel.desktop.in.in 2014-03-04 19:17:38.334473755 +0100 +++ gnome-control-center-3.6.3/panels/color/gnome-color-panel.desktop.in.in 2014-03-04 19:17:38.322473754 +0100 @@ -7,7 +7,7 @@ Type=Application StartupNotify=true Categories=GNOME;GTK;Settings;X-GNOME-Settings-Panel;HardwareSettings -OnlyShowIn=GNOME;Unity; +OnlyShowIn=GNOME; X-GNOME-Bugzilla-Bugzilla=GNOME X-GNOME-Bugzilla-Product=gnome-control-center X-GNOME-Bugzilla-Component=color Index: gnome-control-center-3.6.3/panels/display/gnome-display-panel.desktop.in.in =================================================================== --- gnome-control-center-3.6.3.orig/panels/display/gnome-display-panel.desktop.in.in 2014-03-04 19:17:38.334473755 +0100 +++ gnome-control-center-3.6.3/panels/display/gnome-display-panel.desktop.in.in 2014-03-04 19:17:38.322473754 +0100 @@ -7,7 +7,7 @@ Type=Application StartupNotify=true Categories=GNOME;GTK;Settings;HardwareSettings;X-GNOME-Settings-Panel; -OnlyShowIn=GNOME;Unity; +OnlyShowIn=GNOME; X-GNOME-Bugzilla-Bugzilla=GNOME X-GNOME-Bugzilla-Product=gnome-control-center X-GNOME-Bugzilla-Component=Screen resolution Index: gnome-control-center-3.6.3/panels/info/gnome-info-panel.desktop.in.in =================================================================== --- gnome-control-center-3.6.3.orig/panels/info/gnome-info-panel.desktop.in.in 2014-03-04 19:17:38.334473755 +0100 +++ gnome-control-center-3.6.3/panels/info/gnome-info-panel.desktop.in.in 2014-03-04 19:17:38.326473755 +0100 @@ -7,7 +7,7 @@ Type=Application StartupNotify=true Categories=GNOME;GTK;Settings;X-GNOME-SystemSettings;X-GNOME-Settings-Panel; -OnlyShowIn=GNOME;Unity; +OnlyShowIn=GNOME; X-GNOME-Bugzilla-Bugzilla=GNOME X-GNOME-Bugzilla-Product=gnome-control-center X-GNOME-Bugzilla-Component=info Index: gnome-control-center-3.6.3/panels/keyboard/gnome-keyboard-panel.desktop.in.in =================================================================== --- gnome-control-center-3.6.3.orig/panels/keyboard/gnome-keyboard-panel.desktop.in.in 2014-03-04 19:17:38.334473755 +0100 +++ gnome-control-center-3.6.3/panels/keyboard/gnome-keyboard-panel.desktop.in.in 2014-03-04 19:17:38.326473755 +0100 @@ -7,7 +7,7 @@ Type=Application StartupNotify=true Categories=GNOME;GTK;Settings;HardwareSettings;X-GNOME-Settings-Panel; -OnlyShowIn=GNOME;Unity; +OnlyShowIn=GNOME; X-GNOME-Bugzilla-Bugzilla=GNOME X-GNOME-Bugzilla-Product=gnome-control-center X-GNOME-Bugzilla-Component=keyboard Index: gnome-control-center-3.6.3/panels/mouse/gnome-mouse-panel.desktop.in.in =================================================================== --- gnome-control-center-3.6.3.orig/panels/mouse/gnome-mouse-panel.desktop.in.in 2014-03-04 19:17:38.334473755 +0100 +++ gnome-control-center-3.6.3/panels/mouse/gnome-mouse-panel.desktop.in.in 2014-03-04 19:17:38.326473755 +0100 @@ -7,7 +7,7 @@ Type=Application StartupNotify=true Categories=GNOME;GTK;Settings;HardwareSettings;X-GNOME-Settings-Panel; -OnlyShowIn=GNOME;Unity; +OnlyShowIn=GNOME; X-GNOME-Bugzilla-Bugzilla=GNOME X-GNOME-Bugzilla-Product=gnome-control-center X-GNOME-Bugzilla-Component=mouse Index: gnome-control-center-3.6.3/panels/network/gnome-network-panel.desktop.in.in =================================================================== --- gnome-control-center-3.6.3.orig/panels/network/gnome-network-panel.desktop.in.in 2014-03-04 19:17:38.334473755 +0100 +++ gnome-control-center-3.6.3/panels/network/gnome-network-panel.desktop.in.in 2014-03-04 19:17:38.326473755 +0100 @@ -7,7 +7,7 @@ Type=Application StartupNotify=true Categories=GNOME;GTK;Settings;HardwareSettings;X-GNOME-Settings-Panel; -OnlyShowIn=GNOME;Unity; +OnlyShowIn=GNOME; X-GNOME-Bugzilla-Bugzilla=GNOME X-GNOME-Bugzilla-Product=gnome-control-center X-GNOME-Bugzilla-Component=network Index: gnome-control-center-3.6.3/panels/power/gnome-power-panel.desktop.in.in =================================================================== --- gnome-control-center-3.6.3.orig/panels/power/gnome-power-panel.desktop.in.in 2014-03-04 19:17:38.334473755 +0100 +++ gnome-control-center-3.6.3/panels/power/gnome-power-panel.desktop.in.in 2014-03-04 19:17:38.326473755 +0100 @@ -7,7 +7,7 @@ Type=Application StartupNotify=true Categories=GNOME;GTK;Settings;DesktopSettings;X-GNOME-Settings-Panel;HardwareSettings -OnlyShowIn=GNOME;Unity; +OnlyShowIn=GNOME; X-GNOME-Bugzilla-Bugzilla=GNOME X-GNOME-Bugzilla-Product=gnome-control-center X-GNOME-Bugzilla-Component=power Index: gnome-control-center-3.6.3/panels/screen/gnome-screen-panel.desktop.in.in =================================================================== --- gnome-control-center-3.6.3.orig/panels/screen/gnome-screen-panel.desktop.in.in 2014-03-04 19:17:38.334473755 +0100 +++ gnome-control-center-3.6.3/panels/screen/gnome-screen-panel.desktop.in.in 2014-03-04 19:17:38.326473755 +0100 @@ -7,7 +7,7 @@ Type=Application StartupNotify=true Categories=GNOME;GTK;Settings;DesktopSettings;X-GNOME-Settings-Panel;X-GNOME-PersonalSettings -OnlyShowIn=GNOME;Unity; +OnlyShowIn=GNOME; X-GNOME-Bugzilla-Bugzilla=GNOME X-GNOME-Bugzilla-Product=gnome-control-center X-GNOME-Bugzilla-Component=screen Index: gnome-control-center-3.6.3/panels/universal-access/gnome-universal-access-panel.desktop.in.in =================================================================== --- gnome-control-center-3.6.3.orig/panels/universal-access/gnome-universal-access-panel.desktop.in.in 2014-03-04 19:17:38.334473755 +0100 +++ gnome-control-center-3.6.3/panels/universal-access/gnome-universal-access-panel.desktop.in.in 2014-03-04 19:17:38.326473755 +0100 @@ -7,7 +7,7 @@ Type=Application StartupNotify=true Categories=GNOME;GTK;Settings;X-GNOME-SystemSettings;X-GNOME-Settings-Panel; -OnlyShowIn=GNOME;Unity; +OnlyShowIn=GNOME; X-GNOME-Bugzilla-Bugzilla=GNOME X-GNOME-Bugzilla-Product=gnome-control-center X-GNOME-Bugzilla-Component=Universal Access Index: gnome-control-center-3.6.3/panels/user-accounts/data/gnome-user-accounts-panel.desktop.in.in =================================================================== --- gnome-control-center-3.6.3.orig/panels/user-accounts/data/gnome-user-accounts-panel.desktop.in.in 2014-03-04 19:17:38.334473755 +0100 +++ gnome-control-center-3.6.3/panels/user-accounts/data/gnome-user-accounts-panel.desktop.in.in 2014-03-04 19:17:38.326473755 +0100 @@ -7,7 +7,7 @@ Type=Application StartupNotify=true Categories=System;Settings;X-GNOME-Settings-Panel;X-GNOME-SystemSettings -OnlyShowIn=GNOME;Unity; +OnlyShowIn=GNOME; X-GNOME-Bugzilla-Bugzilla=GNOME X-GNOME-Bugzilla-Product=gnome-control-center X-GNOME-Bugzilla-Component=user-accounts Index: gnome-control-center-3.6.3/panels/wacom/gnome-wacom-panel.desktop.in.in =================================================================== --- gnome-control-center-3.6.3.orig/panels/wacom/gnome-wacom-panel.desktop.in.in 2014-03-04 19:17:38.334473755 +0100 +++ gnome-control-center-3.6.3/panels/wacom/gnome-wacom-panel.desktop.in.in 2014-03-04 19:17:38.330473755 +0100 @@ -7,7 +7,7 @@ Type=Application StartupNotify=true Categories=GNOME;GTK;Settings;HardwareSettings;X-GNOME-Settings-Panel; -OnlyShowIn=GNOME;Unity; +OnlyShowIn=GNOME; X-GNOME-Bugzilla-Bugzilla=GNOME X-GNOME-Bugzilla-Product=gnome-control-center X-GNOME-Bugzilla-Component=wacom Index: gnome-control-center-3.6.3/shell/gnome-control-center.desktop.in.in =================================================================== --- gnome-control-center-3.6.3.orig/shell/gnome-control-center.desktop.in.in 2014-03-04 19:17:38.334473755 +0100 +++ gnome-control-center-3.6.3/shell/gnome-control-center.desktop.in.in 2014-03-04 19:17:38.330473755 +0100 @@ -6,7 +6,7 @@ Type=Application StartupNotify=true Categories=GNOME;GTK;System; -OnlyShowIn=GNOME;Unity; +OnlyShowIn=GNOME; X-GNOME-Bugzilla-Bugzilla=GNOME X-GNOME-Bugzilla-Product=gnome-control-center X-GNOME-Bugzilla-Component=shell Index: gnome-control-center-3.6.3/panels/region/gnome-region-panel.desktop.in.in =================================================================== --- gnome-control-center-3.6.3.orig/panels/region/gnome-region-panel.desktop.in.in 2012-11-05 09:38:42.000000000 +0100 +++ gnome-control-center-3.6.3/panels/region/gnome-region-panel.desktop.in.in 2014-03-04 19:19:14.274476950 +0100 @@ -7,7 +7,7 @@ Type=Application StartupNotify=true Categories=GNOME;GTK;Settings;DesktopSettings;X-GNOME-Settings-Panel;X-GNOME-PersonalSettings -OnlyShowIn=GNOME;Unity; +OnlyShowIn=GNOME; X-GNOME-Bugzilla-Bugzilla=GNOME X-GNOME-Bugzilla-Product=gnome-control-center X-GNOME-Bugzilla-Component=region Index: gnome-control-center-3.6.3/panels/sound/data/gnome-sound-panel.desktop.in.in =================================================================== --- gnome-control-center-3.6.3.orig/panels/sound/data/gnome-sound-panel.desktop.in.in 2012-11-14 12:42:44.000000000 +0100 +++ gnome-control-center-3.6.3/panels/sound/data/gnome-sound-panel.desktop.in.in 2014-03-04 19:18:47.826476069 +0100 @@ -7,7 +7,7 @@ Type=Application StartupNotify=true Categories=GNOME;GTK;Settings;HardwareSettings;X-GNOME-Settings-Panel; -OnlyShowIn=GNOME;Unity; +OnlyShowIn=GNOME; X-GNOME-Bugzilla-Bugzilla=GNOME X-GNOME-Bugzilla-Product=gnome-control-center X-GNOME-Bugzilla-Component=sound debian/patches/git_set_a11y_wm_theme.patch0000664000000000000000000000444012321533756016027 0ustar From d834ebc3211a11514828b847981784a154924cfc Mon Sep 17 00:00:00 2001 From: Cosimo Cecchi Date: Tue, 13 Nov 2012 14:35:12 +0000 Subject: a11y: also set the WM HighContrast theme when the switch is flipped Now that we have a HighContrast-specific WM theme. https://bugzilla.gnome.org/show_bug.cgi?id=688257 --- diff --git a/panels/universal-access/cc-ua-panel.c b/panels/universal-access/cc-ua-panel.c index 183b58e..7fe97ae 100644 --- a/panels/universal-access/cc-ua-panel.c +++ b/panels/universal-access/cc-ua-panel.c @@ -40,7 +40,7 @@ #define KEY_TEXT_SCALING_FACTOR "text-scaling-factor" #define KEY_GTK_THEME "gtk-theme" #define KEY_ICON_THEME "icon-theme" - +#define KEY_WM_THEME "theme" CC_PANEL_REGISTER (CcUaPanel, cc_ua_panel) @@ -349,19 +349,24 @@ set_contrast_mapping (const GValue *value, gpointer user_data) { gboolean hc; - GSettings *settings = user_data; + CcUaPanel *self = user_data; + CcUaPanelPrivate *priv = self->priv; GVariant *ret = NULL; hc = g_value_get_boolean (value); if (hc) { ret = g_variant_new_string (HIGH_CONTRAST_THEME); - g_settings_set_string (settings, KEY_ICON_THEME, HIGH_CONTRAST_THEME); + g_settings_set_string (priv->interface_settings, KEY_ICON_THEME, HIGH_CONTRAST_THEME); + + g_settings_set_string (priv->wm_settings, KEY_WM_THEME, HIGH_CONTRAST_THEME); } else { - g_settings_reset (settings, KEY_GTK_THEME); - g_settings_reset (settings, KEY_ICON_THEME); + g_settings_reset (priv->interface_settings, KEY_GTK_THEME); + g_settings_reset (priv->interface_settings, KEY_ICON_THEME); + + g_settings_reset (priv->wm_settings, KEY_WM_THEME); } return ret; @@ -377,7 +382,7 @@ cc_ua_panel_init_seeing (CcUaPanel *self) "active", G_SETTINGS_BIND_DEFAULT, get_contrast_mapping, set_contrast_mapping, - priv->interface_settings, + self, NULL); g_settings_bind_with_mapping (priv->interface_settings, KEY_TEXT_SCALING_FACTOR, WID (priv->builder, "seeing_large_text_switch"), debian/patches/56_use_ubuntu_info_branding.patch0000664000000000000000000000215212321533756017236 0ustar Index: b/panels/info/cc-info-panel.c =================================================================== --- a/panels/info/cc-info-panel.c +++ b/panels/info/cc-info-panel.c @@ -1706,6 +1706,8 @@ g_free (text); } + gtk_widget_hide (WID ("version_label")); + glibtop_get_mem (&mem); text = g_format_size_full (mem.total, G_FORMAT_SIZE_IEC_UNITS); widget = WID ("memory_label"); Index: b/panels/info/info.ui =================================================================== --- a/panels/info/info.ui +++ b/panels/info/info.ui @@ -242,7 +242,7 @@ True False - GnomeLogoVerticalMedium.svg + UbuntuLogo.png False debian/patches/unity_no_zoom_controls.patch0000664000000000000000000000231712321533756016505 0ustar Index: gnome-control-center-3.6.3/panels/universal-access/cc-ua-panel.c =================================================================== --- gnome-control-center-3.6.3.orig/panels/universal-access/cc-ua-panel.c 2013-10-07 15:14:01.510776625 +0200 +++ gnome-control-center-3.6.3/panels/universal-access/cc-ua-panel.c 2013-10-07 15:31:38.894811839 +0200 @@ -429,13 +429,21 @@ WID (priv->builder, "seeing_toggle_keys_switch"), "active", G_SETTINGS_BIND_DEFAULT); - priv->shell_watch_id = g_bus_watch_name (G_BUS_TYPE_SESSION, + if (g_strcmp0 (g_getenv ("XDG_CURRENT_DESKTOP"), "Unity")) + { + priv->shell_watch_id = g_bus_watch_name (G_BUS_TYPE_SESSION, "org.gnome.Shell", G_BUS_NAME_WATCHER_FLAGS_NONE, (GBusNameAppearedCallback) shell_appeared_cb, (GBusNameVanishedCallback) shell_vanished_cb, self, NULL); + } else + { + gtk_widget_hide (WID (priv->builder, "zoom_label_box")); + gtk_widget_hide (WID (priv->builder, "zoom_value_box")); + } + g_signal_connect (WID (priv->builder, "seeing_zoom_preferences_button"), "clicked", G_CALLBACK (zoom_options_launch_cb), self); debian/patches/59_install_gcm_components_on_demand.patch0000664000000000000000000001575212321533756020743 0ustar Index: b/panels/color/cc-color-panel.c =================================================================== --- a/panels/color/cc-color-panel.c +++ b/panels/color/cc-color-panel.c @@ -25,6 +25,7 @@ #include #include #include +#include #include "cc-color-panel.h" @@ -260,32 +261,148 @@ } static void -gcm_prefs_calibrate_cb (GtkWidget *widget, CcColorPanel *prefs) +gcm_packagekit_finished_cb (GObject *source, GAsyncResult *res, gpointer user_data) +{ + GPtrArray *argv = (GPtrArray *)user_data; + GVariant *reply; + GError *error = NULL; + gboolean ret; + + reply = g_dbus_proxy_call_finish (G_DBUS_PROXY (source), res, &error); + g_variant_unref (reply); + + if (error != NULL) + { + g_warning ("failed to install required component: %s", error->message); + g_ptr_array_unref (argv); + g_error_free (error); + return; + } + + ret = g_spawn_async (NULL, (gchar**) argv->pdata, NULL, 0, + NULL, NULL, NULL, &error); + g_ptr_array_unref (argv); + if (!ret) + { + g_warning ("failed to run command: %s", error->message); + g_error_free (error); + } +} + +struct gcm_packagekit_closure_data +{ + GPtrArray *argv; + guint xid; +}; + +static void +gcm_packagekit_proxy_ready_cb (GObject *source, GAsyncResult *res, gpointer user_data) +{ + struct gcm_packagekit_closure_data *data = + (struct gcm_packagekit_closure_data *)user_data; + GDBusProxy *session_installer; + GVariantBuilder *builder; + GError *error = NULL; + + session_installer = g_dbus_proxy_new_for_bus_finish (res, &error); + if (error != NULL) + { + g_warning ("failed to connect to PackageKit interface: %s", + error->message); + g_ptr_array_unref (data->argv); + g_free (data); + g_error_free (error); + return; + } + + builder = g_variant_builder_new (G_VARIANT_TYPE ("as")); + g_variant_builder_add (builder, "s", + g_ptr_array_index (data->argv, 0)); + g_dbus_proxy_call (session_installer, + "InstallProvideFiles", + g_variant_new ("(uass)", + data->xid, + builder, + "hide-finished" + ), + G_DBUS_CALL_FLAGS_NONE, + -1, + NULL, + &gcm_packagekit_finished_cb, + data->argv); + + g_free (data); + g_variant_builder_unref (builder); +} + +static void +gcm_prefs_install_component (guint xid, GPtrArray *argv) +{ + struct gcm_packagekit_closure_data *data; + data = g_malloc (sizeof (*data)); + data->argv = argv; + data->xid = xid; + g_ptr_array_ref (data->argv); + + g_dbus_proxy_new_for_bus (G_BUS_TYPE_SESSION, + G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES | + G_DBUS_PROXY_FLAGS_DO_NOT_CONNECT_SIGNALS, + NULL, + "org.freedesktop.PackageKit", + "/org/freedesktop/PackageKit", + "org.freedesktop.PackageKit.Modify", + NULL, + &gcm_packagekit_proxy_ready_cb, + data); +} + +static void +gcm_prefs_run_maybe_install (guint xid, gchar *filename, GPtrArray *argv) { gboolean ret; GError *error = NULL; + + ret = g_spawn_async (NULL, (gchar**) argv->pdata, NULL, 0, + NULL, NULL, NULL, &error); + if (!ret) + { + if ((error->domain == g_spawn_error_quark ()) && + (error->code == G_SPAWN_ERROR_NOENT)) + { + gcm_prefs_install_component (xid, argv); + } + else + { + g_warning ("failed to run command: %s", error->message); + } + g_error_free (error); + } +} + +static void +gcm_prefs_calibrate_cb (GtkWidget *widget, CcColorPanel *prefs) +{ guint xid; GPtrArray *argv; + gchar *calibrater_filename; CcColorPanelPrivate *priv = prefs->priv; /* get xid */ xid = gdk_x11_window_get_xid (gtk_widget_get_window (GTK_WIDGET (priv->main_window))); + calibrater_filename = g_build_filename (BINDIR, "gcm-calibrate", NULL); + /* run with modal set */ argv = g_ptr_array_new_with_free_func (g_free); - g_ptr_array_add (argv, g_build_filename (BINDIR, "gcm-calibrate", NULL)); + g_ptr_array_add (argv, calibrater_filename); g_ptr_array_add (argv, g_strdup ("--device")); g_ptr_array_add (argv, g_strdup (cd_device_get_id (priv->current_device))); g_ptr_array_add (argv, g_strdup ("--parent-window")); g_ptr_array_add (argv, g_strdup_printf ("%i", xid)); g_ptr_array_add (argv, NULL); - ret = g_spawn_async (NULL, (gchar**) argv->pdata, NULL, 0, - NULL, NULL, NULL, &error); - if (!ret) - { - g_warning ("failed to run calibrate: %s", error->message); - g_error_free (error); - } + + gcm_prefs_run_maybe_install (xid, calibrater_filename, argv); + g_ptr_array_unref (argv); } @@ -656,10 +773,9 @@ GtkTreeModel *model; GtkTreeSelection *selection; gchar *options = NULL; + gchar *viewer_filename; GPtrArray *argv = NULL; guint xid; - gboolean ret; - GError *error = NULL; CcColorPanelPrivate *priv = prefs->priv; /* get the selected row */ @@ -677,21 +793,17 @@ /* get xid */ xid = gdk_x11_window_get_xid (gtk_widget_get_window (GTK_WIDGET (priv->main_window))); + viewer_filename = g_build_filename (BINDIR, "gcm-viewer", NULL); /* open up gcm-viewer as a info pane */ argv = g_ptr_array_new_with_free_func (g_free); - g_ptr_array_add (argv, g_build_filename (BINDIR, "gcm-viewer", NULL)); + g_ptr_array_add (argv, viewer_filename); g_ptr_array_add (argv, g_strdup ("--profile")); g_ptr_array_add (argv, g_strdup (cd_profile_get_id (profile))); g_ptr_array_add (argv, g_strdup ("--parent-window")); g_ptr_array_add (argv, g_strdup_printf ("%i", xid)); g_ptr_array_add (argv, NULL); - ret = g_spawn_async (NULL, (gchar**) argv->pdata, NULL, 0, - NULL, NULL, NULL, &error); - if (!ret) - { - g_warning ("failed to run calibrate: %s", error->message); - g_error_free (error); - } + + gcm_prefs_run_maybe_install (xid, viewer_filename, argv); g_ptr_array_unref (argv); g_free (options); @@ -995,7 +1107,6 @@ { GtkWidget *widget; CdDeviceRelation relation; - gchar *s; CcColorPanelPrivate *priv = prefs->priv; /* get profile */ @@ -1026,13 +1137,7 @@ /* allow getting profile info */ widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "toolbutton_profile_view")); - if ((s = g_find_program_in_path ("gcm-viewer"))) - { - gtk_widget_set_sensitive (widget, TRUE); - g_free (s); - } - else - gtk_widget_set_sensitive (widget, FALSE); + gtk_widget_set_sensitive (widget, TRUE); /* hide device specific stuff */ widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, debian/patches/61_workaround_online_account.patch0000664000000000000000000000154312321533756017433 0ustar # Description: Don't show goa in Unity, we use uoa there # Upstream: the change is ubuntu specific # Index: gnome-control-center-3.3.91/panels/online-accounts/gnome-online-accounts-panel.desktop.in.in =================================================================== --- gnome-control-center-3.3.91.orig/panels/online-accounts/gnome-online-accounts-panel.desktop.in.in 2012-03-05 15:04:55.000000000 +0100 +++ gnome-control-center-3.3.91/panels/online-accounts/gnome-online-accounts-panel.desktop.in.in 2012-03-06 17:52:14.907083003 +0100 @@ -7,7 +7,7 @@ Type=Application StartupNotify=true Categories=GNOME;GTK;Settings;DesktopSettings;X-GNOME-Settings-Panel;X-GNOME-PersonalSettings; -OnlyShowIn=GNOME;Unity; +OnlyShowIn=GNOME; X-GNOME-Bugzilla-Bugzilla=GNOME X-GNOME-Bugzilla-Product=gnome-control-center X-GNOME-Bugzilla-Component=Online Accounts debian/patches/58_ubuntu_icon_views_redesign.patch0000664000000000000000000000730012321533756017612 0ustar Index: gnome-control-center-3.6.3/shell/gnome-control-center.c =================================================================== --- gnome-control-center-3.6.3.orig/shell/gnome-control-center.c 2012-11-24 10:39:18.476282140 -0500 +++ gnome-control-center-3.6.3/shell/gnome-control-center.c 2012-11-24 10:52:26.776249171 -0500 @@ -50,7 +50,8 @@ * for the user than resizing vertically * Both sizes are defined in https://live.gnome.org/Design/SystemSettings/ */ #define FIXED_WIDTH 740 -#define FIXED_HEIGHT 636 +#define UNITY_FIXED_WIDTH 850 +#define FIXED_HEIGHT 650 #define SMALL_SCREEN_FIXED_HEIGHT 400 #define MIN_ICON_VIEW_HEIGHT 300 @@ -910,8 +911,12 @@ gtk_widget_show (W (priv->builder, "search-entry")); gtk_widget_hide (W (priv->builder, "lock-button")); - gtk_widget_get_preferred_height_for_width (GTK_WIDGET (priv->main_vbox), - FIXED_WIDTH, NULL, &nat_height); + if (!g_strcmp0(g_getenv("XDG_CURRENT_DESKTOP"), "Unity")) + gtk_widget_get_preferred_height_for_width (GTK_WIDGET (priv->main_vbox), + UNITY_FIXED_WIDTH, NULL, &nat_height); + else + gtk_widget_get_preferred_height_for_width (GTK_WIDGET (priv->main_vbox), + FIXED_WIDTH, NULL, &nat_height); gtk_scrolled_window_set_min_content_height (GTK_SCROLLED_WINDOW (priv->scrolled_window), priv->small_screen == SMALL_SCREEN_TRUE ? SMALL_SCREEN_FIXED_HEIGHT : nat_height); } @@ -921,12 +926,22 @@ gtk_widget_hide (W (priv->builder, "search-entry")); /* set the scrolled window small so that it doesn't force the window to be larger than this panel */ - gtk_widget_get_preferred_height_for_width (GTK_WIDGET (priv->window), - FIXED_WIDTH, NULL, &nat_height); - gtk_scrolled_window_set_min_content_height (GTK_SCROLLED_WINDOW (priv->scrolled_window), MIN_ICON_VIEW_HEIGHT); - gtk_window_resize (GTK_WINDOW (priv->window), - FIXED_WIDTH, - nat_height); + if (!g_strcmp0(g_getenv("XDG_CURRENT_DESKTOP"), "Unity")) { + gtk_widget_get_preferred_height_for_width (GTK_WIDGET (priv->window), + UNITY_FIXED_WIDTH, NULL, &nat_height); + gtk_scrolled_window_set_min_content_height (GTK_SCROLLED_WINDOW (priv->scrolled_window), MIN_ICON_VIEW_HEIGHT); + gtk_window_resize (GTK_WINDOW (priv->window), + UNITY_FIXED_WIDTH, + nat_height); + } + else { + gtk_widget_get_preferred_height_for_width (GTK_WIDGET (priv->window), + FIXED_WIDTH, NULL, &nat_height); + gtk_scrolled_window_set_min_content_height (GTK_SCROLLED_WINDOW (priv->scrolled_window), MIN_ICON_VIEW_HEIGHT); + gtk_window_resize (GTK_WINDOW (priv->window), + FIXED_WIDTH, + nat_height); + } } } @@ -1373,7 +1388,10 @@ /* Main scrolled window */ priv->scrolled_window = W (priv->builder, "scrolledwindow1"); - gtk_widget_set_size_request (priv->scrolled_window, FIXED_WIDTH, -1); + if (!g_strcmp0(g_getenv("XDG_CURRENT_DESKTOP"), "Unity")) + gtk_widget_set_size_request (priv->scrolled_window, UNITY_FIXED_WIDTH, -1); + else + gtk_widget_set_size_request (priv->scrolled_window, FIXED_WIDTH, -1); priv->main_vbox = W (priv->builder, "main-vbox"); g_signal_connect (priv->notebook, "notify::page", G_CALLBACK (notebook_page_notify_cb), priv); debian/patches/classic_use_sound_indicator.patch0000664000000000000000000000062612321533756017414 0ustar Index: b/panels/sound/data/gnome-sound-applet.desktop.in =================================================================== --- a/panels/sound/data/gnome-sound-applet.desktop.in +++ b/panels/sound/data/gnome-sound-applet.desktop.in @@ -14,4 +14,4 @@ #X-GNOME-Autostart-Phase=Panel X-GNOME-Autostart-Notify=true AutostartCondition=GNOME3 if-session gnome-fallback -OnlyShowIn=GNOME;Unity; +OnlyShowIn=; debian/patches/git_hide_unavailable_layout_settings_btn.patch0000664000000000000000000000230412321533756022145 0ustar From 29e0f0b28a52db83b7d4e7fb7e8ebcd4995f4c3b Mon Sep 17 00:00:00 2001 From: Rui Matos Date: Mon, 11 Feb 2013 18:07:06 +0000 Subject: region: Show/hide IBus sources config button Instead of just making it sensitive/unsensitive. Quoting from the bug report: The problem is that it isn't clear to the user why the settings button is insensitive for keyboard layouts - they'll be asking "why can't I ever use the settings?" https://bugzilla.gnome.org/show_bug.cgi?id=692006 Index: gnome-control-center-3.6.3/panels/region/gnome-region-panel-input.c =================================================================== --- gnome-control-center-3.6.3.orig/panels/region/gnome-region-panel-input.c 2013-09-11 10:27:26.979533097 -0400 +++ gnome-control-center-3.6.3/panels/region/gnome-region-panel-input.c 2013-09-11 10:33:09.507518772 -0400 @@ -1104,7 +1104,7 @@ gtk_widget_set_sensitive (show_button, index >= 0); gtk_widget_set_sensitive (up_button, index > 0); gtk_widget_set_sensitive (down_button, index >= 0 && index < n_active - 1); - gtk_widget_set_sensitive (settings_button, settings_sensitive); + gtk_widget_set_visible (settings_button, settings_sensitive); } static void debian/patches/ubuntu_update_lock_and_power_settings.patch0000664000000000000000000000302212321533756021516 0ustar Description: Update for changes in gsettings keys for gnome-settings-daemon 3.8 gnome-control-center (1:3.6.3-0ubuntu30~saucy3) saucy; urgency=medium . * Apply git patches to support changes in g-s-d 3.8 * debian/patches: - git_power_gsd_proxies.patch, Use correct interface for dbus proxy. - wacom_update_files_from_gsd.patch, update wacom plugin files from g-s-d Author: Tim Lunn Forwarded: no, Ubuntu Specific --- a/panels/screen/cc-screen-panel.c +++ b/panels/screen/cc-screen-panel.c @@ -350,9 +350,7 @@ 1, &value, -1); - /* set both battery and ac keys */ - g_settings_set_int (self->priv->gsd_settings, "sleep-display-ac", value); - g_settings_set_int (self->priv->gsd_settings, "sleep-display-battery", value); + g_settings_set (self->priv->session_settings, "idle-delay", "u", value); set_idle_delay_from_dpms (self, value); } @@ -398,7 +396,7 @@ i = 0; /* try to make the UI match the AC setting */ - value = g_settings_get_int (self->priv->gsd_settings, "sleep-display-ac"); + g_settings_get (self->priv->session_settings, "idle-delay", "u", &value); do { gtk_tree_model_get (model, &iter, @@ -509,7 +507,7 @@ /* bind the auto dim checkbox */ widget = WID ("screen_auto_reduce_checkbutton"); g_settings_bind (self->priv->gsd_settings, - "idle-dim-battery", + "idle-dim", widget, "active", G_SETTINGS_BIND_DEFAULT); debian/patches/zz_add_fallback_panels_dir.patch0000664000000000000000000000135212321533756017142 0ustar Description: Look in fallback pre-multiarch dir for external panels. Author: Ryan Lortie Origin: ubuntu Forwarded: not-needed diff -r -u gnome-control-center-3.6.3/shell/gnome-control-center.c gnome-control-center-3.6.3+awesome/shell/gnome-control-center.c --- gnome-control-center-3.6.3/shell/gnome-control-center.c 2013-07-08 09:51:42.707462000 -0400 +++ gnome-control-center-3.6.3/shell/gnome-control-center.c 2013-07-08 09:52:37.723462000 -0400 @@ -904,6 +904,9 @@ modules = g_io_modules_load_all_in_directory (PANELS_DIR); g_list_free (modules); + /* hardcoded fallback from pre-multiarching */ + modules = g_io_modules_load_all_in_directory ("/usr/lib/control-center-1/panels"); + g_list_free (modules); } debian/patches/git_rename_natural_scrolling.patch0000664000000000000000000000275012321533756017567 0ustar From 92148a4be791614eaf4582ea540cff82e27134de Mon Sep 17 00:00:00 2001 From: Ondrej Holy Date: Tue, 11 Jun 2013 12:58:28 +0000 Subject: mouse: Rename "Content sticks to fingers" ...to "Natural scrolling". The previous name was a little bit disgusting, and people didn't understand its purpose. Using the same name as OSX means that people will either know it, or be less afraid of testing it. https://bugzilla.gnome.org/show_bug.cgi?id=689128 --- diff --git a/panels/mouse/gnome-mouse-properties.ui b/panels/mouse/gnome-mouse-properties.ui index cd77080..3735903 100644 --- a/panels/mouse/gnome-mouse-properties.ui +++ b/panels/mouse/gnome-mouse-properties.ui @@ -655,7 +655,7 @@ - C_ontent sticks to fingers + _Natural scrolling False True True debian/patches/58_hide_gdm_notifications.patch0000664000000000000000000000147512321533756016663 0ustar Description: Hide "Show notifications when locked" settings when running Unity. You currently need GNOME Shell running on GDM for that to work. Forwarded: not-needed Author: Jeremy Bicha Index: gnome-control-center-3.6.2/panels/screen/cc-screen-panel.c =================================================================== --- gnome-control-center-3.6.2.orig/panels/screen/cc-screen-panel.c 2012-11-03 19:10:00.926617924 -0400 +++ gnome-control-center-3.6.2/panels/screen/cc-screen-panel.c 2012-11-03 19:17:14.902599774 -0400 @@ -545,6 +545,8 @@ "show-notifications", widget, "active", G_SETTINGS_BIND_DEFAULT); + if (!g_strcmp0(g_getenv("XDG_CURRENT_DESKTOP"), "Unity")) + gtk_widget_hide (widget); update_lock_screen_sensitivity (self); debian/patches/git-background-lock-screen.patch0000664000000000000000000010550112321533756016754 0ustar From 074f55e344c4d36fad52acadf344dae9cd7bda75 Mon Sep 17 00:00:00 2001 From: Bastien Nocera Date: Mon, 19 Aug 2013 19:00:48 +0000 Subject: background: Add support for lock screen background https://bugzilla.gnome.org/show_bug.cgi?id=696166 --- --- a/panels/background/background.ui +++ b/panels/background/background.ui @@ -4,115 +4,286 @@ True False + 6 + 6 + 6 + 6 10 12 - 6 - 6 - 6 - 6 - + True False - 6 + 100 + 100 - + True False - 12 - 0 - none - - False + True - True - True - center + False + 12 + 0 + none - - 417 - 250 + True - False + True + True center - 6 - 6 - 6 - 6 - True - True + + + True + False + vertical + + + 310 + 170 + True + False + center + 6 + 6 + 6 + 6 + True + True + + + False + True + 0 + + + + + True + False + Background + + + False + True + 1 + + + + + + True + True + 0 + - - - True - True - 0 - - - - - True - False - 12 - + True False - center - 2 + 12 - + True False - slideshow-symbolic + center + 12 + 2 + + + True + False + slideshow-symbolic + + + False + True + 0 + + + + + True + False + + + + False + True + 1 + + + + + True + False + 0 + Changes throughout the day + + + False + True + 1 + + - False + True True 0 + + + False + True + 2 + + + + + False + True + 0 + + + + + True + False + + + True + False + 12 + 0 + none - + True - False - + True + True + center + + + True + False + vertical + + + 310 + 170 + True + False + center + 6 + 6 + 6 + 6 + True + True + + + False + True + 0 + + + + + True + False + Lock Screen + + + False + True + 1 + + + + - - False - True - 1 - + + + True + True + 0 + + + + + True + False + 12 - + True False - 0 - Changes throughout the day + center + 12 + 2 + + + True + False + slideshow-symbolic + + + False + True + 0 + + + + + True + False + + + + False + True + 1 + + + + + True + False + 0 + Changes throughout the day + + + False + True + 1 + + - False + True True - 1 + 0 - True + False True - 0 + 2 False True - 2 + 1 --- a/panels/background/cc-background-panel.c +++ b/panels/background/cc-background-panel.c @@ -38,6 +38,7 @@ #include "bg-pictures-source.h" #define WP_PATH_ID "org.gnome.desktop.background" +#define WP_LOCK_PATH_ID "org.gnome.desktop.screensaver" #define WP_URI_KEY "picture-uri" #define WP_OPTIONS_KEY "picture-options" #define WP_SHADING_KEY "color-shading-type" @@ -55,10 +56,12 @@ GDBusConnection *connection; GSettings *settings; + GSettings *lock_settings; GnomeDesktopThumbnailFactory *thumb_factory; CcBackgroundItem *current_background; + CcBackgroundItem *current_lock_background; GCancellable *copy_cancellable; GCancellable *capture_cancellable; @@ -70,6 +73,8 @@ }; #define WID(y) (GtkWidget *) gtk_builder_get_object (priv->builder, y) +#define CURRENT_BG (settings == priv->settings ? priv->current_background : priv->current_lock_background) +#define SAVE_PATH (settings == priv->settings ? "last-edited.xml" : "last-edited-lock.xml") static const char * cc_background_panel_get_help_uri (CcPanel *panel) @@ -88,6 +93,7 @@ priv->spinner = NULL; g_clear_object (&priv->settings); + g_clear_object (&priv->lock_settings); if (priv->copy_cancellable) { @@ -124,6 +130,7 @@ CcBackgroundPanelPrivate *priv = CC_BACKGROUND_PANEL (object)->priv; g_clear_object (&priv->current_background); + g_clear_object (&priv->current_lock_background); G_OBJECT_CLASS (cc_background_panel_parent_class)->finalize (object); } @@ -144,59 +151,77 @@ static void update_preview (CcBackgroundPanelPrivate *priv, + GSettings *settings, CcBackgroundItem *item) { gboolean changes_with_time; + CcBackgroundItem *current_background; + + current_background = CURRENT_BG; - if (item && priv->current_background) + if (item && current_background) { - g_object_unref (priv->current_background); - priv->current_background = cc_background_item_copy (item); - cc_background_item_load (priv->current_background, NULL); + g_object_unref (current_background); + current_background = cc_background_item_copy (item); + if (settings == priv->settings) + priv->current_background = current_background; + else + priv->current_lock_background = current_background; + cc_background_item_load (current_background, NULL); } changes_with_time = FALSE; - if (priv->current_background) + if (current_background) { - changes_with_time = cc_background_item_changes_with_time (priv->current_background); + changes_with_time = cc_background_item_changes_with_time (current_background); } - gtk_widget_set_visible (WID ("slide_image"), changes_with_time); - gtk_widget_set_visible (WID ("slide-label"), changes_with_time); + if (settings == priv->settings) + { + gtk_widget_set_visible (WID ("slide_image"), changes_with_time); + gtk_widget_set_visible (WID ("slide-label"), changes_with_time); + + gtk_widget_queue_draw (WID ("background-desktop-drawingarea")); + } + else + { + gtk_widget_set_visible (WID ("slide_image1"), changes_with_time); + gtk_widget_set_visible (WID ("slide-label1"), changes_with_time); - gtk_widget_queue_draw (WID ("background-desktop-drawingarea")); + gtk_widget_queue_draw (WID ("background-lock-drawingarea")); + } } static char * -get_save_path (void) +get_save_path (const char *filename) { return g_build_filename (g_get_user_config_dir (), "gnome-control-center", "backgrounds", - "last-edited.xml", + filename, NULL); } static void -update_display_preview (CcBackgroundPanel *panel) +update_display_preview (CcBackgroundPanel *panel, + GtkWidget *widget, + CcBackgroundItem *current_background) { CcBackgroundPanelPrivate *priv = panel->priv; - GtkWidget *widget; GtkAllocation allocation; - const gint preview_width = 416; - const gint preview_height = 248; + const gint preview_width = 309; + const gint preview_height = 168; GdkPixbuf *pixbuf; GIcon *icon; cairo_t *cr; - widget = WID ("background-desktop-drawingarea"); gtk_widget_get_allocation (widget, &allocation); - if (!priv->current_background) + if (!current_background) return; - icon = cc_background_item_get_frame_thumbnail (priv->current_background, + icon = cc_background_item_get_frame_thumbnail (current_background, priv->thumb_factory, preview_width, preview_height, @@ -211,11 +236,14 @@ g_object_unref (pixbuf); pixbuf = NULL; - if (panel->priv->display_screenshot != NULL) - pixbuf = gdk_pixbuf_scale_simple (panel->priv->display_screenshot, - preview_width, - preview_height, - GDK_INTERP_BILINEAR); + if (current_background == priv->current_background && + panel->priv->display_screenshot != NULL) + { + pixbuf = gdk_pixbuf_scale_simple (panel->priv->display_screenshot, + preview_width, + preview_height, + GDK_INTERP_BILINEAR); + } if (pixbuf) { @@ -260,6 +288,7 @@ error->message); g_error_free (error); /* fallback? */ + priv = panel->priv; goto out; } @@ -307,7 +336,7 @@ cairo_surface_destroy (surface); out: - update_display_preview (panel); + update_display_preview (panel, WID ("background-desktop-drawingarea"), priv->current_background); } static void @@ -356,6 +385,7 @@ cairo_t *cr, CcBackgroundPanel *panel) { + CcBackgroundPanelPrivate *priv = panel->priv; /* we have another shot in flight or an existing cache */ if (panel->priv->display_screenshot == NULL && panel->priv->screenshot_path == NULL) @@ -368,13 +398,24 @@ get_screenshot_async (panel, &rect); } else - update_display_preview (panel); + update_display_preview (panel, widget, priv->current_background); + + return TRUE; +} +static gboolean +on_lock_preview_draw (GtkWidget *widget, + cairo_t *cr, + CcBackgroundPanel *panel) +{ + CcBackgroundPanelPrivate *priv = panel->priv; + update_display_preview (panel, widget, priv->current_lock_background); return TRUE; } static void -reload_current_bg (CcBackgroundPanel *self) +reload_current_bg (CcBackgroundPanel *self, + GSettings *settings) { CcBackgroundPanelPrivate *priv; CcBackgroundItem *saved, *configured; @@ -383,12 +424,12 @@ priv = self->priv; /* Load the saved configuration */ - uri = get_save_path (); + uri = get_save_path (SAVE_PATH); saved = cc_background_xml_get_item (uri); g_free (uri); /* initalise the current background information from settings */ - uri = g_settings_get_string (priv->settings, WP_URI_KEY); + uri = g_settings_get_string (settings, WP_URI_KEY); if (uri && *uri == '\0') { g_free (uri); @@ -404,12 +445,12 @@ configured = cc_background_item_new (uri); g_free (uri); - pcolor = g_settings_get_string (priv->settings, WP_PCOLOR_KEY); - scolor = g_settings_get_string (priv->settings, WP_SCOLOR_KEY); + pcolor = g_settings_get_string (settings, WP_PCOLOR_KEY); + scolor = g_settings_get_string (settings, WP_SCOLOR_KEY); g_object_set (G_OBJECT (configured), "name", _("Current background"), - "placement", g_settings_get_enum (priv->settings, WP_OPTIONS_KEY), - "shading", g_settings_get_enum (priv->settings, WP_SHADING_KEY), + "placement", g_settings_get_enum (settings, WP_OPTIONS_KEY), + "shading", g_settings_get_enum (settings, WP_SHADING_KEY), "primary-color", pcolor, "secondary-color", scolor, NULL); @@ -433,9 +474,17 @@ if (saved != NULL) g_object_unref (saved); - g_clear_object (&priv->current_background); - priv->current_background = configured; - cc_background_item_load (priv->current_background, NULL); + if (settings == priv->settings) + { + g_clear_object (&priv->current_background); + priv->current_background = configured; + } + else + { + g_clear_object (&priv->current_lock_background); + priv->current_lock_background = configured; + } + cc_background_item_load (configured, NULL); } static gboolean @@ -466,6 +515,8 @@ CcBackgroundPanel *panel = (CcBackgroundPanel *) pointer; CcBackgroundPanelPrivate *priv = panel->priv; CcBackgroundItem *item; + CcBackgroundItem *current_background; + GSettings *settings; if (!g_file_copy_finish (G_FILE (source_object), result, &err)) { @@ -477,8 +528,10 @@ g_error_free (err); } item = g_object_get_data (source_object, "item"); + settings = g_object_get_data (source_object, "settings"); + current_background = CURRENT_BG; - g_settings_apply (priv->settings); + g_settings_apply (settings); /* the panel may have been destroyed before the callback is run, so be sure * to check the widgets are not NULL */ @@ -489,19 +542,19 @@ priv->spinner = NULL; } - if (priv->current_background) - cc_background_item_load (priv->current_background, NULL); + if (current_background) + cc_background_item_load (current_background, NULL); if (priv->builder) { char *filename; - update_preview (priv, item); + update_preview (priv, settings, item); /* Save the source XML if there is one */ - filename = get_save_path (); + filename = get_save_path (SAVE_PATH); if (create_save_dir ()) - cc_background_xml_save (priv->current_background, filename); + cc_background_xml_save (current_background, filename); } /* remove the reference taken when the copy was set up */ @@ -510,6 +563,7 @@ static void set_background (CcBackgroundPanel *panel, + GSettings *settings, CcBackgroundItem *item) { CcBackgroundPanelPrivate *priv = panel->priv; @@ -527,8 +581,8 @@ if ((flags & CC_BACKGROUND_ITEM_HAS_URI) && uri == NULL) { - g_settings_set_enum (priv->settings, WP_OPTIONS_KEY, G_DESKTOP_BACKGROUND_STYLE_NONE); - g_settings_set_string (priv->settings, WP_URI_KEY, ""); + g_settings_set_enum (settings, WP_OPTIONS_KEY, G_DESKTOP_BACKGROUND_STYLE_NONE); + g_settings_set_string (settings, WP_URI_KEY, ""); } else if (cc_background_item_get_source_url (item) != NULL && cc_background_item_get_needs_download (item)) @@ -585,6 +639,7 @@ * finished */ g_object_ref (panel); g_object_set_data_full (G_OBJECT (source), "item", g_object_ref (item), g_object_unref); + g_object_set_data (G_OBJECT (source), "settings", settings); g_file_copy_async (source, dest, G_FILE_COPY_OVERWRITE, G_PRIORITY_DEFAULT, priv->copy_cancellable, NULL, NULL, @@ -593,7 +648,7 @@ dest_uri = g_file_get_uri (dest); g_object_unref (dest); - g_settings_set_string (priv->settings, WP_URI_KEY, dest_uri); + g_settings_set_string (settings, WP_URI_KEY, dest_uri); g_object_set (G_OBJECT (item), "uri", dest_uri, "needs-download", FALSE, @@ -607,37 +662,37 @@ } else { - g_settings_set_string (priv->settings, WP_URI_KEY, uri); + g_settings_set_string (settings, WP_URI_KEY, uri); } /* Also set the placement if we have a URI and the previous value was none */ if (flags & CC_BACKGROUND_ITEM_HAS_PLACEMENT) { - g_settings_set_enum (priv->settings, WP_OPTIONS_KEY, cc_background_item_get_placement (item)); + g_settings_set_enum (settings, WP_OPTIONS_KEY, cc_background_item_get_placement (item)); } else if (uri != NULL) { - style = g_settings_get_enum (priv->settings, WP_OPTIONS_KEY); + style = g_settings_get_enum (settings, WP_OPTIONS_KEY); if (style == G_DESKTOP_BACKGROUND_STYLE_NONE) - g_settings_set_enum (priv->settings, WP_OPTIONS_KEY, cc_background_item_get_placement (item)); + g_settings_set_enum (settings, WP_OPTIONS_KEY, cc_background_item_get_placement (item)); } if (flags & CC_BACKGROUND_ITEM_HAS_SHADING) - g_settings_set_enum (priv->settings, WP_SHADING_KEY, cc_background_item_get_shading (item)); + g_settings_set_enum (settings, WP_SHADING_KEY, cc_background_item_get_shading (item)); - g_settings_set_string (priv->settings, WP_PCOLOR_KEY, cc_background_item_get_pcolor (item)); - g_settings_set_string (priv->settings, WP_SCOLOR_KEY, cc_background_item_get_scolor (item)); + g_settings_set_string (settings, WP_PCOLOR_KEY, cc_background_item_get_pcolor (item)); + g_settings_set_string (settings, WP_SCOLOR_KEY, cc_background_item_get_scolor (item)); /* update the preview information */ if (save_settings != FALSE) { /* Apply all changes */ - g_settings_apply (priv->settings); + g_settings_apply (settings); /* Save the source XML if there is one */ - filename = get_save_path (); + filename = get_save_path (SAVE_PATH); if (create_save_dir ()) - cc_background_xml_save (priv->current_background, filename); + cc_background_xml_save (CURRENT_BG, filename); } } @@ -653,7 +708,7 @@ item = cc_background_chooser_dialog_get_item (CC_BACKGROUND_CHOOSER_DIALOG (dialog)); if (item != NULL) { - set_background (self, item); + set_background (self, g_object_get_data (G_OBJECT (dialog), "settings"), item); g_object_unref (item); } } @@ -662,13 +717,14 @@ } static void -on_background_button_clicked (GtkButton *button, - CcBackgroundPanel *self) +launch_chooser (CcBackgroundPanel *self, + GSettings *settings) { CcBackgroundPanelPrivate *priv = self->priv; GtkWidget *dialog; dialog = cc_background_chooser_dialog_new (); + g_object_set_data (G_OBJECT (dialog), "settings", settings); gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (gtk_widget_get_toplevel (WID ("background-panel")))); gtk_widget_show (dialog); @@ -676,12 +732,26 @@ } static void +on_background_button_clicked (GtkButton *button, + CcBackgroundPanel *self) +{ + launch_chooser (self, self->priv->settings); +} + +static void +on_lock_button_clicked (GtkButton *button, + CcBackgroundPanel *self) +{ + launch_chooser (self, self->priv->lock_settings); +} + +static void on_settings_changed (GSettings *settings, gchar *key, CcBackgroundPanel *self) { - reload_current_bg (self); - update_preview (self->priv, NULL); + reload_current_bg (self, settings); + update_preview (self->priv, settings, NULL); } static void @@ -711,6 +781,9 @@ priv->settings = g_settings_new (WP_PATH_ID); g_settings_delay (priv->settings); + priv->lock_settings = g_settings_new (WP_LOCK_PATH_ID); + g_settings_delay (priv->lock_settings); + /* add the top level widget */ widget = WID ("background-panel"); @@ -719,21 +792,30 @@ /* setup preview area */ widget = WID ("background-desktop-drawingarea"); - g_signal_connect (widget, "draw", G_CALLBACK (on_preview_draw), - self); + g_signal_connect (widget, "draw", G_CALLBACK (on_preview_draw), self); + widget = WID ("background-lock-drawingarea"); + g_signal_connect (widget, "draw", G_CALLBACK (on_lock_preview_draw), self); priv->copy_cancellable = g_cancellable_new (); priv->capture_cancellable = g_cancellable_new (); priv->thumb_factory = gnome_desktop_thumbnail_factory_new (GNOME_DESKTOP_THUMBNAIL_SIZE_LARGE); - reload_current_bg (self); - update_preview (priv, NULL); + /* Load the backgrounds */ + reload_current_bg (self, priv->settings); + update_preview (priv, priv->settings, NULL); + reload_current_bg (self, priv->lock_settings); + update_preview (priv, priv->lock_settings, NULL); + /* Background settings */ g_signal_connect (priv->settings, "changed", G_CALLBACK (on_settings_changed), self); + g_signal_connect (priv->lock_settings, "changed", G_CALLBACK (on_settings_changed), self); + /* Background buttons */ widget = WID ("background-set-button"); g_signal_connect (widget, "clicked", G_CALLBACK (on_background_button_clicked), self); + widget = WID ("background-lock-set-button"); + g_signal_connect (widget, "clicked", G_CALLBACK (on_lock_button_clicked), self); } void debian/patches/90_force_fallback.patch0000664000000000000000000000257512321533756015105 0ustar Index: b/panels/info/info.ui =================================================================== --- a/panels/info/info.ui +++ b/panels/info/info.ui @@ -1191,7 +1191,7 @@ - True + False False 1 Forced _Fallback Mode @@ -1240,7 +1240,7 @@ - True + False False start center debian/patches/55_user_accounts_hide_controls.patch0000664000000000000000000001343512321533756017757 0ustar Index: gnome-control-center-3.6.3/panels/user-accounts/um-password-dialog.c =================================================================== --- gnome-control-center-3.6.3.orig/panels/user-accounts/um-password-dialog.c 2013-01-22 15:11:55.971943861 -0500 +++ gnome-control-center-3.6.3/panels/user-accounts/um-password-dialog.c 2013-01-22 15:11:55.959943861 -0500 @@ -52,6 +52,7 @@ GtkWidget *ok_button; UmUser *user; + gboolean using_ecryptfs; GtkWidget *old_password_label; GtkWidget *old_password_entry; @@ -471,6 +472,38 @@ } } +int _is_gdm_running = -1; +gboolean +is_gdm_running (void) +{ + if (_is_gdm_running == -1) { + GDBusProxy *proxy; + gchar *owner_name; + + proxy = g_dbus_proxy_new_for_bus_sync (G_BUS_TYPE_SYSTEM, + G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES | + G_DBUS_PROXY_FLAGS_DO_NOT_CONNECT_SIGNALS | + G_DBUS_PROXY_FLAGS_DO_NOT_AUTO_START, + NULL, + "org.gnome.DisplayManager", + "/org/gnome/DisplayManager/Manager", + "org.gnome.DisplayManager.Manager", + NULL, NULL); + + if (proxy == NULL) + return FALSE; + + owner_name = g_dbus_proxy_get_name_owner (proxy); + + g_object_unref (proxy); + g_free (owner_name); + + _is_gdm_running = (owner_name != NULL) ? 1 : 0; + } + + return _is_gdm_running; +} + UmPasswordDialog * um_password_dialog_new (void) { @@ -591,6 +624,13 @@ G_CALLBACK (entry_size_changed), widget); um->normal_hint_label = widget; + if (!is_gdm_running ()) { + widget = (GtkWidget *) gtk_builder_get_object (builder, "password-normal-hint-label"); + gtk_widget_hide (widget); + gtk_widget_hide (um->normal_hint_entry); + gtk_widget_hide (um->normal_hint_label); + } + um->strength_indicator = (GtkWidget *) gtk_builder_get_object (builder, "strength-indicator"); um->strength_indicator_label = (GtkWidget *) gtk_builder_get_object (builder, "strength-indicator-label"); @@ -625,6 +665,12 @@ gtk_tree_model_get (model, iter, 1, &mode, -1); + if (mode == 1 && !is_gdm_running ()) + return FALSE; + + if (mode == 2 && um->using_ecryptfs) + return FALSE; + if (mode == 3 && locked) return FALSE; @@ -651,6 +697,8 @@ if (user) { um->user = g_object_ref (user); + um->using_ecryptfs = is_using_ecryptfs (um_user_get_user_name (user)); + pixbuf = um_user_render_icon (user, FALSE, 48); gtk_image_set_from_pixbuf (GTK_IMAGE (um->user_icon), pixbuf); g_object_unref (pixbuf); Index: gnome-control-center-3.6.3/panels/user-accounts/um-user-panel.c =================================================================== --- gnome-control-center-3.6.3.orig/panels/user-accounts/um-user-panel.c 2013-01-22 15:11:55.971943861 -0500 +++ gnome-control-center-3.6.3/panels/user-accounts/um-user-panel.c 2013-01-22 15:12:18.031943282 -0500 @@ -629,7 +629,10 @@ /* Autologin: show when local account */ widget = get_widget (d, "autologin-switch"); label = get_widget (d, "autologin-label"); - show = um_user_is_local_account (user); + /* Don't show autologin option if ecryptfs is in use, because it won't + work if user turns it on. */ + show = um_user_is_local_account (user) && + !is_using_ecryptfs (um_user_get_user_name (user)); gtk_widget_set_visible (widget, show); gtk_widget_set_visible (label, show); } Index: gnome-control-center-3.6.3/panels/user-accounts/um-utils.c =================================================================== --- gnome-control-center-3.6.3.orig/panels/user-accounts/um-utils.c 2013-01-22 15:11:55.971943861 -0500 +++ gnome-control-center-3.6.3/panels/user-accounts/um-utils.c 2013-01-22 15:11:55.963943861 -0500 @@ -746,3 +746,27 @@ g_string_free (item3, TRUE); g_string_free (item4, TRUE); } + +gboolean +is_using_ecryptfs (const gchar *name) +{ + gboolean using_ecryptfs = FALSE; + int status; + gchar *prog; + gchar *cmd; + + prog = g_find_program_in_path ("ecryptfs-verify"); + if (prog != NULL) { + gchar *cmd = g_strdup_printf("'%s' -h -u '%s'", prog, name); + + if (g_spawn_command_line_sync (cmd, NULL, NULL, &status, NULL)) { + if (status == 0) + using_ecryptfs = TRUE; + } + + g_free (prog); + g_free (cmd); + } + + return using_ecryptfs; +} Index: gnome-control-center-3.6.3/panels/user-accounts/um-utils.h =================================================================== --- gnome-control-center-3.6.3.orig/panels/user-accounts/um-utils.h 2013-01-22 15:11:55.971943861 -0500 +++ gnome-control-center-3.6.3/panels/user-accounts/um-utils.h 2013-01-22 15:11:55.963943861 -0500 @@ -65,6 +65,8 @@ void generate_username_choices (const gchar *name, GtkListStore *store); +gboolean is_using_ecryptfs (const gchar *name); + G_END_DECLS #endif debian/patches/accounts_fix_unsetting_icon.patch0000664000000000000000000000171412321533756017447 0ustar # Upstream: https://bugzilla.gnome.org/show_bug.cgi?id=673841 # Ubuntu: https://launchpad.net/bugs/978049 # Index: gnome-control-center-3.6.2/panels/user-accounts/um-user.c =================================================================== --- gnome-control-center-3.6.2.orig/panels/user-accounts/um-user.c 2012-11-01 20:44:03.426070880 -0400 +++ gnome-control-center-3.6.2/panels/user-accounts/um-user.c 2012-11-01 20:44:03.442070879 -0400 @@ -730,7 +730,7 @@ GVariant *result; GError *error = NULL; - result = g_dbus_proxy_call_sync (user->proxy, "SetIconFile", g_variant_new ("(s)", icon_file), G_DBUS_CALL_FLAGS_NONE, -1, NULL, &error); + result = g_dbus_proxy_call_sync (user->proxy, "SetIconFile", g_variant_new ("(s)", icon_file ? icon_file : ""), G_DBUS_CALL_FLAGS_NONE, -1, NULL, &error); if (!result) { g_warning ("SetIconFile call failed: %s", error->message); g_error_free (error); debian/patches/git_restore_mouse_speed.patch0000664000000000000000000000255312321533756016572 0ustar From 59467033f1eb293335e4f54a6033e7417af2cd43 Mon Sep 17 00:00:00 2001 From: Ondrej Holy Date: Thu, 02 May 2013 12:29:38 +0000 Subject: mouse: Restore mouse and touchpad pointer speed https://bugzilla.gnome.org/show_bug.cgi?id=699015 --- diff --git a/panels/mouse/gnome-mouse-properties.c b/panels/mouse/gnome-mouse-properties.c index 1336916..36c4067 100644 --- a/panels/mouse/gnome-mouse-properties.c +++ b/panels/mouse/gnome-mouse-properties.c @@ -182,6 +182,9 @@ setup_dialog (GtkBuilder *dialog) g_signal_connect (WID ("pointer_speed_scale"), "value-changed", G_CALLBACK (pointer_speed_scale_event), dialog); + g_settings_bind (mouse_settings, "motion-acceleration", + gtk_range_get_adjustment (GTK_RANGE (WID ("pointer_speed_scale"))), "value", + G_SETTINGS_BIND_DEFAULT); /* Trackpad page */ touchpad_present = touchpad_is_present (); @@ -204,6 +207,9 @@ setup_dialog (GtkBuilder *dialog) g_settings_bind (touchpad_settings, "natural-scroll", WID ("natural_scroll_toggle"), "active", G_SETTINGS_BIND_DEFAULT); + g_settings_bind (touchpad_settings, "motion-acceleration", + gtk_range_get_adjustment (GTK_RANGE (WID ("touchpad_pointer_speed_scale"))), "value", + G_SETTINGS_BIND_DEFAULT); g_signal_connect (WID ("touchpad_pointer_speed_scale"), "value-changed", G_CALLBACK (pointer_speed_scale_event), dialog); debian/patches/11_power-configure_lid_action.patch0000664000000000000000000001361212321533756017453 0ustar Subject: [PATCH] power: Add configuration for lid action Bug: https://bugzilla.gnome.org/show_bug.cgi?id=659045 Bug-Ubuntu: https://bugs.launchpad.net/bugs/792636 --- a/panels/power/cc-power-panel.c +++ b/panels/power/cc-power-panel.c @@ -932,6 +932,7 @@ set_ac_battery_ui_mode (CcPowerPanel *self) { gboolean has_batteries = FALSE; + gboolean has_lid = FALSE; gboolean ret; GError *error = NULL; GPtrArray *devices; @@ -964,7 +965,13 @@ } } g_ptr_array_unref (devices); + + has_lid = up_client_get_lid_is_present (self->priv->up_client); + out: + gtk_widget_set_visible (WID (priv->builder, "combobox_lid_ac"), has_lid); + gtk_widget_set_visible (WID (priv->builder, "label_lid_action"), has_lid); + gtk_widget_set_visible (WID (priv->builder, "combobox_lid_battery"), has_batteries && has_lid); gtk_widget_set_visible (WID (priv->builder, "label_header_battery"), has_batteries); gtk_widget_set_visible (WID (priv->builder, "label_header_ac"), has_batteries); gtk_widget_set_visible (WID (priv->builder, "combobox_sleep_battery"), has_batteries); @@ -1080,6 +1087,26 @@ G_CALLBACK (activate_link_cb), self); + value = g_settings_get_enum (self->priv->gsd_settings, "lid-close-ac-action"); + widget = GTK_WIDGET (gtk_builder_get_object (self->priv->builder, + "combobox_lid_ac")); + disable_unavailable_combo_items (self, GTK_COMBO_BOX (widget)); + set_value_for_combo (GTK_COMBO_BOX (widget), value); + g_object_set_data (G_OBJECT(widget), "_gsettings_key", "lid-close-ac-action"); + g_signal_connect (widget, "changed", + G_CALLBACK (combo_enum_changed_cb), + self); + + value = g_settings_get_enum (self->priv->gsd_settings, "lid-close-battery-action"); + widget = GTK_WIDGET (gtk_builder_get_object (self->priv->builder, + "combobox_lid_battery")); + disable_unavailable_combo_items (self, GTK_COMBO_BOX (widget)); + set_value_for_combo (GTK_COMBO_BOX (widget), value); + g_object_set_data (G_OBJECT(widget), "_gsettings_key", "lid-close-battery-action"); + g_signal_connect (widget, "changed", + G_CALLBACK (combo_enum_changed_cb), + self); + widget = WID (self->priv->builder, "vbox_power"); gtk_widget_reparent (widget, (GtkWidget *) self); } --- a/panels/power/power.ui +++ b/panels/power/power.ui @@ -53,6 +53,28 @@ + + + + + + + + + + + + Suspend + 1 + True + + + Do nothing + 5 + True + + + False False @@ -172,6 +194,50 @@ 2 + + + True + False + end + When the lid is closed + + + 0 + 3 + + + + + True + False + liststore_lid + True + + + + + + + 1 + 3 + + + + + True + False + liststore_lid + True + + + + + + + 2 + 3 + + False @@ -352,9 +418,12 @@ + + + debian/patches/git_region_update_input_switch.patch0000664000000000000000000000433612321533756020145 0ustar From 4e3a2e1bd5214006e4b0e65616747255dc7d8966 Mon Sep 17 00:00:00 2001 From: Rui Matos Date: Wed, 12 Dec 2012 10:17:02 +0000 Subject: region: Update for the input source switching keybindings move These are now provided by gsettings-desktop-schemas. https://bugzilla.gnome.org/show_bug.cgi?id=690105 --- Index: gnome-control-center-3.6.3/configure.ac =================================================================== --- gnome-control-center-3.6.3.orig/configure.ac 2014-02-26 19:04:31.143683870 +0100 +++ gnome-control-center-3.6.3/configure.ac 2014-02-26 19:04:31.135683870 +0100 @@ -112,7 +112,7 @@ NETWORK_MANAGER_REQUIRED_VERSION=0.8.992 LIBNOTIFY_REQUIRED_VERSION=0.7.3 GNOME_DESKTOP_REQUIRED_VERSION=3.5.91 -SCHEMAS_REQUIRED_VERSION=3.5.91 +SCHEMAS_REQUIRED_VERSION=3.7.2.2 LIBWACOM_REQUIRED_VERSION=0.6 CLUTTER_REQUIRED_VERSION=1.11.3 GOA_REQUIRED_VERSION=3.5.90 Index: gnome-control-center-3.6.3/panels/region/gnome-region-panel-input.c =================================================================== --- gnome-control-center-3.6.3.orig/panels/region/gnome-region-panel-input.c 2014-02-26 19:04:31.143683870 +0100 +++ gnome-control-center-3.6.3/panels/region/gnome-region-panel-input.c 2014-02-26 19:04:32.000000000 +0100 @@ -1219,19 +1219,19 @@ static void update_shortcuts (GtkBuilder *builder) { - char *previous, *next; + char **previous, **next; GSettings *settings; - settings = g_settings_new ("org.gnome.settings-daemon.plugins.media-keys"); + settings = g_settings_new ("org.gnome.desktop.wm.keybindings"); - previous = g_settings_get_string (settings, "switch-input-source-backward"); - next = g_settings_get_string (settings, "switch-input-source"); + previous = g_settings_get_strv (settings, "switch-input-source-backward"); + next = g_settings_get_strv (settings, "switch-input-source"); - update_shortcut_label (WID ("prev-source-shortcut-label"), previous); - update_shortcut_label (WID ("next-source-shortcut-label"), next); + update_shortcut_label (WID ("prev-source-shortcut-label"), previous[0]); + update_shortcut_label (WID ("next-source-shortcut-label"), next[0]); - g_free (previous); - g_free (next); + g_strfreev (previous); + g_strfreev (next); } static gboolean debian/patches/91_unity_no_printing_panel.patch0000664000000000000000000000142412321533756017116 0ustar diff -Nur gnome-control-center-3.6.3/panels/printers/gnome-printers-panel.desktop.in.in gnome-control-center-3.6.3.new/panels/printers/gnome-printers-panel.desktop.in.in --- gnome-control-center-3.6.3/panels/printers/gnome-printers-panel.desktop.in.in 2013-03-19 11:48:12.950319345 +0100 +++ gnome-control-center-3.6.3.new/panels/printers/gnome-printers-panel.desktop.in.in 2013-03-19 11:47:56.902318811 +0100 @@ -8,7 +8,7 @@ StartupNotify=true # The X-GNOME-Settings-Panel is necessary to show in the main shell UI Categories=GNOME;GTK;Settings;HardwareSettings;X-GNOME-Settings-Panel; -OnlyShowIn=GNOME;Unity; +OnlyShowIn=GNOME; X-GNOME-Settings-Panel=printers # Translators: those are keywords for the printing control-center panel _Keywords=Printer;Queue;Print;Paper;Ink;Toner; debian/patches/git_iconview_columns.patch0000664000000000000000000000120312321533756016071 0ustar # Description: git patch, updated for our layout diff --git a/shell/cc-shell-category-view.c b/shell/cc-shell-category-view.c index 4b05d8c..d7094ab 100644 --- a/shell/cc-shell-category-view.c +++ b/shell/cc-shell-category-view.c @@ -138,6 +138,7 @@ cc_shell_category_view_constructed (GObject *object) gtk_icon_view_set_text_column (GTK_ICON_VIEW (iconview), COL_NAME); gtk_icon_view_set_item_width (GTK_ICON_VIEW (iconview), 100); cc_shell_item_view_update_cells (CC_SHELL_ITEM_VIEW (iconview)); + gtk_icon_view_set_columns (GTK_ICON_VIEW (iconview), 7); /* create the header if required */ if (priv->name) -- cgit v0.9.2 debian/patches/0001-online-accounts-use-the-async-function-to-get-all-th.patch0000664000000000000000000000575712321533756024226 0ustar From 82e6777cb1a32edb9c85b85c0c3768f9ca62c4c2 Mon Sep 17 00:00:00 2001 From: Marco Barisione Date: Wed, 21 Aug 2013 11:48:25 +0100 Subject: [PATCH] online-accounts: use the async function to get all the providers https://bugzilla.gnome.org/show_bug.cgi?id=706148 --- panels/online-accounts/cc-online-accounts-panel.c | 49 ++++++++++++++++++----- 1 file changed, 40 insertions(+), 9 deletions(-) Index: b/panels/online-accounts/cc-online-accounts-panel.c =================================================================== --- a/panels/online-accounts/cc-online-accounts-panel.c +++ b/panels/online-accounts/cc-online-accounts-panel.c @@ -596,9 +596,17 @@ /* ---------------------------------------------------------------------------------------------------- */ +typedef struct +{ + GoaPanel *panel; +} AddAccountData; + static void -add_account (GoaPanel *panel) +get_all_providers_cb (GObject *source, + GAsyncResult *res, + gpointer user_data) { + AddAccountData *data = user_data; GtkWindow *parent; GtkWidget *dialog; gint response; @@ -609,12 +617,15 @@ providers = NULL; - parent = GTK_WINDOW (cc_shell_get_toplevel (cc_panel_get_shell (CC_PANEL (panel)))); + providers = NULL; + if (!goa_provider_get_all_finish (&providers, res, NULL)) + goto out; + + parent = GTK_WINDOW (cc_shell_get_toplevel (cc_panel_get_shell (CC_PANEL (data->panel)))); - dialog = goa_panel_add_account_dialog_new (panel->client); + dialog = goa_panel_add_account_dialog_new (data->panel->client); gtk_window_set_transient_for (GTK_WINDOW (dialog), parent); - providers = goa_provider_get_all (); for (l = providers; l != NULL; l = l->next) { GoaProvider *provider; @@ -643,11 +654,11 @@ { GtkTreeIter iter; /* navigate to newly created object */ - if (goa_panel_accounts_model_get_iter_for_object (panel->accounts_model, + if (goa_panel_accounts_model_get_iter_for_object (data->panel->accounts_model, object, &iter)) { - gtk_tree_selection_select_iter (gtk_tree_view_get_selection (GTK_TREE_VIEW (panel->accounts_treeview)), + gtk_tree_selection_select_iter (gtk_tree_view_get_selection (GTK_TREE_VIEW (data->panel->accounts_treeview)), &iter); } g_object_unref (object); @@ -675,6 +686,18 @@ out: g_list_foreach (providers, (GFunc) g_object_unref, NULL); g_list_free (providers); + g_clear_object (&data->panel); + g_slice_free (AddAccountData, data); +} + +static void +add_account (GoaPanel *panel) +{ + AddAccountData *data; + + data = g_slice_new0 (AddAccountData); + data->panel = g_object_ref_sink (panel); + goa_provider_get_all (get_all_providers_cb, data); } /* ---------------------------------------------------------------------------------------------------- */ debian/patches/git_show_per_window_input_settings.patch0000664000000000000000000005126412321533756021076 0ustar From 4f38c427858a6ef834c04f1a1744b3797351410e Mon Sep 17 00:00:00 2001 From: Rui Matos Date: Wed, 09 Jan 2013 13:11:31 +0000 Subject: region: Add UI for the per-window input sources setting https://bugzilla.gnome.org/show_bug.cgi?id=684210 --- --- a/panels/region/gnome-region-panel.ui +++ b/panels/region/gnome-region-panel.ui @@ -862,111 +862,191 @@ - + True False - 0 - none - + True False - 12 + 0 + none - + True False - 6 - 6 - 6 + 12 - + True False - 0 - Switch to previous source + 6 + 6 + 6 + + + True + False + 0 + Switch to previous source + + + 0 + 0 + 1 + 1 + + + + + True + False + end + True + Ctrl+Alt+Space + + + + 1 + 0 + 1 + 1 + + + + + True + False + 0 + Switch to next source + + + 0 + 1 + 1 + 1 + + + + + True + False + end + True + Ctrl+Alt+Shift+Space + + + + 1 + 1 + 1 + 1 + + + + + True + True + Shortcut Settings + end + + + 1 + 2 + 1 + 1 + + - - 0 - 0 - 1 - 1 - - - - - True - False - end - True - Ctrl+Alt+Space - - - - 1 - 0 - 1 - 1 - - - - - True - False - 0 - Switch to next source - - - 0 - 1 - 1 - 1 - + + + + + True + False + Shortcuts + True + + + + + + + + False + False + 0 + + + + + True + False + 0 + none + + + True + False + 12 - + True False - end - True - Ctrl+Alt+Shift+Space - - - - 1 - 1 - 1 - 1 - - - - - True - True - Shortcut Settings - end + 6 + 6 + 6 + + + True + True + 0 + Use the same source for all windows + + + 0 + 0 + 1 + 1 + + + + + True + True + 0 + Allow different sources for each window + per-window-radio-false + + + 0 + 1 + 1 + 1 + + - - 1 - 2 - 1 - 1 - + + + True + False + Options + True + + + + + - - - - True - False - Shortcuts - True - - - - + + False + False + 1 + --- a/panels/region/gnome-region-panel-input.c +++ b/panels/region/gnome-region-panel-input.c @@ -1338,6 +1338,18 @@ "changed::" KEY_INPUT_SOURCES, G_CALLBACK (input_sources_changed), builder); + + g_settings_bind (input_sources_settings, "per-window", + WID("per-window-radio-true"), "active", + G_SETTINGS_BIND_DEFAULT); + g_settings_bind (input_sources_settings, "per-window", + WID("per-window-radio-false"), "active", + G_SETTINGS_BIND_DEFAULT | G_SETTINGS_BIND_INVERT_BOOLEAN); + /* because we are in delay-apply mode */ + g_signal_connect_swapped (WID("per-window-radio-true"), "clicked", + G_CALLBACK (g_settings_apply), input_sources_settings); + g_signal_connect_swapped (WID("per-window-radio-false"), "clicked", + G_CALLBACK (g_settings_apply), input_sources_settings); } static void debian/patches/git_add_printer_crash.patch0000664000000000000000000000262212321533756016167 0ustar From 5a654556de7a85414e9ef3a465f383b9ea4357e7 Mon Sep 17 00:00:00 2001 From: Marek Kasik Date: Wed, 24 Apr 2013 11:03:22 +0000 Subject: printers: Don't crash without system-config-printer Fix error handling in addition of new printer. https://bugzilla.gnome.org/show_bug.cgi?id=698642 --- diff --git a/panels/printers/pp-new-printer.c b/panels/printers/pp-new-printer.c index 038a2ad..c76f1ac 100644 --- a/panels/printers/pp-new-printer.c +++ b/panels/printers/pp-new-printer.c @@ -683,6 +683,7 @@ printer_add_async_scb (GObject *source_object, GDBusConnection *bus; GVariantBuilder array_builder; GVariant *output; + gboolean cancelled = FALSE; PPDName *ppd_item = NULL; GError *error = NULL; @@ -698,15 +699,15 @@ printer_add_async_scb (GObject *source_object, } else { - if (error->domain != G_IO_ERROR || - error->code != G_IO_ERROR_CANCELLED) + cancelled = g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED); + + if (!cancelled) g_warning ("%s", error->message); - g_error_free (error); + + g_clear_error (&error); } - if (!error || - error->domain != G_IO_ERROR || - error->code != G_IO_ERROR_CANCELLED) + if (!cancelled) { if (ppd_item == NULL || ppd_item->ppd_match_level < PPD_EXACT_MATCH) { -- cgit v0.9.2 debian/patches/git-background-remove-unused-widget.patch0000664000000000000000000001333212321533756020626 0ustar commit ea16cadce90fda067b6cba6cc831ba1ecb5adfa7 Author: Bastien Nocera Date: Mon Aug 19 20:55:29 2013 +0200 background: Remove unused "lock" preview widgets https://bugzilla.gnome.org/show_bug.cgi?id=696166 --- a/panels/background/background.ui +++ b/panels/background/background.ui @@ -6,6 +6,10 @@ False 10 12 + 6 + 6 + 6 + 6 True @@ -26,48 +30,18 @@ True center - + + 417 + 250 True False + center + 6 + 6 + 6 + 6 True - 18 - - - 417 - 250 - True - False - center - 6 - 6 - 6 - 6 - True - True - - - True - True - 0 - - - - - False - True - center - 6 - 6 - 6 - True - True - - - True - True - 1 - - + True @@ -103,11 +77,10 @@ - + True False - 0 - Changes throughout the day + False @@ -116,10 +89,11 @@ - + True False - + 0 + Changes throughout the day False @@ -196,8 +170,6 @@ vertical - - debian/patches/git_no_glxinfo.patch0000664000000000000000000001103512321533756014654 0ustar From c60221e0b4187a6eaa34dd1ec31e92cccab57349 Mon Sep 17 00:00:00 2001 From: Giovanni Campagna Date: Sat, 12 Jan 2013 16:43:21 +0000 Subject: Don't use glxinfo to access the graphic driver name glxinfo is part of mesa-demos, and installing it pulls a lot of unnecessary programs. We can get the same informations by querying the driver directly. https://bugzilla.gnome.org/show_bug.cgi?id=691613 --- --- a/configure.ac +++ b/configure.ac @@ -136,7 +136,7 @@ polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION gdk-pixbuf-2.0 >= $GDKPIXBUF_REQUIRED_VERSION) PKG_CHECK_MODULES(DISPLAY_PANEL, $COMMON_MODULES gnome-desktop-3.0 >= 3.1.0) -PKG_CHECK_MODULES(INFO_PANEL, $COMMON_MODULES libgtop-2.0 +PKG_CHECK_MODULES(INFO_PANEL, $COMMON_MODULES libgtop-2.0 gl x11 polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION) PKG_CHECK_MODULES(KEYBOARD_PANEL, $COMMON_MODULES gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION --- a/panels/info/cc-info-panel.c +++ b/panels/info/cc-info-panel.c @@ -36,6 +36,10 @@ #include #include +#include +#include +#include + #include "hostname-helper.h" #include "gsd-disk-space-helper.h" @@ -301,54 +305,70 @@ } static char * -get_graphics_data_glx_renderer (void) +get_graphics_data_glx_renderer () { - GError *error; - GRegex *re; - GMatchInfo *match_info; - char *output; - char *result; - GString *info; - - info = g_string_new (NULL); - - error = NULL; - g_spawn_command_line_sync ("glxinfo -l", &output, NULL, NULL, &error); - if (error != NULL) - { - g_warning ("Unable to get graphics info: %s", error->message); - g_error_free (error); - return NULL; - } - - re = g_regex_new ("^OpenGL renderer string: (.+)$", G_REGEX_MULTILINE, 0, &error); - if (re == NULL) - { - g_warning ("Error building regex: %s", error->message); - g_error_free (error); - goto out; - } - - g_regex_match (re, output, 0, &match_info); - while (g_match_info_matches (match_info)) - { - char *device; - - device = g_match_info_fetch (match_info, 1); - g_string_append_printf (info, "%s ", device); - g_free (device); - - g_match_info_next (match_info, NULL); - } - g_match_info_free (match_info); - g_regex_unref (re); - - out: - g_free (output); - result = prettify_info (info->str); - g_string_free (info, TRUE); + Display *display; + int attributes[] = { + GLX_DRAWABLE_TYPE, GLX_WINDOW_BIT, + GLX_X_VISUAL_TYPE, GLX_TRUE_COLOR, + GLX_RENDER_TYPE, GLX_RGBA_BIT, + None + }; + int nconfigs; + int major, minor; + Window window; + GLXFBConfig *config; + GLXWindow glxwin; + GLXContext context; + XSetWindowAttributes win_attributes; + XVisualInfo *visualInfo; + char *renderer; + + gdk_error_trap_push (); + + display = GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()); + + glXQueryVersion (display, &major, &minor); + config = glXChooseFBConfig (display, DefaultScreen (display), + attributes, &nconfigs); + if (config == NULL) { + g_warning ("Failed to get OpenGL configuration"); + + gdk_error_trap_pop_ignored (); + return NULL; + } + visualInfo = glXGetVisualFromFBConfig (display, *config); + win_attributes.colormap = XCreateColormap (display, DefaultRootWindow(display), + visualInfo->visual, AllocNone ); + + window = XCreateWindow (display, DefaultRootWindow (display), + 0, 0, /* x, y */ + 1, 1, /* width, height */ + 0, /* border_width */ + visualInfo->depth, InputOutput, + visualInfo->visual, CWColormap, &win_attributes); + glxwin = glXCreateWindow (display, *config, window, NULL); + + context = glXCreateNewContext (display, *config, GLX_RGBA_TYPE, + NULL, TRUE); + XFree (config); + + glXMakeContextCurrent (display, glxwin, glxwin, context); + renderer = (char *) glGetString (GL_RENDERER); + renderer = renderer ? prettify_info (renderer) : NULL; + + glXMakeContextCurrent (display, None, None, NULL); + glXDestroyContext (display, context); + glXDestroyWindow (display, glxwin); + XDestroyWindow (display, window); + XFree (visualInfo); + + if (gdk_error_trap_pop () != Success) { + g_warning ("Failed to get OpenGL driver info"); + return NULL; + } - return result; + return renderer; } static char * debian/source_gnome-control-center.py0000664000000000000000000000263612321533756015201 0ustar import os, apport.packaging, re import glob from apport.hookutils import * def add_info(report): # the issue is not in the gnome-control-center code so reassign if "Stacktrace" in report and "/control-center-1/" in report["Stacktrace"]: for words in report["Stacktrace"].split(): if words.startswith("/usr/lib/") and "/control-center-1/" in words: if apport.packaging.get_file_package(words) != 'gnome-control-center': report.add_package_info(apport.packaging.get_file_package(words)) return component = re.compile("lib(\w*).so").search(words).groups(1)[0] report['Title'] = '[%s]: %s' % (component, report.get('Title', report.standard_title())) report['Tags'] = '%s %s' % (report.get('Tags', ""), component) break # Stop on the first .so that's the interesting one # collect informations on the /usr/lib/control-center-1 components plugin_packages = set() for paneldir in (['/usr/lib/control-center-1'] + glob.glob('/usr/lib/*/control-center-1')): for dirpath, dirnames, filenames in os.walk(paneldir): for filename in filenames: path = os.path.join(dirpath, filename) package = apport.packaging.get_file_package(path) if package == 'gnome-control-center': continue if not package: continue plugin_packages.add(package) if plugin_packages: report["usr_lib_gnome-control-center"] = package_versions(*sorted(plugin_packages)) debian/gnome-control-center.xpm0000664000000000000000000001644412321533756013777 0ustar /* XPM */ static char * gnome_control_center_xpm[] = { "32 32 326 2", " c None", ". c #959791", "+ c #C0C1BD", "@ c #8F908B", "# c #8E8F8B", "$ c #F1F1F0", "% c #F0F1F0", "& c #979A94", "* c #585A56", "= c #90918B", "- c #8D8E89", "; c #B3B5B0", "> c #F3F3F2", ", c #EEEEED", "' c #898C87", ") c #5A5C59", "! c #ADAFAC", "~ c #DDDDDC", "{ c #5B5D5A", "] c #9A9C95", "^ c #B3B5B1", "/ c #8A8C87", "( c #F2F2F2", "_ c #FAFAFA", ": c #92948F", "< c #5B5D59", "[ c #838582", "} c #D0D0CE", "| c #D6D6D5", "1 c #C2C3C1", "2 c #979A93", "3 c #F9F9F9", "4 c #939490", "5 c #979894", "6 c #F6F7F6", "7 c #FCFCFB", "8 c #A5A7A3", "9 c #626460", "0 c #F7F7F7", "a c #EDEEED", "b c #D8D9D7", "c c #5F625D", "d c #8D8F8A", "e c #D2D5D0", "f c #868983", "g c #878984", "h c #A5A7A4", "i c #F1F2F0", "j c #F0F1EF", "k c #FCFCFC", "l c #A6A7A4", "m c #5A5C58", "n c #676964", "o c #CBCBC9", "p c #F9F9F8", "q c #969693", "r c #888985", "s c #E7E8E6", "t c #D8DAD6", "u c #E7E7E5", "v c #EAEBE9", "w c #ECECEA", "x c #E8E9E7", "y c #F3F4F3", "z c #E5E7E4", "A c #E1E2E0", "B c #858883", "C c #5A5E58", "D c #676965", "E c #A5A7A2", "F c #696C68", "G c #626461", "H c #5B5C58", "I c #A4A7A3", "J c #E7E8E5", "K c #CDCFCA", "L c #D4D6D2", "M c #E0E1DE", "N c #ECEDEB", "O c #E8EAE7", "P c #C2C4BE", "Q c #D0D2CD", "R c #C4C5C2", "S c #686A66", "T c #AAACA7", "U c #696A66", "V c #5D5F59", "W c #9C9D98", "X c #D8D9D6", "Y c #E5E5E4", "Z c #ECECEB", "` c #CBCFC8", " . c #B6B8B2", ".. c #B2B4AE", "+. c #D6D7D4", "@. c #5B5F59", "#. c #6A6B67", "$. c #ADB0AB", "%. c #696C67", "&. c #80827D", "*. c #8E918B", "=. c #E0E1DF", "-. c #C6C8C3", ";. c #ADB0AA", ">. c #B4B6B1", ",. c #E2E3E1", "'. c #AFB0AE", "). c #5D5E5B", "!. c #6B6E69", "~. c #B2B4B0", "{. c #696B68", "]. c #81837E", "^. c #D1D2CF", "/. c #C4C6C2", "(. c #BEC0BB", "_. c #EEEEEE", ":. c #B0B1AE", "<. c #5D5F5B", "[. c #6E706B", "}. c #B6B8B5", "|. c #6B6C68", "1. c #7F807A", "2. c #CECFCD", "3. c #D9D9D7", "4. c #DADBD9", "5. c #EBEBEB", "6. c #EFEFEF", "7. c #5C5E5B", "8. c #6F716E", "9. c #BBBDB9", "0. c #6A6D68", "a. c #7C7F7A", "b. c #D0D0CF", "c. c #ECECEC", "d. c #E7E7E7", "e. c #E4E5E4", "f. c #717270", "g. c #C0C1BE", "h. c #6B6D69", "i. c #D1D1D0", "j. c #E1E1E0", "k. c #979895", "l. c #797B77", "m. c #6C6D68", "n. c #7C7D79", "o. c #9A9B99", "p. c #7A7B78", "q. c #C9CBC7", "r. c #70726D", "s. c #747572", "t. c #61635F", "u. c #7B7D79", "v. c #CDCFCB", "w. c #70726E", "x. c #828380", "y. c #B7B7B6", "z. c #9C9D9A", "A. c #204B86", "B. c #244E89", "C. c #565D62", "D. c #787977", "E. c #D2D4D0", "F. c #898A88", "G. c #A5A6A3", "H. c #B4B5B2", "I. c #DFE0DD", "J. c #ACADAA", "K. c #214B87", "L. c #5A7EAE", "M. c #92ABC6", "N. c #828A8E", "O. c #D6D7D5", "P. c #6E6F6B", "Q. c #5E5F5C", "R. c #9D9E9C", "S. c #C5C6C4", "T. c #C1C3BF", "U. c #DBDCD9", "V. c #ABACA9", "W. c #6E706C", "X. c #355E94", "Y. c #97B4D4", "Z. c #4574AD", "`. c #507DB5", " + c #737C80", ".+ c #4F585D", "++ c #6D6F6A", "@+ c #C3C4C2", "#+ c #BABCB7", "$+ c #D7D8D5", "%+ c #6D706B", "&+ c #2E5790", "*+ c #8DA7C5", "=+ c #4D7AB1", "-+ c #4A7AB3", ";+ c #5783B6", ">+ c #617CA1", ",+ c #173663", "'+ c #C1C1BF", ")+ c #D2D3D0", "!+ c #B6B9B4", "~+ c #D0D1CD", "{+ c #CDCECC", "]+ c #787976", "^+ c #204A87", "/+ c #4A6FA3", "(+ c #91ADCD", "_+ c #507CB3", ":+ c #4B7BB4", "<+ c #5881B3", "[+ c #5978A2", "}+ c #2C4A78", "|+ c #173560", "1+ c #6F716C", "2+ c #BEC0BD", "3+ c #CED0CD", "4+ c #B0B2AC", "5+ c #ADB0A9", "6+ c #CECFCB", "7+ c #E3E4E2", "8+ c #BCBDBB", "9+ c #A2A5A0", "0+ c #90928F", "a+ c #727571", "b+ c #29508C", "c+ c #7294BE", "d+ c #89AAD1", "e+ c #4372AC", "f+ c #4D7CB5", "g+ c #5780B3", "h+ c #506B91", "i+ c #1C3B69", "j+ c #6B6D6A", "k+ c #C4C5C3", "l+ c #C3C6C1", "m+ c #B7B9B4", "n+ c #DFE1DD", "o+ c #F4F5F3", "p+ c #E5E6E4", "q+ c #E6E7E5", "r+ c #385F96", "s+ c #8EAED2", "t+ c #749BC7", "u+ c #3D6DA9", "v+ c #4D7DB5", "w+ c #527DB2", "x+ c #4D6B97", "y+ c #1A3867", "z+ c #DBDCDA", "A+ c #D9DBD6", "B+ c #F8F8F8", "C+ c #DEDFDC", "D+ c #E2E3E0", "E+ c #CFD1CC", "F+ c #E8E8E7", "G+ c #2A518C", "H+ c #87A7CC", "I+ c #648EBF", "J+ c #3A6AA7", "K+ c #4E7DB6", "L+ c #537FB5", "M+ c #466899", "N+ c #203F6C", "O+ c #818380", "P+ c #F8F8F7", "Q+ c #EBECEA", "R+ c #E6E8E4", "S+ c #E4E4E3", "T+ c #9B9D9A", "U+ c #7A7C77", "V+ c #DFDFDD", "W+ c #757873", "X+ c #224B89", "Y+ c #7093BE", "Z+ c #6B92C1", "`+ c #5684B9", " @ c #385D94", ".@ c #294977", "+@ c #183462", "@@ c #7E7F7B", "#@ c #CCCCCA", "$@ c #797A77", "%@ c #FAFBFA", "&@ c #9C9D99", "*@ c #204987", "=@ c #577CAB", "-@ c #7095C3", ";@ c #5481B6", ">@ c #325A91", ",@ c #305284", "'@ c #173462", ")@ c #767874", "!@ c #F1F2F1", "~@ c #ECEDEC", "{@ c #6A6C68", "]@ c #C5C6C3", "^@ c #29528B", "/@ c #7596C1", "(@ c #3B6BA7", "_@ c #4E7AAF", ":@ c #335A90", "<@ c #294C7D", "[@ c #183762", "}@ c #60625D", "|@ c #E1E2DF", "1@ c #8D8E8B", "2@ c #656663", "3@ c #244980", "4@ c #5779A2", "5@ c #4773AA", "6@ c #34588E", "7@ c #214271", "8@ c #16335E", "9@ c #81827E", "0@ c #5E605D", "a@ c #264779", "b@ c #496487", "c@ c #345585", "d@ c #1B3B68", "e@ c #132C51", "f@ c #7D7F7B", "g@ c #80837D", "h@ c #17345E", "i@ c #15335B", "j@ c #575855", "k@ c #5E605C", " ", " . + @ ", " # $ % & * ", " = - ; > , ' ) ! ~ { ", " ] ^ / ( _ : < [ } | 1 ) ", " 2 3 4 5 6 7 8 9 0 a b c ", " d % e f g h i j k l m n o p q ", " r s t u v w x y z A B C D E F G H ", " I J K L M N O P Q R { S T U V ", " W X Y Z v ` ...+.! @.#.$.%.) ", " &.*.=.-.;.>.,.'. ).!.~.{.m ", " ].^./.(.^._.:. <.[.}.|.< ", " 1.2.3.4.5.6.'. 7.8.9.0.). ", " a.b.c.d.e.c.].f.g.h.{ ", " a.i.c.j.k.l./.m.< ", " n.2.o.p.q.r.s.t. ", " n u.v.w.x.y.z. ", " A.B.C.D.E.8.F.G.H.I.J.w. ", " K.L.M.N.O.P.Q.R.S./.T.U.V.W. ", " X.Y.Z.`. +.+ ++@++.(.#+$+V.%+ ", " &+*+=+-+;+>+,+ 8.'+)+!+; ~+{+]+ ", " ^+/+(+_+:+<+[+}+|+ 1+2+3+4+5+6+7+8+9+0+a+ ", " b+c+d+e+f+g+h+i+ j+k+l+m+n+o+% v p+q+l. ", " r+s+t+u+v+w+x+y+ 1+z+A+B+v C+n+D+E+F+#. ", " G+H+I+J+K+L+M+N+ O+P+Q+R+S+T+U+V+v W+ ", " X+Y+Z+J+K+`+ @.@+@ @@P+q+#@F $@%@&@ ", " *@=@-@J+K+;@>@,@'@ )@!@~@{@ ]@5 ", " ^@/@(@K+_@:@<@[@ }@s |@1@ 2@{@ ", " 3@4@f+5@6@7@8@ 9@x s 0@ ", " a@b@c@d@e@ f@e.g@ ", " h@i@ j@k@ ", " "};