Created by James Westby and last modified
Get this branch:
bzr branch lp:ubuntu/lucid/gnome-control-center
Members of Ubuntu branches can upload to this branch. Log in for directions.

Branch merges

Related bugs

Related blueprints

Branch information

Ubuntu branches
Review team:
Ubuntu Development Team

Recent revisions

140. By Chris Coulson

* debian/patches/95_desktop-effects-integration.patch:
  - Updated to ensure that we don't call GTK functions outside of the
    GDK global lock. This fixes a deadlock caused by trying to
    recursively lock the GDK global lock (LP: #554106)

139. By Didier Roche

* debian/patches/52_button_layout_from_theme.patch:
  - fix crash at startup when the button layout isn't the selected
    theme one (LP: #552132)

138. By Didier Roche

* debian/patches/52_button_layout_from_theme.patch:
  - copy button layout to custom theme when creating one (LP: #551048)
  - had some additional checkings on button layout property

137. By Didier Roche

* New upstream release:
  + About me:
    - Fix global variable confusion (Michal Schmidt)
    - Fix remembering of data between runs (Michal Schmidt)
  + Appearance:
    - Mark a string for translation (Gabor Kelemen) (#612015)
    - Fix GTK+ multi-threading (Matthias Clasen) (#610003)
  + Display:
    - Don't show a tooltip while a monitor is being dragged
      (Federico Mena Quintero)
  + Typing break:
    - Lock all the screens (Matthias Clasen) (#492974)
   + Updated translations
* debian/patches/03_use_libunique.patch: refreshed
* removed debian/patches/98_about-me-wid-fix.patch: upstreamed

136. By Martin Pitt

* 50_ubuntu_systemwide_prefs.patch: If the user has different proxy settings
  than the system, and is an admin, ask whether to apply the settings system
  wide for package management. (LP: #432631)
* 50_ubuntu_systemwide_prefs.patch: Drop unused connection to session D-Bus,
  and two unused variables.
* 50_ubuntu_systemwide_prefs.patch: Fix two format string errors.

135. By Didier Roche

* debian/patches/52_button_layout_from_theme.patch:
  - Enable themes to provide a prefered button layout option:
    X-GNOME-Metatheme/ButtonLayout. (LP: #535322, #548833)

134. By Martin Pitt

Add 04_keyboard_layout_gconf_names.patch: keyboard: Fix layout gconf key
initialization for empty variants. (LP: #460328)

133. By Didier Roche

[ Alex Launi ]
* debian/patches/112_banshee_in_media_dropdown.patch:
  - Update preferred applications xml file for banshee to use
    banshee-1 instead of banshee executable (lp: #533888)

[ Didier Roche ]
* New upstream release:
  - updated translations
* debian/patches/99_autoreconf.patch:
  - refreshed

132. By Sebastien Bacher

* debian/patches/03_use_libunique.patch:
  - change by Mikkel Kamstrup Erlandsen to let the about-me capplet display
    the running instance when launched twice (lp: #531974)
* debian/patches/99_autoreconf.patch:
  - refreshed for the previous change

131. By Chris Coulson

* debian/patches/98_about-me-wid-fix.patch:
  - Widget contents are mapped to EContact fields using widget ID's
    defined in the GtkBuilder UI file. However, the name returned
    by gtk_widget_get_name is no longer the same as the ID in the latest
    Gtk version, so don't depend on the name for mapping the widgets
    to the correct EContact fields (LP: #525520).

Branch metadata

Branch format:
Branch format 7
Repository format:
Bazaar repository format 2a (needs bzr 1.16 or later)
Stacked on:
This branch contains Public information 
Everyone can see this information.