[cinnamon] rebuilt for new cogl version
leigh123linux
leigh123linux at fedoraproject.org
Sat Aug 18 21:47:18 UTC 2012
commit 254194e539d3e2262b9048ffb2ad412364230afc
Author: leigh123linux <leigh123linux at googlemail.com>
Date: Sat Aug 18 22:47:13 2012 +0100
rebuilt for new cogl version
- patch bluetooth applet
bluetooth_applet.patch | 41 +++++++++++++++++++++++++++++++++++++++++
cinnamon.spec | 3 +++
2 files changed, 44 insertions(+), 0 deletions(-)
---
diff --git a/bluetooth_applet.patch b/bluetooth_applet.patch
new file mode 100644
index 0000000..b4d04f4
--- /dev/null
+++ b/bluetooth_applet.patch
@@ -0,0 +1,41 @@
+--- a/files/usr/share/cinnamon/applets/bluetooth at cinnamon.org/applet.js 2012-07-30 14:33:42.000000000 +0100
++++ b/files/usr/share/cinnamon/applets/bluetooth at cinnamon.org/applet.js 2012-08-18 18:15:17.126802210 +0100
+@@ -2,6 +2,7 @@ const Applet = imports.ui.applet;
+ const Clutter = imports.gi.Clutter;
+ const GLib = imports.gi.GLib;
+ const GnomeBluetoothApplet = imports.gi.GnomeBluetoothApplet;
++const GnomeBluetooth = imports.gi.GnomeBluetooth;
+ const Lang = imports.lang;
+ const St = imports.gi.St;
+
+@@ -211,11 +212,11 @@ MyApplet.prototype = {
+ this._applet.connect('notify::killswitch-state', Lang.bind(this, this._updateKillswitch));
+ this._killswitch.connect('toggled', Lang.bind(this, function() {
+ let current_state = this._applet.killswitch_state;
+- if (current_state != GnomeBluetoothApplet.KillswitchState.HARD_BLOCKED &&
+- current_state != GnomeBluetoothApplet.KillswitchState.NO_ADAPTER) {
++ if (current_state != GnomeBluetooth.KillswitchState.HARD_BLOCKED &&
++ current_state != GnomeBluetooth.KillswitchState.NO_ADAPTER) {
+ this._applet.killswitch_state = this._killswitch.state ?
+- GnomeBluetoothApplet.KillswitchState.UNBLOCKED:
+- GnomeBluetoothApplet.KillswitchState.SOFT_BLOCKED;
++ GnomeBluetooth.KillswitchState.UNBLOCKED:
++ GnomeBluetooth.KillswitchState.SOFT_BLOCKED;
+ } else
+ this._killswitch.setToggleState(false);
+ }));
+@@ -279,10 +280,10 @@ MyApplet.prototype = {
+
+ _updateKillswitch: function() {
+ let current_state = this._applet.killswitch_state;
+- let on = current_state == GnomeBluetoothApplet.KillswitchState.UNBLOCKED;
+- let has_adapter = current_state != GnomeBluetoothApplet.KillswitchState.NO_ADAPTER;
+- let can_toggle = current_state != GnomeBluetoothApplet.KillswitchState.NO_ADAPTER &&
+- current_state != GnomeBluetoothApplet.KillswitchState.HARD_BLOCKED;
++ let on = current_state == GnomeBluetooth.KillswitchState.UNBLOCKED;
++ let has_adapter = current_state != GnomeBluetooth.KillswitchState.NO_ADAPTER;
++ let can_toggle = current_state != GnomeBluetooth.KillswitchState.NO_ADAPTER &&
++ current_state != GnomeBluetooth.KillswitchState.HARD_BLOCKED;
+
+ this._killswitch.setToggleState(on);
+ if (can_toggle)
diff --git a/cinnamon.spec b/cinnamon.spec
index dad8ca1..eefa935 100644
--- a/cinnamon.spec
+++ b/cinnamon.spec
@@ -29,6 +29,7 @@ Patch1: cinnamon-1.5.0_datetime_setting.patch
# Replace mint favorites with fedora gnome-shell defaults
Patch2: cinnamon-1.4.1_f17_favourite-apps-firefox.patch
Patch3: fedora_icon.patch
+Patch4: bluetooth_applet.patch
# upstream patches and pending pulls
Patch11: systray.patch
@@ -117,6 +118,7 @@ The emphasis is put on making users feel at home and providing
%patch1 -p1
%patch2 -p1
%patch3 -p1
+%patch4 -p1
# upstream patches and pending pulls
%patch11 -p1
@@ -221,6 +223,7 @@ fi
%changelog
* Fri Aug 17 2012 Leigh Scott <leigh123linux at googlemail.com> - 1.5.2-5
- rebuilt for new cogl version
+- patch bluetooth applet
* Sun Aug 12 2012 Leigh Scott <leigh123linux at googlemail.com> - 1.5.2-4
- Fix directory ownership
More information about the scm-commits
mailing list