[arch-commits] Commit in gnome-shell/trunk (4 files)
Ionut Biru
ibiru at archlinux.org
Fri Sep 2 16:04:52 UTC 2011
Date: Friday, September 2, 2011 @ 12:04:51
Author: ibiru
Revision: 136879
cleanup
Modified:
gnome-shell/trunk/PKGBUILD
Deleted:
gnome-shell/trunk/arch.patch
gnome-shell/trunk/bluetoothstatus-always-update-devices.patch
gnome-shell/trunk/shell-recorder-missing-XFree.patch
---------------------------------------------+
PKGBUILD | 2
arch.patch | 12 --
bluetoothstatus-always-update-devices.patch | 132 --------------------------
shell-recorder-missing-XFree.patch | 22 ----
4 files changed, 1 insertion(+), 167 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2011-09-02 16:03:15 UTC (rev 136878)
+++ PKGBUILD 2011-09-02 16:04:51 UTC (rev 136879)
@@ -9,7 +9,7 @@
arch=('i686' 'x86_64')
url="http://live.gnome.org/GnomeShell"
license=('GPL2')
-depends=('mutter' 'gjs' 'libcroco' 'gnome-bluetooth' 'folks' 'telepathy-logger' 'folks' 'networkmanager')
+depends=('mutter' 'gjs' 'libcroco' 'gnome-bluetooth' 'folks' 'telepathy-logger' 'networkmanager')
makedepends=('intltool' 'gnome-doc-utils')
optdepends=('network-manager-applet: shell integration for networkmanager'
'gnome-power-manager: shell integration for power management')
Deleted: arch.patch
===================================================================
--- arch.patch 2011-09-02 16:03:15 UTC (rev 136878)
+++ arch.patch 2011-09-02 16:04:51 UTC (rev 136879)
@@ -1,12 +0,0 @@
-diff -Nur gnome-shell.orig/data/org.gnome.shell.gschema.xml.in gnome-shell/data/org.gnome.shell.gschema.xml.in
---- gnome-shell.orig/data/org.gnome.shell.gschema.xml.in 2011-04-06 08:47:58.638600793 -0700
-+++ gnome-shell/data/org.gnome.shell.gschema.xml.in 2011-04-06 08:49:17.035274675 -0700
-@@ -30,7 +30,7 @@
- </_description>
- </key>
- <key name="favorite-apps" type="as">
-- <default>[ 'mozilla-firefox.desktop', 'evolution.desktop', 'empathy.desktop', 'rhythmbox.desktop', 'shotwell.desktop', 'openoffice.org-writer.desktop', 'nautilus.desktop' ]</default>
-+ <default>[ 'firefox.desktop', 'evolution.desktop', 'empathy.desktop', 'rhythmbox.desktop', 'shotwell.desktop', 'writer.desktop', 'nautilus.desktop' ]</default>
- <_summary>List of desktop file IDs for favorite applications</_summary>
- <_description>
- The applications corresponding to these identifiers
Deleted: bluetoothstatus-always-update-devices.patch
===================================================================
--- bluetoothstatus-always-update-devices.patch 2011-09-02 16:03:15 UTC (rev 136878)
+++ bluetoothstatus-always-update-devices.patch 2011-09-02 16:04:51 UTC (rev 136879)
@@ -1,132 +0,0 @@
-From 76fce94b66be7bdebbedcc3bce62898da51da15a Mon Sep 17 00:00:00 2001
-From: Giovanni Campagna <gcampagna at src.gnome.org>
-Date: Wed, 13 Apr 2011 17:08:45 +0000
-Subject: BluetoothStatus: always update devices
-
-Previously, we skipped rebuilding device items in case the device
-had already been seen, but this caused the connected switch not to
-be updated. Now it has been refactored to update in case the device
-changes, and to create only when the device is completely new.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=647565
----
-diff --git a/js/ui/status/bluetooth.js b/js/ui/status/bluetooth.js
-index 070016a..cee2f90 100644
---- a/js/ui/status/bluetooth.js
-+++ b/js/ui/status/bluetooth.js
-@@ -127,13 +127,6 @@ Indicator.prototype = {
- }
- },
-
-- _deviceCompare: function(d1, d2) {
-- return d1.device_path == d2.device_path &&
-- d1.bdaddr == d2.bdaddr &&
-- d1.can_connect == d2.can_connect &&
-- d1.capabilities == d2.capabilities;
-- },
--
- _updateDevices: function() {
- let devices = this._applet.get_devices();
-
-@@ -142,12 +135,8 @@ Indicator.prototype = {
- let item = this._deviceItems[i];
- let destroy = true;
- for (let j = 0; j < devices.length; j++) {
-- // we need to deep compare because BluetoothSimpleDevice is a boxed type
-- // (but we take advantage of that, because _skip will disappear the next
-- // time get_devices() is called)
-- if (this._deviceCompare(item._device, devices[j])) {
-- item.label.text = devices[j].alias;
-- devices[j]._skip = true;
-+ if (item._device.device_path == devices[j].device_path) {
-+ this._updateDeviceItem(item, devices[j]);
- destroy = false;
- break;
- }
-@@ -162,7 +151,7 @@ Indicator.prototype = {
- this._hasDevices = newlist.length > 0;
- for (let i = 0; i < devices.length; i++) {
- let d = devices[i];
-- if (d._skip)
-+ if (d._item)
- continue;
- let item = this._createDeviceItem(d);
- if (item) {
-@@ -177,17 +166,55 @@ Indicator.prototype = {
- this._deviceSep.actor.hide();
- },
-
-+ _updateDeviceItem: function(item, device) {
-+ if (!device.can_connect && device.capabilities == GnomeBluetoothApplet.Capabilities.NONE) {
-+ item.destroy();
-+ return;
-+ }
-+
-+ let prevDevice = item._device;
-+ let prevCapabilities = prevDevice.capabilities;
-+ let prevCanConnect = prevDevice.can_connect;
-+
-+ // adopt the new device object
-+ item._device = device;
-+ device._item = item;
-+
-+ // update properties
-+ item.label.text = device.alias;
-+
-+ if (prevCapabilities != device.capabilities ||
-+ prevCanConnect != device.can_connect) {
-+ // need to rebuild the submenu
-+ item.menu.removeAll();
-+ this._buildDeviceSubMenu(item, device);
-+ }
-+
-+ // update connected property
-+ if (device.can_connect)
-+ item._connectedMenuitem.setToggleState(device.connected);
-+ },
-+
- _createDeviceItem: function(device) {
- if (!device.can_connect && device.capabilities == GnomeBluetoothApplet.Capabilities.NONE)
- return null;
- let item = new PopupMenu.PopupSubMenuMenuItem(device.alias);
-+
-+ // adopt the device object, and add a back link
- item._device = device;
-+ device._item = item;
-
-+ this._buildDeviceSubMenu(item, device);
-+
-+ return item;
-+ },
-+
-+ _buildDeviceSubMenu: function(item, device) {
- if (device.can_connect) {
- item._connected = device.connected;
-- let menuitem = new PopupMenu.PopupSwitchMenuItem(_("Connection"), device.connected);
-+ item._connectedMenuitem = new PopupMenu.PopupSwitchMenuItem(_("Connection"), device.connected);
-
-- menuitem.connect('toggled', Lang.bind(this, function() {
-+ item._connectedMenuitem.connect('toggled', Lang.bind(this, function() {
- if (item._connected > ConnectionState.CONNECTED) {
- // operation already in progress, revert
- menuitem.setToggleState(menuitem.state);
-@@ -217,7 +244,7 @@ Indicator.prototype = {
- }
- }));
-
-- item.menu.addMenuItem(menuitem);
-+ item.menu.addMenuItem(item._connectedMenuitem);
- }
-
- if (device.capabilities & GnomeBluetoothApplet.Capabilities.OBEX_PUSH) {
-@@ -263,8 +290,6 @@ Indicator.prototype = {
- default:
- break;
- }
--
-- return item;
- },
-
- _updateFullMenu: function() {
---
-cgit v0.9
Deleted: shell-recorder-missing-XFree.patch
===================================================================
--- shell-recorder-missing-XFree.patch 2011-09-02 16:03:15 UTC (rev 136878)
+++ shell-recorder-missing-XFree.patch 2011-09-02 16:04:51 UTC (rev 136879)
@@ -1,22 +0,0 @@
-From 88df18345069c295e68d319606a11b7727b2bd4b Mon Sep 17 00:00:00 2001
-From: Maxim Ermilov <zaspire at rambler.ru>
-Date: Tue, 24 May 2011 22:46:47 +0000
-Subject: shell-recorder: missing XFree
-
-https://bugzilla.gnome.org/show_bug.cgi?id=650934
----
-diff --git a/src/shell-recorder.c b/src/shell-recorder.c
-index 6555187..d297923 100644
---- a/src/shell-recorder.c
-+++ b/src/shell-recorder.c
-@@ -412,6 +412,8 @@ recorder_fetch_cursor_image (ShellRecorder *recorder)
- *(guint32 *)(data + i * stride + 4 * j) = cursor_image->pixels[i * cursor_image->width + j];
-
- cairo_surface_mark_dirty (recorder->cursor_image);
-+
-+ XFree (cursor_image);
- }
-
- /* Overlay the cursor image on the frame. We draw the cursor image
---
-cgit v0.9
More information about the arch-commits
mailing list