pool/gnome-shell
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 89204 from GNOME:Factory

Browse Source 
- Add gnome-shell-fix-deprecated-call.patch: fix deprecated call in
  telepathy client [bgo#661231] (forwarded request 89180 from fcrozat)

OBS-URL: https://build.opensuse.org/request/show/89204
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gnome-shell?expand=0&rev=45
This commit is contained in:
Stephan Kulow 2011-10-25 13:56:48 +00:00 committed by Git OBS Bridge
commit 40f5c655c4
4 changed files with 89 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
gnome-shell-cleanup-signal-handlers-on-destroy.patch Normal file
View File

@ -0,0 +1,41 @@
From 7945c56a9f2cb5c2dc8736bc46e92d225cca9251 Mon Sep 17 00:00:00 2001
From: Giovanni Campagna <gcampagna@src.gnome.org>
Date: Mon, 17 Oct 2011 15:18:25 +0200
Subject: [PATCH] IMStatusChooserItem: clean up signal handlers on destroy()
Extensions (like alternative-status-menu) expect that calling
destroy() on a menu item will not leave signal handlers around.
https://bugzilla.gnome.org/show_bug.cgi?id=660520
---
js/ui/userMenu.js | 15 +++++++++++++++
1 files changed, 15 insertions(+), 0 deletions(-)
diff --git a/js/ui/userMenu.js b/js/ui/userMenu.js
index 40ca2f3..8bedfb9 100644
--- a/js/ui/userMenu.js
+++ b/js/ui/userMenu.js
@@ -199,6 +199,21 @@ IMStatusChooserItem.prototype = {
}));
},
+ destroy: function() {
+ // clean up signal handlers
+ if (this._userLoadedId != 0) {
+ this._user.disconnect(this._userLoadedId);
+ this._userLoadedId = 0;
+ }
+
+ if (this._userChangedId != 0) {
+ this._user.disconnect(this._userChangedId);
+ this._userChangedId = 0;
+ }
+
+ PopupMenu.PopupBaseMenuItem.prototype.destroy.call(this);
+ },
+
// Override getColumnWidths()/setColumnWidths() to make the item
// independent from the overall column layout of the menu
getColumnWidths: function() {
--
1.7.6.4

29
gnome-shell-fix-deprecated-call.patch Normal file
View File

@ -0,0 +1,29 @@
From b62f5ef07d87db7835fa753fe1774a5ed32d871d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner@gnome.org>
Date: Mon, 24 Oct 2011 15:52:13 +0200
Subject: [PATCH] telepathy-client: Replace shell_util_new_from_string
The function has been removed in commit 786cfbd3976, but one user
was overlooked when replacing it.
https://bugzilla.gnome.org/show_bug.cgi?id=661231
---
js/ui/telepathyClient.js | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/js/ui/telepathyClient.js b/js/ui/telepathyClient.js
index 695a12b..3c14eda 100644
--- a/js/ui/telepathyClient.js
+++ b/js/ui/telepathyClient.js
@@ -1297,7 +1297,7 @@ MultiNotificationSource.prototype = {
},
createNotificationIcon: function() {
- return new St.Icon({ gicon: Shell.util_icon_from_string(this._icon),
+ return new St.Icon({ gicon: Gio.icon_new_for_string(this._icon),
icon_type: St.IconType.FULLCOLOR,
icon_size: this.ICON_SIZE });
}
--
1.7.7

13
gnome-shell.changes
View File

@ -1,3 +1,16 @@
-------------------------------------------------------------------
Mon Oct 24 14:43:45 UTC 2011 - fcrozat@suse.com
- Add gnome-shell-fix-deprecated-call.patch: fix deprecated call in
telepathy client [bgo#661231]
-------------------------------------------------------------------
Tue Oct 20 12:02:48 UTC 2011 - sysrich@linux.com
- Add gnome-shell-cleanup-signal-handlers-on-destroy.patch to fix
some issue when using extensions changing the usermenu
[bgo#660520 and bnc#725004]
-------------------------------------------------------------------
Tue Oct 18 07:40:48 UTC 2011 - dimstar@opensuse.org

6
gnome-shell.spec
View File

@ -25,6 +25,10 @@ Summary: GNOME Shell
Group: System/GUI/GNOME
Url: http://live.gnome.org/GnomeShell
Source: http://download.gnome.org/sources/gnome-shell/3.2/%{name}-%{version}.tar.bz2
# PATCH-FIX-UPSTREAM gnome-shell-cleanup-signal-handlers-on-destroy.patch bnc#725004 sysrich@linux.com -- patch to fix some issue when using extensions changing the usermenu
Patch0: gnome-shell-cleanup-signal-handlers-on-destroy.patch
# PATCH-FIX-UPSTREAM gnome-shell-fix-deprecated-call.patch bgo#661231 fcrozat@suse.com -- fix deprecated function call
Patch1: gnome-shell-fix-deprecated-call.patch
BuildRequires: intltool
BuildRequires: translation-update-upstream
BuildRequires: update-desktop-files
@ -108,6 +112,8 @@ to enable, disable and install them.
%lang_package
%prep
%setup -q
%patch0 -p1
%patch1 -p1
translation-update-upstream
%build