~ubuntu-branches/ubuntu/saucy/gnome-control-center/saucy-proposed

« back to all changes in this revision

Viewing changes to .pc/12_add_never_turn_screen_off.patch/panels/screen/screen.ui

  • Committer: Package Import Robot
  • Author(s): Sebastien Bacher, Sebastien Bacher, Robert Ancell, Iain Lane, Edward Donovan, Rico Tzschichholz, Jeremy Bicha, David Henningsson
  • Date: 2012-11-21 19:32:45 UTC
  • mfrom: (1.1.63)
  • Revision ID: package-import@ubuntu.com-20121121193245-mj61nzz1z4fk3z25
Tags: 1:3.6.3-0ubuntu1
[ 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 

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
 
<?xml version="1.0"?>
 
1
<?xml version="1.0" encoding="UTF-8"?>
2
2
<interface>
3
 
  <requires lib="gtk+" version="2.16"/>
4
 
  <!-- interface-naming-policy project-wide -->
 
3
  <!-- interface-requires gtk+ 3.0 -->
5
4
  <object class="GtkListStore" id="lock_liststore">
6
5
    <columns>
7
6
      <!-- column-name name -->
320
319
                                <property name="visible">True</property>
321
320
                                <property name="can_focus">True</property>
322
321
                                <property name="receives_default">True</property>
323
 
                                <property name="has_tooltip">True</property>
 
322
                                <property name="has_tooltip">False</property>
324
323
                                <property name="use_action_appearance">False</property>
325
324
                                <property name="relief">none</property>
326
325
                                <property name="image_position">right</property>
339
338
                            <property name="position">2</property>
340
339
                          </packing>
341
340
                        </child>
 
341
                        <child>
 
342
                          <object class="GtkBox" id="show_notifications_box">
 
343
                            <property name="visible">True</property>
 
344
                            <property name="can_focus">False</property>
 
345
                            <child>
 
346
                              <object class="GtkCheckButton" id="show_notifications_check">
 
347
                                <property name="visible">True</property>
 
348
                                <property name="can_focus">True</property>
 
349
                                <property name="xalign">0</property>
 
350
                                <property name="label" translatable="yes">Show _notifications when locked</property>
 
351
                                <property name="use_underline">True</property>
 
352
                              </object>
 
353
                              <packing>
 
354
                                <property name="expand">True</property>
 
355
                                <property name="fill">True</property>
 
356
                                <property name="position">0</property>
 
357
                              </packing>
 
358
                            </child>
 
359
                          </object>
 
360
                          <packing>
 
361
                            <property name="expand">True</property>
 
362
                            <property name="fill">True</property>
 
363
                            <property name="position">3</property>
 
364
                          </packing>
 
365
                        </child>
342
366
                      </object>
343
367
                    </child>
344
368
                  </object>