debian/0000775000000000000000000000000012313665711007175 5ustar debian/changelog0000664000000000000000000014753212313665711011063 0ustar gnome-shell (3.10.4-0ubuntu5) trusty; urgency=medium * debian/patches/git_sttexturecache_dont_crash.patch: Don't crash if fail to create framebuffer object (LP: #850365) -- Tim Lunn Mon, 24 Mar 2014 09:50:40 +1100 gnome-shell (3.10.4-0ubuntu4) trusty; urgency=medium * source_gnome-shell.py: update for renamed gnome-session-gnome.log, remove attachment of obsolete files -- Tim Lunn Thu, 13 Mar 2014 09:11:24 +1100 gnome-shell (3.10.4-0ubuntu3) trusty; urgency=medium * debian/patches/git_shell_global_fix_scale_factor.patch: git patch to fix invalid scale_factor setting breaking the live sessions. (LP: #1284496) -- Tim Lunn Wed, 26 Feb 2014 10:01:32 +1100 gnome-shell (3.10.4-0ubuntu2) trusty; urgency=medium * debian/control.in: Depend on gnome-session which due to package split now contains only the session files (LP: #1284417) -- Tim Lunn Tue, 25 Feb 2014 20:08:38 +1100 gnome-shell (3.10.4-0ubuntu1) trusty; urgency=medium * New upstream release * debian/control.in: Bump build-dep on mutter (>= 3.10.4) * debian/patches: Dropped, included in new release - git_shellapp_running_state.patch, - git_shellapp_unref_running_state.patch -- Tim Lunn Thu, 20 Feb 2014 17:53:06 +1100 gnome-shell (3.10.3-0ubuntu3) trusty; urgency=medium * debian/patches: prepare for js24 - git_remove_e4x.patch - git_remove_js-version_set.patch - git_remove_gc_notifications.patch - git_port_c++.patch - git_remove_direct_jsapi_access.patch - git_remove_lg_memory_tab.patch - revert-shelldbus-export-timestamps.patch, refreshed - revert-disable-periodic-gc.patch, disabled for now * debian/control.in: Bump build-dep on gjs (>= 1.39.0) -- Tim Lunn Mon, 10 Feb 2014 07:56:22 +1100 gnome-shell (3.10.3-0ubuntu2) trusty; urgency=medium * debian/patches: add git patches to fix regression in shell-app window tracking (LP: #1274453) - git_shellapp_running_state.patch, - git_shellapp_unref_running_state.patch -- Tim Lunn Thu, 30 Jan 2014 09:12:54 +1100 gnome-shell (3.10.3-0ubuntu1) trusty; urgency=medium * New upstream release (LP: #1269916) * Merge from Debian, remaining changes: - debian/control.in: + Recommend gdm instead of gdm3 + Add Recommends on network-manager since this is required for network panel to work. (LP: #1225787) - debian/patches/revert-notification-settings-link.patch: + Don't link to Notification Settings since that's only available with gnome-control-center >= 3.8. - debian/patches/40_change-pam-name-to-match-gdm.patch: + Disabled not needed on Ubuntu - debian/patches/revert-disable-periodic-gc.patch: + This is safe to re-enable with mozjs17 - debian/patches/ubuntu-lightdm-user-switching.patch: + Allow user switching when using LightDM. Rebased for 3.10 Usermenu changes (thanks Parin) - debian/patches/ubuntu_lock_on_suspend.patch + Respect Ubuntu's lock-on-suspend setting. Rebased for 3.10 Usermenu changes (thanks Parin) - source_gnome_shell.py: Now we have upstart user sessions most logging goes into the gnome-session.log, so add this to the apport hook. * debian/patches: - revert_new_bluetooth.patch: revert changes requiring Bluez5 - revert_new_brightness_widget.patch: In its current form this requires gnome-settings-daemon 3.10. If trusty ends up on g-s-d 3.8, then this should be backported to the old API - revert-shelldbus-export-timestamps.patch: Revert api change to fix keyboard shortcuts, this can be dropped when g-s-d gets updated to 3.10 -- Tim Lunn Fri, 17 Jan 2014 06:52:05 +1100 gnome-shell (3.10.1-1) experimental; urgency=low [ Sjoerd Simons ] * New upstream release * debian/patches/11-no-gettext.patch + Removed, fixed upstream * debian/patches/git_relock_screen_after_crash.patch + Removed, fixed upstream * debian/patches/revert-suspend-break.patch + Removed, our systemd-logind is new enough these days * debian/patches/10-make-NetworkManager-optional.patch debian/patches/27-nm-libexec-path.patch debian/patches/40_change-pam-name-to-match-gdm.patch + Refreshed * debian/control.in: Sync b-depends and debians from Ubuntus gnome3-teams packaging * debian/patches/10-make-NetworkManager-optional.patch + Temporarily disabled as it breaks gnome-shell currently [ Laurent Bigonville ] * debian/control.in: - Demote gdm3 Depends to Recommends, if gdm is not installed gnome-shell will not be able to lock the screen (Closes: #727558) - Add Depends against gir1.2-gdm3 [ Sjoerd Simons ] * debian/gnome-shell-common.dirs: Create an empty /usr/share/gnome-shell/modes to work around bgo#709313 -- Sjoerd Simons Fri, 01 Nov 2013 23:03:15 +0100 gnome-shell (3.8.4-4) unstable; urgency=low [ Petr Salinger ] * Restrict dependency on gir1.2-nmgtk-1.0 to linux-any (Closes: #726099) [ Emilio Pozuelo Monfort ] * Upload to unstable. -- Emilio Pozuelo Monfort Sun, 13 Oct 2013 17:47:35 +0200 gnome-shell (3.8.4-3) experimental; urgency=low * debian/rules: + Explicitly enable NetworkManager support on linux. Closes: #725760. * debian/patches/10-make-NetworkManager-optional.patch: + Drop gnome-keyring-1 check, leftover from the 3.4 patch. -- Emilio Pozuelo Monfort Tue, 08 Oct 2013 17:53:24 +0200 gnome-shell (3.8.4-2) experimental; urgency=low * debian/patches/10-make-NetworkManager-optional.patch: + Updated from gentoo package for the new version, apply the patch again to fix the build on !linux. Closes: #692049. -- Emilio Pozuelo Monfort Sun, 06 Oct 2013 11:38:30 +0200 gnome-shell (3.8.4-1) experimental; urgency=low [ Emilio Pozuelo Monfort ] * debian/control.in: + Add gkbd-capplet back to gnome-shell's recommends. It was dropped in 3.7.92-1 but the shell's keyboard layout switcher uses it to display the layout in a window. [ Jeremy Bicha ] * debian/patches/git_relock_screen_after_crash.patch: + Backport fix to ensure session is locked after crash * debian/control.in: - Update homepage - Drop obsolete gconf dependency [ Emilio Pozuelo Monfort ] * New upstream release. [ Laurent Bigonville ] * debian/control.in: Bump gir1.2-ibus-1.0 dependency to 1.5.2, this is needed for the new ibus_bus_new_async() API. * debian/control.in: Bump Standards-Version to 3.9.4 (no further changes) * debian/gnome-shell.lintian-overrides: Adjust override -- Laurent Bigonville Sat, 24 Aug 2013 14:52:18 +0200 gnome-shell (3.8.4-0ubuntu8) trusty; urgency=medium * No-change rebuild for new cogl -- Iain Lane Tue, 14 Jan 2014 23:34:59 +0000 gnome-shell (3.8.4-0ubuntu7) trusty; urgency=medium * git_fix_introspection.patch: Add git patch to fix build with current gobject-introspection. -- Colin Watson Fri, 03 Jan 2014 16:31:37 +0000 gnome-shell (3.8.4-0ubuntu6) trusty; urgency=low * No-change rebuild for new e-d-s -- Iain Lane Wed, 13 Nov 2013 13:14:07 +0000 gnome-shell (3.8.4-0ubuntu5) saucy; urgency=low * debian/control.in: Add Recommends on network-manager since this is required for network panel to work. (LP: #1225787) -- Tim Lunn Mon, 16 Sep 2013 07:13:46 +1000 gnome-shell (3.8.4-0ubuntu4) saucy; urgency=low * source_gnome_shell.py: Now we have upstart user sessions most logging goes into the gnome-session.log, so add this to the apport hook. -- Tim Lunn Thu, 12 Sep 2013 07:50:07 +1000 gnome-shell (3.8.4-0ubuntu3) saucy; urgency=low [ Tim Lunn ] * debian/patches: revert-power-dbus-name-update.patch, revert-input-source-changes.patch: Dropped for build against gnome-setting-daemon 3.8 [ Jeremy Bicha ] * debian/control.in: Bump minimum gnome-settings-daemon to 3.8.4 -- Tim Lunn Mon, 09 Sep 2013 23:04:32 +1000 gnome-shell (3.8.4-0ubuntu2) saucy; urgency=low * debian/patches: - git_fix_calendar_wrapping.patch: fixes wrapping of long calender events - git_background_schema.patch, git_use_screensaver_bg.patch: git patches to allow using seperate bg for lock screen (LP: #1219188) -- Tim Lunn Sun, 08 Sep 2013 07:07:20 +1000 gnome-shell (3.8.4-0ubuntu1) saucy; urgency=low * New upstream release. * debian/patches/git-dont-crash-for-unstaged-widgets.patch: - Dropped, applied in new version -- Jeremy Bicha Wed, 31 Jul 2013 21:29:20 -0400 gnome-shell (3.8.3-1ubuntu5) saucy; urgency=low * debian/control.in: - Build-depend on gjs 1.37 (with mozjs17). This should noticeably reduce memory leaks and garbage collector lock ups (LP: #1205971, #1113166) * debian/patches: - revert-disable-periodic-gc.patch: this is safe to re-enable with mozjs17 - git_gjs_api_change.patch: update for minor api change in gjs 1.37 -- Tim Lunn Wed, 29 Jul 2013 01:00:57 +1000 gnome-shell (3.8.3-1ubuntu4) saucy; urgency=low * Depend on libgdm instead of gdm and suggest gdm. This avoids needing to choose between lightdm and gdm when installing gnome-shell (LP: #1162849) -- Jeremy Bicha Mon, 22 Jul 2013 21:00:17 -0400 gnome-shell (3.8.3-1ubuntu3) saucy; urgency=low * debian/patches/git-dont-crash-for-unstaged-widgets.patch: - Git patch to fix GNOME Shell crashing when, for instance, Nautilus is ran with not other apps running (LP: #1164086) * debian/control.in: drop obsolete gconf dependency gnome-shell (3.8.3-1ubuntu3) saucy; urgency=low * debian/patches/git-dont-crash-for-unstaged-widgets.patch: - Git patch to fix GNOME Shell crashing when, for instance, * debian/patches/revert-notification-settings-link.patch: - Don't link to Notification Settings since that's only available with gnome-control-center >= 3.8. Nautilus is ran with not other apps running (LP: #1164086) * debian/control.in: drop obsolete gconf dependency -- Jeremy Bicha Sun, 14 Jul 2013 12:31:49 -0400 gnome-shell (3.8.3-1ubuntu2) saucy; urgency=low * debian/patches/revert-power-dbus-name-update.patch: - Revert a commit that broke the power menu. This patch should be dropped when we upgrade gnome-settings-daemon to 3.8. (LP: #1195093) -- Jeremy Bicha Wed, 26 Jun 2013 23:11:45 -0400 gnome-shell (3.8.3-1ubuntu1) saucy; urgency=low * Merge with Debian. Remaining changes: - debian/control.in: + Build-depend on libsystemd-login-dev & libsystemd-daemon-dev + Depend on gdm instead of gdm3 - debian/patches/40_change-pam-name-to-match-gdm.patch: - debian/patches/revert-suspend-break.patch: + Disabled, not needed on Ubuntu - debian/patches/ubuntu-lightdm-user-switching.patch: + Allow user switching when using LightDM. - debian/patches/ubuntu_lock_on_suspend.patch + Respect Ubuntu's lock-on-suspend setting. Disabled until it can be rewritten. - debian/patches/git_relock_screen_after_crash.patch: + Backport fix to ensure session is locked after crash * debian/patches/revert-input-source-changes.patch: - Temporarily revert input source changes that need gnome-settings-daemon and gnome-control-center 3.8.3 to be useful * debian/patches/revert-notification-settings-link.patch: - Don't link to Notification Settings since that's only available with gnome-control-center >= 3.8. -- Jeremy Bicha Sun, 16 Jun 2013 19:14:01 -0400 gnome-shell (3.8.3-1) experimental; urgency=low [ Jeremy Bicha ] * debian/control.in: - Don't recommend gnome-session-fallback [ Emilio Pozuelo Monfort ] * debian/control.in: + Bump minimum gir1.2-gtk-3.0 dependency. Thanks to Frederik Himpe . * New upstream release. * debian/control.in: + Bump build dependencies. * debian/patches/series: + Disable 30-remoteMenu-Prevent-the-shell-from-becoming-unrespons.patch, it conflicts with changes in the new version and may not be necessary anymore. -- Emilio Pozuelo Monfort Sat, 08 Jun 2013 19:05:08 +0200 gnome-shell (3.8.2-1) experimental; urgency=low * New upstream release. + debian/control.in: - Update mutter dependencies. -- Emilio Pozuelo Monfort Fri, 24 May 2013 17:34:32 +0200 gnome-shell (3.8.1-2) experimental; urgency=low * Team upload * Reinstate support for suspend via UPower using the user-menu, until our logind is new enough to take over (Closes: #704272) * Delay suspend for 1 second in the hope that that's long enough to lock the screen (works around #645716, but only if you suspend via the user-menu) -- Simon McVittie Mon, 22 Apr 2013 11:17:11 +0100 gnome-shell (3.8.1-1) experimental; urgency=low * New upstream release * debian/control.in: Update mutter depends to 3.8.1 -- Sjoerd Simons Fri, 19 Apr 2013 23:45:29 +0200 gnome-shell (3.8.0.1-2) experimental; urgency=low * debian/control.in: Add gir1.2-telepathylogger-0.2 runtime depend -- Sjoerd Simons Sun, 31 Mar 2013 22:36:06 +0200 gnome-shell (3.8.0.1-1) experimental; urgency=low * New upstream release. -- Emilio Pozuelo Monfort Wed, 27 Mar 2013 19:12:49 +0100 gnome-shell (3.8.0-1) experimental; urgency=low [ Sjoerd Simons ] * debian/control.in: Bump caribou run-time depend to >= 0.4.8 [ Emilio Pozuelo Monfort ] * New upstream release. + debian/control.in: - Bump mutter build and binary dependencies. - Remove build dependency on network-manager-dev now that libnm-glib-dev has been fixed. - Restrict libnm-gtk-dev build dependency to linux-any. -- Emilio Pozuelo Monfort Wed, 27 Mar 2013 00:28:32 +0100 gnome-shell (3.7.92-1) experimental; urgency=low [ Sjoerd Simons ] * Sync from Ubuntu * d/p/ubuntu-lightdm-user-switching.patch: d/p/ubuntu_lock_on_suspend.patch: + Dropped, Ubuntu specifc * d/p/14_make-GLX-optional.patch: Fixed upstream * debian/control.in: Depend on e-d-s >= 3.7.90 to fix build failures due to deprecated structures in headers. * debian/patches/40_change-pam-name-to-match-gdm.patch + Added. Change the pam service name to match the one used by gdm in debian [ Emilio Pozuelo Monfort ] * New upstream release. + debian/control.in: - Update build dependencies. - Temporarily add an explicit build-depend on network-manager-dev until libnm-glib-dev gets a versioned dependency. + debian/patches/git_fix_too_short_apps_view.patch: - Removed, included upstream. -- Emilio Pozuelo Monfort Wed, 20 Mar 2013 22:40:26 +0100 gnome-shell (3.7.90-0ubuntu1~raring1) raring; urgency=medium [ Jeremy Bicha ] * New upstream alpha release * debian/control.in: - Drop obsolete libedataserverui-dev dependency - Depend on gir1.2-nmgtk-1.0 - Build-depend on caribou and gnome-desktop3 * debian/watch: Watch for unstable releases * ubuntu-lightdm-user-switching.patch: Refreshed * ubuntu_lock_on_suspend.patch: Disabled * revert-suspend-break.patch: - Sure, suspend is currently broken on Ubuntu with GNOME 3.8, but let's not break it worse than necessary * git_fix_too_short_apps_view.patch: - Fix missing text on bottom row of apps view in the overview [ Rico Tzschichholz ] * debian/control.in: - Bump minimum dependencies on gnome-desktop3, libcroco, libpulse, clutter, gsettings-desktop-schemas, gjs and mutter - Build-depend on libcanberra-gtk3-dev - Drop build-depends on gconf and libgnome-desktop3-dev * debian/rules: - Add src/gvc to gir list * Drop patches applied in new version: - git-set-ally-wm-theme.patch - git_messagetray_opacity_fix.patch - git_messagetray_remove_tweens.patch - git_messagetray_fix_expansion.patch - telepathyClient-Fix-auto-scroll-to-bottom.patch - ubuntu_screensaver_fallback.patch * 10-make-NetworkManager-optional.patch: - Dropped, this was Debian-specific and they intend to drop it too * Refreshed patches: - 14_make-GLX-optional.patch - ubuntu_lock_on_suspend.patch * ubuntu-lightdm-user-switching.patch: Disabled as it breaks the user menu -- Jeremy Bicha Sat, 23 Feb 2013 17:43:44 -0500 gnome-shell (3.6.2-0ubuntu4) raring; urgency=low * Upstream bugfix for disappearing notifications (LP: #1088759) debian/patches/git_messagetray_fix_expansion.patch -- Tim Lunn Mon, 17 Dec 2012 07:55:47 +1100 gnome-shell (3.6.2-0ubuntu3) raring; urgency=low * Upstream bugfix for disappearing message tray (LP: #1067265) debian/patches/git_messagetray_remove_tweens.patch debian/patches/git_messagetray_opacity_fix.patch -- Tim Lunn Tue, 27 Nov 2012 08:27:57 +1100 gnome-shell (3.6.2-0ubuntu2) raring; urgency=low * debian/control.in: - Don't recommend gnome-session-fallback; gnome-shell doesn't need fallback mode now that we're using llvmpipe * debian/git-set-ally-wm-theme.patch: - Git patch to set/reset HighContrast window theme too -- Jeremy Bicha Sun, 25 Nov 2012 12:51:35 -0500 gnome-shell (3.6.2-0ubuntu1) raring; urgency=low * New upstream release. (LP: #1078155) - Fixes disable-user-list option (LP: #1072838) * debian/control.in - Bump minimum mutter - Build-depend on gtk-doc-tools to generate updated man page * debian/patches/telepathyClient-Fix-auto-scroll-to-bottom.patch - Dropped, applied in new version * debian/patches/ubuntu_screensaver_fallback.patch: - Dropped, applied in new version * debian/patches/ubuntu_lock_on_suspend.patch - Refreshed -- Jeremy Bicha Mon, 12 Nov 2012 23:11:33 -0500 gnome-shell (3.6.1-3ubuntu2) raring; urgency=low * Rebuild against new mutter -- Jeremy Bicha Thu, 08 Nov 2012 10:47:35 -0500 gnome-shell (3.6.1-3ubuntu1) raring; urgency=low [ Jeremy Bicha ] * Merge with Debian (LP: #1044408). Remaining changes: * debian/control.in: - Depend on gdm instead of gdm3 - Don't depend on ibus 1.4.99 yet as it's not in Ubuntu yet * debian/source_gnome-shell.py: - Include session logs and report which display manager is running * 29-Cope-with-clutter-being-built-with-both-new-and-old-.patch: - Dropped, not needed in Ubuntu * debian/patches/ubuntu-lightdm-user-switching.patch: - Fix user switching when running lightdm (LP: #1064269) * debian/patches/ubuntu_lock_on_suspend.patch - fix lock on suspend via user menu * debian/patches/ubuntu_screensaver_fallback.patch: - Explicitly start gnome-screensaver when screenshield loads in fallback mode. [ Simon McVittie ] * Increase libsoup dependency to 2.40, needed when installing extensions from extensions.gnome.org * Recommend unzip, also for extensions.gnome.org (Closes: #680978) -- Jeremy Bicha Thu, 08 Nov 2012 09:21:38 -0500 gnome-shell (3.6.1-3) experimental; urgency=low * debian/rules: Depends on 3.6 versions of gir1.2-gnomebluetooth-1.0 and gir1.2-gnomedesktop-3.0 * debian/rules: Add dependency on evolution-data-server (Closes: #690554) * debian/rules: Depend on gir1.2-telepathylogger-0.2 >= 0.4.0-2 to get the annotation updates needed by gnome-shell * debian/rules: gir1.2-ibus-1.0 (> 1.4.99) needed for the ibus related functionality * debian/patches/telepathyClient-Fix-auto-scroll-to-bottom.patch: + Added. Fix auto-scroll down in the builtin telepathy message view (bgo: #686571) -- Sjoerd Simons Sun, 21 Oct 2012 14:50:16 +0200 gnome-shell (3.6.1-2) experimental; urgency=low * d/p/30-remoteMenu-Prevent-the-shell-from-becoming-unrespons.patch: - Added, prevent gnome-shell from become unresponsive (bgo: #686502) -- Sjoerd Simons Sat, 20 Oct 2012 01:17:07 +0200 gnome-shell (3.6.1-1) experimental; urgency=low * New upstream release * d/p/28-ShellUserVerifier-fix-typo-in-function-name-caught-o.patch: - Removed, fixed upstream -- Sjoerd Simons Wed, 17 Oct 2012 21:01:15 +0200 gnome-shell (3.6.0-1) experimental; urgency=low * New upstream release * d/p/28-ShellUserVerifier-fix-typo-in-function-name-caught-o.patch: - Added. Fix typo in function name called from auth error (From upstream git) * d/p/29-Cope-with-clutter-being-built-with-both-new-and-old-.patch: - Added. The ClutterColor g-i API changes depending on which version of gobject-introspection clutter is built with. Deal with both variants * d/p/01_slist_cleanup.patch d/p/02_filter_nodisplay_parents.patch d/p/03_don-t-show-apps-in-NoDisplay-categories.patch d/p/04_fix_nodisplay.patch d/p/25-close-the-recorder-instead-of-pausing-it.patch d/p/26-networkAgent-use-absolute-path-if-configured.patch d/p/32-enable-the-screen-reader-menu-item.patch d/p/33-screen-reader-l10n.patch - Dropped, all fixed upstream * d/p/14_make-GLX-optional.patch: Refreshed * d/p/27-nm-libexec-path.patch: Refreshed * d/p/10-make-NetworkManager-optional.patch: Temporarily disabled * debian/gnome-shell.gsettings-override: Use epiphany instead of iceweasel again * debian/control.in: Conflict with gnome-screensaver (<< 3.6) as both try to provide the screensaver in the full gnome session * Sync with Ubuntu: + debian/control.in: Update build-depends + debian/source_gnome-shell.py: Add apport hook -- Sjoerd Simons Mon, 15 Oct 2012 09:34:33 +0200 gnome-shell (3.4.2-2) unstable; urgency=low * Replace epiphany by iceweasel. Closes: #682481. * Drop obsolete README.Debian. Closes: #684584. -- Josselin Mouette Sat, 29 Sep 2012 10:20:25 +0200 gnome-shell (3.4.2-1) unstable; urgency=low [ Laurent Bigonville ] * New upstream release. - Drop patches 24-mirror-evolution-calendar-settings.patch and 26-fix-empathy-popup-regression.patch, applied upstream. * Add d/p/26-networkAgent-use-absolute-path-if-configured.patch: Fix issue finding VPN authentication binary, taken from upstream (Closes: #681737) * d/p/27-nm-libexec-path.patch: Use Debian specific NM VPN helpers paths [ Josselin Mouette ] * Change epiphany desktop file name to match the change in the epiphany package. [ Jordi Mallach ] * debian/patches: - 32-enable-the-screen-reader-menu-item.patch: Add Orca to the a11y menu, to improve accessibility of the Shell-based GDM greeter. - 33-screen-reader-l10n.patch: Steal translations for new string "Screen Reader" from GNOME Control Center. -- Laurent Bigonville Sat, 04 Aug 2012 13:18:50 +0200 gnome-shell (3.4.1-8) unstable; urgency=low * 27-don-t-show-apps-in-NoDisplay-categories.patch: renamed as 03_don-t-show-apps-in-NoDisplay-categories.patch for reordering. * 01_slist_cleanup.patch, 02_filter_nodisplay_parents.patch, 04_fix_nodisplay.patch: correctly filter out applications in a NoDisplay directory, including parent directories. This should finally fix for good handling of the Debian menu, including in searches. Closes: #677498. * Bump the build-dependency on gnome-menus accordingly. -- Josselin Mouette Sat, 23 Jun 2012 20:49:32 +0200 gnome-shell (3.4.1-7) unstable; urgency=low * debian/patches/21_revert_evolution_gsettings.patch: Drop this patch now that we have evolution 3.4. * debian/patches/24-mirror-evolution-calendar-settings.patch: Mirror Evolution calendar settings into our own schema to avoid a hard dependency on evolution for the gsettings schema file. Patch cherry-picked from upstream Git. -- Michael Biebl Wed, 20 Jun 2012 06:31:49 +0200 gnome-shell (3.4.1-6) unstable; urgency=low [ Laurent Bigonville ] * d/p/26-fix-empathy-popup-regression.patch: Fix Empathy popup regression (taken from upstream) [ Michael Biebl ] * debian/patches/09-respect-NoDisplay-semantics-for-app-menu.patch: Drop this patch as it breaks application tracking for all applications marked as NoDisplay. Closes: #676425 * debian/patches/27-don-t-show-apps-in-NoDisplay-categories.patch: Explicitly include NoDisplay applications in the ShellAppSystem because we want application tracking for them, but filter NoDisplay applications out when showing them to the user because we don't want to show them to the user. Patch backported from upstream Git. -- Michael Biebl Tue, 12 Jun 2012 17:09:34 +0200 gnome-shell (3.4.1-5) unstable; urgency=low * Disabling the screen recorder on arm{el,hf} was not sufficient to make it build everywhere since the screen grabber is also used for making screenshots. Update debian/patches/14_make-GLX-optional.patch instead and only use pixel buffers in the screen grabber if we have GL/GLX support. This means we can re-enable the screen recorder on arm{el,hf} as it will use the slow, cogl-based path there. -- Michael Biebl Wed, 30 May 2012 20:56:52 +0200 gnome-shell (3.4.1-4) unstable; urgency=low * debian/patches/14_make-GLX-optional.patch: - Add DEP-3 patch header. - Remove unconditional pkg-config check for the "gl" module. -- Michael Biebl Wed, 30 May 2012 14:37:44 +0200 gnome-shell (3.4.1-3) unstable; urgency=low * Upload to unstable. -- Michael Biebl Wed, 30 May 2012 13:19:38 +0200 gnome-shell (3.4.1-2) experimental; urgency=low * debian/patches/22-remove-online-accounts-from-user-menu.patch: Remove "Online Accounts" from user menu. It can be easily accessed via "System Settings" so there is no need to clutter up the user menu. * Tighten Depends on gir1.2-clutter-1.0. Closes: #673929 * Change Recommends: gnome-themes-standard to Depends. Adwaita is the prefererred window manager theme and without a theme installed gnome-shell refuses to start. Closes: #590340 * Bump Depends on gnome-settings-daemon to (>= 3.4.0). There was an incompatible change in the Power D-Bus API which caused the power icon to no longer update properly. Closes: #674429 * Don't build the screen recorder on arm{el,hf} as the screen grabber uses GL/GLX and on those archs cogl uses GLES. * debian/patches/25-close-the-recorder-instead-of-pausing-it.patch: Close the screen recorder instead of pausing. Otherwise we continue to write to the same output file. Patch cherry-picked from upstream Git. -- Michael Biebl Wed, 30 May 2012 12:17:13 +0200 gnome-shell (3.4.1-1) experimental; urgency=low [ Jeremy Bicha ] * New upstream release. * debian/control.in: - Add debug package - Update dependencies - Recommend gnome-user-guide - Break gnome-tweak-tool (<< 3.3) - Bump Standards-Version to 3.9.3 * debian/gnome-shell-common.install: - No more gconf schemas to install - Install gtk-docs * Drop patches that have been applied upstream. [ Sjoerd Simons ] * debian/control.in: Add build-depends on libgcr-3-dev (>= 3.3.90) * debian/control.in: Drop dependency on gir1.2-gjs-1.0 as it has been folded into libgjs * debian/control.in: Add depends on gir1.2-gcr-3 [ Michael Biebl ] * debian/patches/10-make-NetworkManager-optional.patch: Updated. * debian/gnome-shell-common.install: Install GConf conversion script. * debian/patches/21_revert_evolution_gsettings.patch: Revert the switch to gsettings in the calendar server for now as long as evolution 3.4 is not ready yet. -- Michael Biebl Sun, 20 May 2012 00:16:54 +0200 gnome-shell (3.2.2.1-4) unstable; urgency=low * Fold 04_remove-glx-dependency-on-armel.patch and 14_require_gl_directly.patch into a new patch named 14_make-GLX-optional.patch. Use pkg-config to check if gl.pc is available and build the GLX/GL bits conditionally. This fixes a build failure on arm{el,hf} where clutter/cogl uses GLES. Closes: #670850 -- Michael Biebl Mon, 30 Apr 2012 20:37:44 +0200 gnome-shell (3.2.2.1-3) unstable; urgency=low * d/p/14_require_gl_directly.patch + Added. gnome-shell uses glXQuery* API so it needs a direct link against libGL. Causes build failure with upcoming clutter/cogl as they don't expose a directly link to libGL anymore -- Sjoerd Simons Sun, 01 Apr 2012 16:07:26 +0200 gnome-shell (3.2.2.1-2) unstable; urgency=low * debian/patches/12_Replace-shell_util_icon_from_string.patch + Added. Remove the neglected user of the removed Shell.util_icon_from_string function. This caused subscription request to not pop up (From upstream git) * debian/patches/13_bluetooth_fix_undefined_variable.patch + Added. Fixes bluetooth device status slider so it reflects reality again (From upstream git) -- Sjoerd Simons Tue, 28 Feb 2012 11:30:47 +0100 gnome-shell (3.2.2.1-1) unstable; urgency=low [ Michael Biebl ] * debian/patches/10-make-NetworkManager-optional.patch: make NM optional, to fix build on kFreeBSD architectures. Closes: #652482 * debian/patches/11-no-gettext.patch: remove gettext macros, otherwise autoreconf fails due to incompatibilities with intltool. [ Jordi Mallach ] * Enable dh_autoreconf. * Update Vcs-* URLs. [ Josselin Mouette ] * Update repository URL. [ Michael Biebl ] * New upstream release: - Fix a crash in gnome-shell-extension-tool. Closes: #649583 - Remove 05-NetworkMenu-don-t-query-DBus-properties-of-removed-o.patch. - Remove 06-NetworkMenu-fix-regression-in-access-point-removed.patch. - Refresh 07-NetworkMenu-fix-logic-for-updating-wifi-icon.patch. * debian/control.in: Bump dependency on python to (>= 2.6) since we require JSON support. Closes: #580869 -- Michael Biebl Wed, 25 Jan 2012 11:06:41 +0100 gnome-shell (3.2.1-8) unstable; urgency=low [ Laurent Bigonville ] * debian/control.in: Add Depends on telepathy-mission-control-5 (Closes: #651514) [ Michael Biebl ] * Upload to unstable. -- Michael Biebl Sat, 17 Dec 2011 06:34:55 +0100 gnome-shell (3.2.1-7) experimental; urgency=low * Fix version in Breaks/Replaces. Closes: #650927 -- Michael Biebl Sun, 04 Dec 2011 21:19:25 +0100 gnome-shell (3.2.1-6) experimental; urgency=low [ Raphaël Hertzog ] * Add Breaks against gnome-tweak-tool (<< 3.2) to force its upgrade to a version that works with GNOME 3.2. [ Josselin Mouette ] * Split common files and translations in gnome-shell-common. Add appropriate Breaks/Replaces. [ Michael Biebl ] * debian/watch: - Track stable releases. * debian/patches/09-respect-NoDisplay-semantics-for-app-menu.patch: - Respect NoDisplay semantics for applications menu. This avoids duplicate menu entries when menu-xdg is installed. Closes: #649559 -- Michael Biebl Sat, 03 Dec 2011 17:23:39 +0100 gnome-shell (3.2.1-5) experimental; urgency=low * debian/patches/06-polkit-Find-the-best-user-to-authenticate-as.patch: + Added. When picking a user to authenticate with, try the current user first, then root and if all else fails the first user that is allowed to authenticate. (from upstream git) -- Sjoerd Simons Sun, 20 Nov 2011 22:28:42 +0000 gnome-shell (3.2.1-4) experimental; urgency=low * 05-NetworkMenu-don-t-query-DBus-properties-of-removed-o.patch: + Added. Don't (potentially) ask NM over D-Bus about an access point that was just removed. (From upstream git). As a side-effect this fixes gnome-shell freezing a while after unblacking. * 06-NetworkMenu-fix-regression-in-access-point-removed.patch + Added. Fix a regression in above patch (from upstream git) * 07-NetworkMenu-fix-logic-for-updating-wifi-icon.patch + Added. Fix the logic for connecting to the current wifi strength, prevents the network icon fro mbecoming stale (from upstream git) -- Sjoerd Simons Sat, 19 Nov 2011 15:28:19 +0000 gnome-shell (3.2.1-3) experimental; urgency=low [ Josselin Mouette ] * Break fglrx-driver (<< 1:11-10). Closes: #648280. [ Sjoerd Simons ] * debian/control.in: Recommend gnome-contacts * debian/control.in: Update build-depends on the e-d-s libs to ensure we build against the same version as the libfolks e-d-s backend. -- Sjoerd Simons Sun, 13 Nov 2011 16:40:12 +0100 gnome-shell (3.2.1-2) experimental; urgency=low * debian/control.in: - Tighten Depends on gir1.2-mutter-3.0 and gir1.2-glib-2.0. Closes: #646999 - Drop Build-Depends on libgnome-menu-dev. -- Michael Biebl Sat, 05 Nov 2011 21:35:14 +0100 gnome-shell (3.2.1-1) experimental; urgency=low [ Sjoerd Simons ] * New upstream release * debian/patches/00git-ShellRecorder-Use-cogl_read_pixels.patch: + Dropped, fixed upstream * debian/patches/03_hidden_applications.patch + Dropped, fixed upstream * debian/control.in: Add libfolks-dev build-depends * debian/control.in: Add depends on gir1.2-accountsservice-1.0 and gir1.2-caribou-1.0, [ Jeremy Bicha ] * debian/control.in: - Recommend gnome-session-fallback - Bump minimum gjs & gobject-introspection versions - Add gir1.2-soup-2.4 dependency [ Sjoerd Simons ] * debian/gnome-shell.lintian-overrides: + Updated (from Ubuntu). gnome-shell needs an rpath to find the private bluetooth lib -- Sjoerd Simons Fri, 28 Oct 2011 22:20:04 +0200 gnome-shell (3.0.2-8) unstable; urgency=low * debian/patches/05_fix_glib_2.30_compat.patch: + Updated. Small mistake in the patch causes gnome-shell to fail to load the dim window shared, instead of which it just hangs. Fixed now.. (Closes: 649459) -- Sjoerd Simons Mon, 21 Nov 2011 15:19:48 +0000 gnome-shell (3.0.2-7) unstable; urgency=low * debian/patches/06-polkit-Find-the-best-user-to-authenticate-as.patch: + Added. When picking a user to authenticate with, try the current user first, then root and if all else fails the first user that is allowed to authenticate. (from upstream git) * debian/patches/07-Add-some-element-type-annotations-to-appease-g-i-mas.patch: + Added. Add annotation to prevent warnings from new g-i (from upstream git) -- Sjoerd Simons Sun, 20 Nov 2011 22:04:39 +0000 gnome-shell (3.0.2-6) unstable; urgency=low * debian/patches/05_fix_glib_2.30_compat.patch: + Added. Fix compatibility with glib 2.30, which broke some things due to GI annotation changes. (From upstream git) -- Sjoerd Simons Sat, 19 Nov 2011 15:04:45 +0000 gnome-shell (3.0.2-5) unstable; urgency=low [ Michael Biebl ] * debian/rules: - Make network-manager and gnome-bluetooth (build) dependencies linux-any. [ Rico Tzschichholz ] * Add 00git-ShellRecorder-Use-cogl_read_pixels.patch to fix FTBFS on arm -- Michael Biebl Fri, 14 Oct 2011 17:22:55 +0200 gnome-shell (3.0.2-4) unstable; urgency=low [ Josselin Mouette ] * Break gnome-session < 3. [ Rico Tzschichholz ] * Add 04_remove-glx-dependency-on-armel.patch to fix FTBFS on arm [ Michael Biebl ] * Upload to unstable. * debian/watch: Switch to .xz tarballs. * debian/control.in: - Set pkg-gnome-maintainers@lists.alioth.debian.org as Maintainer. - Bump Standards-Version to 3.9.2. No further changes. -- Michael Biebl Fri, 14 Oct 2011 12:56:37 +0200 gnome-shell (3.0.2-3) experimental; urgency=low * Re-add gnome-bluetooth dependency. -- Josselin Mouette Mon, 19 Sep 2011 18:53:24 +0200 gnome-shell (3.0.2-2) experimental; urgency=low [ Martin Pitt ] * debian/control.in, debian/rules: When building on Ubuntu, add a dependency to gnome-icon-theme-full. * debian/control.in: Change gir1.2-json-glib-1.0 build-dep to gir1.2-json-1.0 to reflect the binary rename in json-glib 0.13.4-2. Thanks Micah Gersten! [ Laurent Bigonville ] * debian/control.in: - Drop dependency against libdconf0 and let dh_installgsettings set the right dependencies. - Make gnome-shell Recommends gnome-themes-standard (for Adwaita) * debian/compat: Bump debhelper compatibility to 8 [ Josselin Mouette ] * 03_hidden_applications.patch: do not show NoDisplay=true submenus and applications. This will avoid showing the Debian menu while asked not to. Closes: #557997. * 01_favorite_apps.patch: dropped, replaced by override file. * Add libreoffice and yelp to favorite applications. * Drop useless build-dependency on libwnck. * Massive cleanup in build-dependencies. -- Josselin Mouette Mon, 19 Sep 2011 16:36:48 +0200 gnome-shell (3.0.2-1) experimental; urgency=low [ Rico Tzschichholz ] * New upstream release * debian/watch: - Look for bzip2 tarballs * debian/rules,debian/upstream.gitlog: - Drop upstream.gitlog which is outdated [ Josselin Mouette ] * Only recommend gnome-control-center. * Break gnome-control-center < 3. This time add the missing epoch. Closes: #628532. [ Sjoerd Simons ] * debian/rules: Fix misspelling of Recommends -- Sjoerd Simons Tue, 31 May 2011 19:31:47 -0700 gnome-shell (3.0.1-1) experimental; urgency=low [ Laurent Bigonville ] * debian/control.in: - Bump priority to optional [ Sjoerd Simons ] * New upstream release -- Sjoerd Simons Sat, 14 May 2011 17:58:12 +0100 gnome-shell (3.0.0.2-1) experimental; urgency=low * Team upload. [ Frederic Peters ] * New upstream release (2.91.93). * debian/control.in: + added dependency on gnome-icon-theme-symbolic. + bumped gnome-shell dependency. + bumped gir1.2-freedesktop build-dep to 0.10.6, for a fix to cairo-1.0.typelib [ Raphaël Hertzog ] * New upstream release (3.0.0.2). * New patch 02_rpath-bluetooth-applet.patch by Rico Tzschichholz to add an RPATH so that the compilation doesn't fail when g-ir-scanner tries to analyze libgnome-shell.so linked against libgnome-bluetooth-applet.so.0 which is in a private directory. * Add a lintian override for the RPATH that we can't avoid. * Teach dpkg-shlibdeps how to find that private lib and add the corresponding dependency in debian/slibs.local. * Update and add a bunch of build-depends to match the latest configure requirements. * Add gir1.2-gnomebluetooth-1.0 and gir1.2-networkmanager-1.0 to Depends because they are needed to benefit from the improved UI associated to the respective status bar applet. [ Laurent Bigonville ] * debian/control.in: {Build-}Depends against gir1.2-mutter-3.0 instead of gir1.2-mutter-2.91 -- Raphaël Hertzog Mon, 11 Apr 2011 21:03:31 +0000 gnome-shell (2.91.92-1) experimental; urgency=low * New upstream release. * debian/patches/, remove patches from upstream git: + 0001-altTab-fix-incorrect-positioning-with-multiple-monit.patch + 05_use_dbus_for_shutdown_and_logout.patch * debian/control.in: + add build-dep on libtelepathy-logger-dev and gir1.2-telepathylogger-0.2. + bump build-dep on libxfixes-dev, it needs the one from experimental, for pointer barriers. -- Frederic Peters Thu, 24 Mar 2011 19:28:12 +0100 gnome-shell (2.91.91-2) experimental; urgency=low * debian/patches/04_gnome_session_quit.patch: remove, replaced by: * debian/patches/05_use_dbus_for_shutdown_and_logout.patch: use Session D-Bus interface for shutdown and logout. (from git) (closes: #618870) -- Frederic Peters Sat, 19 Mar 2011 13:10:02 +0100 gnome-shell (2.91.91-1) experimental; urgency=low * New upstream release. [ Emilio Pozuelo Monfort ] * debian/control.in: + Depend on gsettings-desktop-schemas. Closes: #614945. + Depend on gir1.2-mutter-2.91. Closes: #615588. [ Frederic Peters ] * debian/control.in: + Don't depend on mutter, it now links against libmutter-wm0. * debian/patches/03_fix_dconf_service_location.patch: remove, no longer necessary now that gnome-shell is a real binary and doesn't try to arrange its own environment. * debian/patches/04_gnome_session_quit.patch: use gnome-session-save in fallback if gnome-session-quit doesn't work, so gnome-shell keeps working with older gnome-session versions. [ Emilio Pozuelo Monfort ] * d/p/0001-altTab-fix-incorrect-positioning-with-multiple-monit.patch: + Patch from upstream git, fix Alt+Tab with multiple monitors. -- Emilio Pozuelo Monfort Wed, 16 Mar 2011 21:47:27 +0000 gnome-shell (2.91.90-1) experimental; urgency=low * New upstream release. + Build depend on libtelepathy-glib-dev for the updated Telepathy integration. + Build depend on libpolkit-agent-1-dev for the new authorization dialogs. + Build depend, and depend, on appropriate gir packages (polkit, telepathy, and upower). + Update build dep on libmutter-dev. + Update depends for new libgnomekbd gir package name. + Remove Recommends on xserver-xephyr. -- Frederic Peters Fri, 25 Feb 2011 12:23:23 +0100 gnome-shell (2.91.6-1) experimental; urgency=low [ Emilio Pozuelo Monfort ] * debian/control.in: + Depend on gnome-control-center for My Account / System settings. [ Laurent Bigonville ] * New upstream release. * debian/control.in: - Bump build-dependencies - Add libecal1.2-dev, libedataserver1.2-dev and libedataserverui1.2-dev build-dependencies - Make mutter depends on libdconf0 | gsettings-backend instead of libdconf0 only [ Emilio Pozuelo Monfort ] * debian/control.in: + Update for the new gtk+ 3 package names. + Add missing dependency on gir1.2-gnomekbd-3.0. -- Emilio Pozuelo Monfort Sat, 19 Feb 2011 16:45:48 +0000 gnome-shell (2.91.5-1) experimental; urgency=low * New upstream release. + debian/patches/02_fix_build_with_latest_gtk.patch: - Removed, fixed upstream. + debian/patches/01_favorite_apps.patch: - Refreshed. + debian/control.in: - Updated build dependencies. -- Emilio Pozuelo Monfort Wed, 12 Jan 2011 23:41:41 +0000 gnome-shell (2.91.3-2) experimental; urgency=low * debian/control.in: - Build depend on libdconf0 for dconf-service. Closes: #595598. -- Emilio Pozuelo Monfort Sun, 19 Dec 2010 16:36:11 +0000 gnome-shell (2.91.3-1) experimental; urgency=low [ Emilio Pozuelo Monfort ] * New upstream release (Closes: #605098, CVE-2010-4000). - debian/control.in: + Updated dependencies and build dependencies. - debian/patches/02_undo_gtk3_transition.diff: + Removed, let's use GTK+3 from now on. - debian/patches/03_fix_dconf_service_location.diff: + Updated. * debian/control.in, debian/rules: - Remove hack to get the typelibs scanned. Pass the private directory to dh_girepository instead. Update the minimum build dependency on gobject-introspection accordingly. * debian/control.in: - Build depend on gir1.2 packages. - Remove gir dependencies, they are autogenerated. [ Laurent Bigonville ] * debian/control.in: Add Vcs-* fields * debian/watch: Add watch file [ Emilio Pozuelo Monfort ] * debian/patches/02_fix_build_with_latest_gtk.patch: - Patch from upstream git, fix build with GTK+ 2.91.6. * debian/control.in: - Bump the libgtk3.0-dev accordingly. * debian/patches/*.diff: - Renamed to debian/patches/*.patch. -- Emilio Pozuelo Monfort Sun, 19 Dec 2010 00:08:30 +0000 gnome-shell (2.31.5-2) experimental; urgency=low * debian/control: - depend and build-depend on gir1.0-glib-2.0 (>= 0.6.15~git20100713) - also depend on gjs, because the clock preferences uses gjs-console for some reason -- Gustavo Noronha Silva Wed, 28 Jul 2010 11:45:06 +0200 gnome-shell (2.31.5-1) experimental; urgency=low * New development release. - depend on mutter 2.31.5 - refresh patches - fixes requirements on mutter (Closes: #586124) * debian/control.in: - Build-depend on glib >= 2.25.11-1 because we use glib-compile-schemas - Build-depend on gtk+ >= 2.21.1 - Build-depend on gobject-introspection >= 0.6.15~git20100713-1 because we need newer glib bindings - Build-depend on gir1.0-json-glib-1.0 (Closes: #584660), thanks to Raphael Hertzog for pointing out the fix - gnome-shell depends on gir1.0-gconf-2.0 >= 2.31.5 to run * debian/patches/02_undo_gtk3_transition.diff: - undo gtk2->gtk3 migration since we do not yet have gtk+ 3 on Debian * debian/patches/03_fix_dconf_service_location.diff: - fix the path used to start dconf-service -- Gustavo Noronha Silva Tue, 13 Jul 2010 14:36:34 -0300 gnome-shell (2.31.2-1) experimental; urgency=low * New upstream release - depends on mutter 2.31 - includes debian/patches/02_gjs_build_fix.patch, so removing * debian/rules: - depends on clutter-1.0 >= 1.2.8 -- Gustavo Noronha Silva Mon, 31 May 2010 11:03:29 -0300 gnome-shell (2.29.0-3) unstable; urgency=low [ Emilio Pozuelo Monfort ] * debian/patches/02_gjs_build_fix.patch: - Backport upstream commit to fix the build with recent gjs. * debian/source/format, debian/patches/series, debian/rules: - Convert to source format 3.0 (quilt). * debian/rules: - Include gnome-get-source.mk. -- Josselin Mouette Tue, 27 Apr 2010 22:32:21 +0200 gnome-shell (2.29.0-2) unstable; urgency=low * debian/control: - really fix #572718 by bumping the version in mutter's gir package name -- Gustavo Noronha Silva Mon, 15 Mar 2010 17:33:24 -0300 gnome-shell (2.29.0-1) unstable; urgency=low [ Emilio Pozuelo Monfort ] * debian/rules: - Don't install *.la. [ Gustavo Noronha Silva ] * New upstream development release. - should work with the newer mutter (Closes: #572718) -- Gustavo Noronha Silva Tue, 09 Mar 2010 18:11:05 -0300 gnome-shell (2.28.1~git20100129-1) unstable; urgency=low * New upstream snapshot. -- Gustavo Noronha Silva Fri, 29 Jan 2010 12:44:58 -0200 gnome-shell (2.28.1~git20091125-1) unstable; urgency=low * New upstream snapshot -- Gustavo Noronha Silva Wed, 25 Nov 2009 19:06:40 -0200 gnome-shell (2.28.1~git20091117-1) unstable; urgency=low * New upstream snapshot * debian/patches/02_allow_non_uri_apps.diff: - dropped; applied upstream * debian/upstream.gitlog, debian/rules: - ship upstream's git log as upstream changelog (Closes: #556354) -- Gustavo Noronha Silva Thu, 12 Nov 2009 12:02:52 -0200 gnome-shell (2.28.1~git20091112-1) unstable; urgency=low * New upstream snapshot -- Gustavo Noronha Silva Mon, 12 Nov 2009 10:43:05 -0200 gnome-shell (2.28.1~git20091028-2) unstable; urgency=low * debian/patches/01_favorite_apps.diff: - change the default favorite browser desktop file to be Epiphany's (Closes: #553054) * debian/control.in: - gnome-shell's startup script wants to run glxinfo to get information regarding the server's GLX support; thanks to alex bodnaru for noticing this is needed (Closes: #553440) * debian/patches/02_allow_non_uri_apps.diff: - patch by Guido Günther to drop the requirement that associated apps support URIs, for local files at least (Closes: #553618) -- Gustavo Noronha Silva Mon, 09 Nov 2009 15:32:14 -0200 gnome-shell (2.28.1~git20091028-1) unstable; urgency=low * New upstream snapshot * debian/control: - bump Standards-Version to 3.8.3 - python is a dependency, since the script that starts GNOME Shell is a python script - pkg-config is also a dependency (Closes: #552202) -- Gustavo Noronha Silva Wed, 28 Oct 2009 16:12:13 -0200 gnome-shell (2.28.1~git20091024-1) unstable; urgency=low * New upstream snapshot * debian/control.in: - ok, I agree, let's recommend Xephyr for now (Closes: #552141) -- Gustavo Noronha Silva Sat, 24 Oct 2009 13:22:02 -0200 gnome-shell (2.28.1~git20091020-1) unstable; urgency=low * Initial upload, based on the Ubuntu package (Closes: #550956) * debian/patches: - drop two unnecessary patches * debian/rules: - cleanup, and add Debian GNOME Team rules include * debian/control.in: - add Debian GNOME Team stuff - fix alignment - remove Recommends for xserver-xephyr - fix build-dependencies package names - build-depend on gnome-pkg-tools for uploaders -- Gustavo Noronha Silva Wed, 14 Oct 2009 11:31:23 -0300 gnome-shell (2.28.0-0ubuntu2) karmic; urgency=low * Add libcroco3-dev to Build-Depends. Fixes FTBFS. -- Christopher James Halse Rogers Tue, 13 Oct 2009 17:50:23 +1100 gnome-shell (2.28.0-0ubuntu1) karmic; urgency=low * New upstream version * debian/control: - updated build requirement * debian/patches/80_git_change_fix_alt_tab_ressource_usage.patch: - git change to fix ressources not being freed on alt-tab -- Sebastien Bacher Mon, 12 Oct 2009 22:44:00 +0200 gnome-shell (2.27.3-0ubuntu1) karmic; urgency=low * New upstream version * debian/control: - depends on python since it's used in the wrapper (lp: #413096) - updated gir requirement -- Sebastien Bacher Wed, 30 Sep 2009 23:09:56 +0200 gnome-shell (2.27.2-0ubuntu1) karmic; urgency=low * New upstream version -- Sebastien Bacher Tue, 08 Sep 2009 00:31:49 +0200 gnome-shell (2.27.1-0ubuntu1) karmic; urgency=low * New upstream version * debian/control: - updated build requirements -- Sebastien Bacher Wed, 02 Sep 2009 10:44:03 +0200 gnome-shell (2.27.0-0ubuntu3) karmic; urgency=low * Requires gvfs-backends now -- Sebastien Bacher Wed, 12 Aug 2009 01:46:57 +0200 gnome-shell (2.27.0-0ubuntu2) karmic; urgency=low * Require gobject-introspection-freedesktop too -- Sebastien Bacher Wed, 12 Aug 2009 01:29:04 +0200 gnome-shell (2.27.0-0ubuntu1) karmic; urgency=low * New upstream version -- Sebastien Bacher Tue, 11 Aug 2009 19:36:26 +0200 gnome-shell (0.0.1~git20090805-0ubuntu1) karmic; urgency=low * New upstream snapshot * debian/control: - require new clutter -- Sebastien Bacher Wed, 05 Aug 2009 19:04:15 +0100 gnome-shell (0.0.1~git20090715-0ubuntu1) karmic; urgency=low * New upstream snapshot * debian/control: - build-depends on libglib -- Sebastien Bacher Wed, 15 Jul 2009 15:57:33 +0200 gnome-shell (0.0.1~git20090702-0ubuntu0.2) karmic; urgency=low * debian/control: - recommends xserver-xephyr -- Sebastien Bacher Thu, 02 Jul 2009 19:48:06 +0200 gnome-shell (0.0.1~git20090702-0ubuntu0.1) karmic; urgency=low * New git version * debian/control: - updated the depends -- Sebastien Bacher Thu, 02 Jul 2009 15:59:22 +0200 gnome-shell (0.0.1~git20090701-0ubuntu0.3) karmic; urgency=low * debian/control: - build-depends on gobject-introspection-glib-2.0 and not on libdesk -- Sebastien Bacher Thu, 02 Jul 2009 10:18:37 +0200 gnome-shell (0.0.1~git20090701-0ubuntu0.2) karmic; urgency=low * debian/control: build-depends on gobject-introspection -- Sebastien Bacher Thu, 02 Jul 2009 09:51:01 +0200 gnome-shell (0.0.1~git20090701-0ubuntu0.1) karmic; urgency=low * Initial ppa upload -- Sebastien Bacher Wed, 01 Jul 2009 23:29:31 +0200 debian/source/0000775000000000000000000000000012266103132010464 5ustar debian/source/format0000664000000000000000000000001412266103132011672 0ustar 3.0 (quilt) debian/gnome-shell.install0000664000000000000000000000014212266103132012763 0ustar usr/bin usr/lib/gnome-shell usr/lib/mozilla usr/share/applications usr/share/dbus-1 usr/share/man debian/gnome-shell-common.dirs0000664000000000000000000000003412266103132013544 0ustar usr/share/gnome-shell/modes debian/gnome-shell.gsettings-override0000664000000000000000000000031212266103132015140 0ustar [org.gnome.shell] favorite-apps=[ 'epiphany.desktop', 'evolution.desktop', 'empathy.desktop', 'rhythmbox.desktop', 'shotwell.desktop', 'libreoffice-writer.desktop', 'nautilus.desktop', 'yelp.desktop' ] debian/source_gnome-shell.py0000664000000000000000000000155312310155577013346 0ustar from apport.hookutils import * import os def is_process_running(proc): ''' Determine if process has a registered process id ''' log = command_output(['pidof', proc]) if not log or log[:5] == "Error" or len(log)<1: return False return True def add_info(report): attach_gsettings_package(report, 'gnome-shell-common') attach_gsettings_schema(report, 'org.gnome.desktop.interface') result = '' dm_list = apport.hookutils.command_output(['sh', '-c', 'apt-cache search \"display manager\" | cut -d \' \' -f1 | grep dm$']) for line in dm_list.split('\n'): if (is_process_running(line)): result = line break report['DisplayManager'] = result HOME = os.path.expanduser("~") attach_file_if_exists(report, HOME+'/.cache/upstart/gnome-session-gnome.log',key='gnomeSessionLog') debian/shlibs.local0000664000000000000000000000006712266103132011467 0ustar libgnome-bluetooth-applet 0 gnome-bluetooth (>= 3.0.0) debian/gnome-shell-common.install0000664000000000000000000000027012266103132014253 0ustar debian/source_gnome-shell.py /usr/share/apport/package-hooks usr/share/GConf usr/share/glib-2.0 usr/share/gnome-control-center usr/share/gnome-shell usr/share/gtk-doc usr/share/locale debian/control0000664000000000000000000001413012313665714010602 0ustar # This file is autogenerated. DO NOT EDIT! # # Modifications should be made to debian/control.in instead. # This file is regenerated automatically in the clean target. Source: gnome-shell Section: gnome Priority: optional Maintainer: Ubuntu Developers XSBC-Original-Maintainer: Debian GNOME Maintainers Uploaders: Debian GNOME Maintainers , Emilio Pozuelo Monfort , Sjoerd Simons Build-Depends: autotools-dev, cdbs, debhelper (>= 8.1.3~), dh-autoreconf, gnome-bluetooth (>= 2.90.0) [linux-any], gnome-control-center-dev (>= 3.4), gnome-pkg-tools (>= 0.11), gnome-session, gobject-introspection (>= 1.29.15), gsettings-desktop-schemas-dev (>= 3.9.0), gtk-doc-tools, intltool (>= 0.26), libatk-bridge2.0-dev, libcanberra-dev, libcanberra-gtk3-dev, libcaribou-dev (>= 0.4.8), libclutter-1.0-dev (>= 1.13.4), libcroco3-dev (>= 0.6.8), libdbus-glib-1-dev, libecal1.2-dev (>= 3.7.90), libedataserver1.2-dev (>= 3.7.90), libgcr-3-dev (>= 3.7.5), libgirepository1.0-dev (>= 1.29.15), libgjs-dev (>= 1.39.0), libglib2.0-dev (>= 2.37.0), libgnome-bluetooth-dev (>= 3.5.5) [linux-any], libgnome-desktop-3-dev (>= 3.7.90), libgnome-menu-3-dev (>= 3.5.3), libgstreamer1.0-dev (>= 0.11.92), libgtk-3-dev (>= 3.7.9), libibus-1.0-dev, libmutter-dev (>= 3.10.4), libnm-glib-dev (>= 0.9.8) [linux-any], libnm-glib-vpn-dev (>= 0.9.8) [linux-any], libnm-gtk-dev (>= 0.9.8) [linux-any], libnm-util-dev (>= 0.9.8) [linux-any], libpolkit-agent-1-dev (>= 0.100), libpulse-dev (>= 1:2.0), libsecret-1-dev, libstartup-notification0-dev (>= 0.11), libsystemd-login-dev, libsystemd-daemon-dev, libtelepathy-glib-dev (>= 0.17.5), libx11-dev, libxfixes-dev, libxml2-dev, python (>= 2.6) Standards-Version: 3.9.4 Homepage: http://live.gnome.org/GnomeShell Vcs-Svn: svn://anonscm.debian.org/pkg-gnome/desktop/unstable/gnome-shell Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/gnome-shell/ Package: gnome-shell Architecture: any Depends: ${gir:Depends}, ${icon-theme:Depends}, ${misc:Depends}, ${shlibs:Depends}, evolution-data-server (>= 3.7.90), gir1.2-gdm-1.0, gir1.2-accountsservice-1.0, gir1.2-atspi-2.0 (>= 2.9.91), gir1.2-caribou-1.0 (>= 0.4.8), gir1.2-clutter-1.0 (>= 1.11.11), gir1.2-freedesktop, gir1.2-gcr-3 (>= 3.7.5), gir1.2-gkbd-3.0, gir1.2-glib-2.0 (>= 1.37), gir1.2-gnomebluetooth-1.0 (>= 3.6.0) [linux-any], gir1.2-gnomedesktop-3.0 (>= 3.7.90), gir1.2-gtk-3.0 (>= 3.8), gir1.2-ibus-1.0 (>= 1.5.2), gir1.2-mutter-3.0 (>= 3.10.0), gir1.2-networkmanager-1.0 [linux-any], gir1.2-nmgtk-1.0 (>= 0.9.8) [linux-any], gir1.2-pango-1.0, gir1.2-polkit-1.0, gir1.2-soup-2.4 (>= 2.40.1), gir1.2-telepathyglib-0.12, gir1.2-telepathylogger-0.2 (>= 0.8.0), gir1.2-upowerglib-1.0, gjs (>= 1.37.4), gnome-icon-theme-symbolic (>= 2.91), gnome-settings-daemon (>= 3.4.0), gnome-shell-common (= ${source:Version}), gnome-themes-standard, gsettings-desktop-schemas (>= 3.9.0), python (>= 2.6), telepathy-mission-control-5, Recommends: gkbd-capplet, gnome-contacts, gnome-control-center, gnome-user-guide, network-manager, unzip, gdm (>= 3.5.90) Breaks: fglrx-driver (<< 1:11-10), gdm (<< 3.5.90), gnome-control-center (<< 1:3.0), gnome-session (<< 3.0), gnome-tweak-tool (<< 3.5) Conflicts: gnome-screensaver (<< 3.6) Description: graphical shell for the GNOME desktop The GNOME Shell redefines user interactions with the GNOME desktop. In particular, it offers new paradigms for launching applications, accessing documents, and organizing open windows in GNOME. Later, it will introduce a new applets eco-system and offer new solutions for other desktop features, such as notifications and contacts management. The GNOME Shell is intended to replace functions handled by the GNOME Panel and by the window manager in previous versions of GNOME. The GNOME Shell has rich visual effects enabled by new graphical technologies. Package: gnome-shell-common Architecture: all Depends: ${misc:Depends} Replaces: gnome-shell (<< 3.2.1-6) Breaks: gnome-shell (<< 3.2.1-6), gnome-tweak-tool (<< 3.3) Description: common files for the GNOME graphical shell This package contains translations and data files for the GNOME shell. Package: gnome-shell-dbg Architecture: any Section: debug Priority: extra Depends: ${misc:Depends}, gnome-shell (= ${binary:Version}) Recommends: mutter-dbg Description: Debugging symbols for GNOME Shell The GNOME Shell redefines user interactions with the GNOME desktop. In particular, it offers new paradigms for launching applications, accessing documents, and organizing open windows in GNOME. Later, it will introduce a new applets eco-system and offer new solutions for other desktop features, such as notifications and contacts management. The GNOME Shell is intended to replace functions handled by the GNOME Panel and by the window manager in previous versions of GNOME. The GNOME Shell has rich visual effects enabled by new graphical technologies. . This package contains detached debugging symbols. debian/rules0000775000000000000000000000202312266103132010241 0ustar #!/usr/bin/make -f include /usr/share/cdbs/1/rules/autoreconf.mk include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/autotools.mk include /usr/share/cdbs/1/rules/utils.mk include /usr/share/cdbs/1/class/gnome.mk include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk ifeq ($(shell dpkg-vendor --query vendor),Ubuntu) DEB_DH_GENCONTROL_ARGS += -- -Vicon-theme:Depends=gnome-icon-theme-full endif DEB_CONFIGURE_EXTRA_FLAGS += --enable-compile-warnings=yes ifeq ($(DEB_HOST_ARCH_OS),linux) DEB_CONFIGURE_EXTRA_FLAGS += --enable-networkmanager endif DEB_DH_MAKESHLIBS_ARGS_gnome-shell = -Xlibgnome-shell DEB_SHLIBDEPS_INCLUDE = /usr/lib/gnome-bluetooth $(patsubst %,binary-predeb/%,$(DEB_ALL_PACKAGES)) :: dh_girepository -p$(cdbs_curpkg) -l src:src/gvc -p /usr/lib/mutter \ /usr/lib/gnome-shell find debian/$(cdbs_curpkg) -name '*.la' -exec rm -f '{}' ';' # List any files which are not installed common-binary-post-install-arch:: list-missing debian/gnome-shell.lintian-overrides0000664000000000000000000000051412266103132014756 0ustar # It's the only way we have to let gnome-shell find the private library it # links against through libgnome-shell.so gnome-shell: binary-or-shlib-defines-rpath usr/bin/gnome-shell /usr/lib/gnome-bluetooth:/usr/lib/gnome-shell gnome-shell: binary-or-shlib-defines-rpath usr/lib/gnome-shell/libgnome-shell.so /usr/lib/gnome-bluetooth debian/compat0000664000000000000000000000000212266103132010362 0ustar 8 debian/patches/0000775000000000000000000000000012313663653010627 5ustar debian/patches/10-make-NetworkManager-optional.patch0000664000000000000000000001446112266103132017542 0ustar From: http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/gnome-base/gnome-shell/files/ * use config.js (and AC_SUBST HAVE_NETWORKMANAGER appropriately); * take care to not import ui.status.network if nm is disabled; * do not try to reassign to const variables; * no point really in fiddling with the list of installed js files; * don't build shell-mobile-providers if nm is disabled; * use "networkmanager" instead of "network_manager" because THE BIKESHED SHOULD BE BLUE, also because the upstream package name is NetworkManager, not Network_Manager. --- a/js/Makefile.am +++ b/js/Makefile.am @@ -8,6 +8,7 @@ sed -e "s|[@]PACKAGE_NAME@|$(PACKAGE_NAME)|g" \ -e "s|[@]PACKAGE_VERSION@|$(PACKAGE_VERSION)|g" \ -e "s|[@]HAVE_BLUETOOTH@|$(HAVE_BLUETOOTH)|g" \ + -e "s|[@]HAVE_NETWORKMANAGER@|$(HAVE_NETWORKMANAGER)|g" \ -e "s|[@]GETTEXT_PACKAGE@|$(GETTEXT_PACKAGE)|g" \ -e "s|[@]datadir@|$(datadir)|g" \ -e "s|[@]libexecdir@|$(libexecdir)|g" \ --- a/js/misc/config.js.in +++ b/js/misc/config.js.in @@ -6,6 +6,8 @@ const PACKAGE_VERSION = '@PACKAGE_VERSION@'; /* 1 if gnome-bluetooth is available, 0 otherwise */ const HAVE_BLUETOOTH = @HAVE_BLUETOOTH@; +/* 1 if networkmanager is available, 0 otherwise */ +const HAVE_NETWORKMANAGER = @HAVE_NETWORKMANAGER@; /* gettext package */ const GETTEXT_PACKAGE = '@GETTEXT_PACKAGE@'; /* locale dir */ --- a/js/ui/panel.js +++ b/js/ui/panel.js @@ -811,7 +811,9 @@ this._indicators = new St.BoxLayout({ style_class: 'panel-status-indicators-box' }); this.actor.add_child(this._indicators); - this._network = new imports.ui.status.network.NMApplet(); + if (Config.HAVE_NETWORKMANAGER) { + this._network = new imports.ui.status.network.NMApplet(); + } if (Config.HAVE_BLUETOOTH) { this._bluetooth = new imports.ui.status.bluetooth.Indicator(); } else { --- a/js/ui/sessionMode.js +++ b/js/ui/sessionMode.js @@ -10,6 +10,8 @@ const Main = imports.ui.main; const Params = imports.misc.params; +const Config = imports.misc.config; + const DEFAULT_MODE = 'restrictive'; const _modes = { @@ -92,7 +94,10 @@ isLocked: false, isPrimary: true, unlockDialog: imports.ui.unlockDialog.UnlockDialog, - components: ['networkAgent', 'polkitAgent', 'telepathyClient', + components: Config.HAVE_NETWORKMANAGER ? + ['networkAgent', 'polkitAgent', 'telepathyClient', + 'keyring', 'autorunManager', 'automountManager'] : + ['polkitAgent', 'telepathyClient', 'keyring', 'autorunManager', 'automountManager'], panel: { left: ['activities', 'appMenu'], --- a/src/Makefile.am +++ b/src/Makefile.am @@ -103,7 +103,6 @@ shell-invert-lightness-effect.h \ shell-keybinding-modes.h \ shell-mount-operation.h \ - shell-network-agent.h \ shell-perf-log.h \ shell-screenshot.h \ shell-slicer.h \ @@ -140,7 +139,6 @@ shell-menu-tracker.c \ shell-menu-tracker.h \ shell-mount-operation.c \ - shell-network-agent.c \ shell-perf-log.c \ shell-polkit-authentication-agent.h \ shell-polkit-authentication-agent.c \ @@ -175,6 +173,10 @@ libgnome_shell_la_SOURCES = $(libgnome_shell_sources) +if HAVE_NETWORKMANAGER +libgnome_shell_la_SOURCES += shell-network-agent.c +endif + libgnome_shell_la_gir_sources = \ $(filter-out %-private.h $(shell_private_sources), $(shell_public_headers_h) $(libgnome_shell_base_la_SOURCES) $(libgnome_shell_sources)) @@ -331,7 +333,10 @@ CLEANFILES += ShellMenu-0.1.gir Shell-0.1.gir: gnome-shell St-1.0.gir ShellMenu-0.1.gir -Shell_0_1_gir_INCLUDES = Clutter-1.0 ClutterX11-1.0 Meta-3.0 TelepathyGLib-0.12 Soup-2.4 GMenu-3.0 NetworkManager-1.0 NMClient-1.0 +Shell_0_1_gir_INCLUDES = Clutter-1.0 ClutterX11-1.0 Meta-3.0 TelepathyGLib-0.12 Soup-2.4 GMenu-3.0 +if HAVE_NETWORKMANAGER +Shell_0_1_gir_INCLUDES += NetworkManager-1.0 NMClient-1.0 +endif Shell_0_1_gir_CFLAGS = $(libgnome_shell_la_CPPFLAGS) -I $(srcdir) # Hack! we use PROGRAM instead of LIBS so that the soname is not included # in the typelib. This way the symbols will be resolved with the libgnome-shell --- a/configure.ac +++ b/configure.ac @@ -91,8 +91,6 @@ libcanberra libcanberra-gtk3 telepathy-glib >= $TELEPATHY_GLIB_MIN_VERSION polkit-agent-1 >= $POLKIT_MIN_VERSION - libnm-glib libnm-util >= $NETWORKMANAGER_MIN_VERSION - libnm-gtk >= $NETWORKMANAGER_MIN_VERSION libsecret-unstable gcr-base-3 >= $GCR_MIN_VERSION" PKG_CHECK_MODULES(GNOME_SHELL, $SHARED_PCS) @@ -162,6 +160,37 @@ [Define if _NL_TIME_FIRST_WEEKDAY is available]) fi +AC_ARG_ENABLE(networkmanager, + AS_HELP_STRING([--disable-networkmanager], + [disable NetworkManager support @<:@default=auto@:>@]),, + [enable_networkmanager=auto]) + +if test "x$enable_networkmanager" != "xno"; then + PKG_CHECK_MODULES(NETWORKMANAGER, + [libnm-glib + libnm-util >= $NETWORKMANAGER_MIN_VERSION + libnm-gtk >= $NETWORKMANAGER_MIN_VERSION], + [have_networkmanager=yes], + [have_networkmanager=no]) + + GNOME_SHELL_CFLAGS="$GNOME_SHELL_CFLAGS $NETWORKMANAGER_CFLAGS" + GNOME_SHELL_LIBS="$GNOME_SHELL_LIBS $NETWORKMANAGER_LIBS" +else + have_networkmanager="no (disabled)" +fi + +if test "x$have_networkmanager" = "xyes"; then + AC_DEFINE(HAVE_NETWORKMANAGER, [1], [Define if we have NetworkManager]) + AC_SUBST([HAVE_NETWORKMANAGER], [1]) +else + if test "x$enable_networkmanager" = "xyes"; then + AC_MSG_ERROR([Couldn't find NetworkManager.]) + fi + AC_SUBST([HAVE_NETWORKMANAGER], [0]) +fi + +AM_CONDITIONAL(HAVE_NETWORKMANAGER, test "$have_networkmanager" = "yes") + # Sets GLIB_GENMARSHAL and GLIB_MKENUMS AM_PATH_GLIB_2_0() @@ -203,3 +232,15 @@ man/Makefile ]) AC_OUTPUT + +echo " +Build configuration: + + Prefix: ${prefix} + Source code location: ${srcdir} + Compiler: ${CC} + Compiler Warnings: $enable_compile_warnings + + Support for NetworkManager: $have_networkmanager + Support for GStreamer recording: $build_recorder +" debian/patches/git_remove_direct_jsapi_access.patch0000664000000000000000000000522512275765365020067 0ustar From 7296bedd8e958d2cfeddd8af8382a74eb88dac9c Mon Sep 17 00:00:00 2001 From: Tim Lunn Date: Tue, 29 Oct 2013 07:12:10 +0000 Subject: remove direct access to jsapi with js24 its not possible to access jsapi directly from C code https://bugzilla.gnome.org/show_bug.cgi?id=711052 --- diff --git a/src/main.c b/src/main.c index a563c08..c3ff611 100644 --- a/src/main.c +++ b/src/main.c @@ -29,8 +29,6 @@ #include "shell-perf-log.h" #include "st.h" -#include - extern GType gnome_shell_plugin_get_type (void); #define SHELL_DBUS_SERVICE "org.gnome.Shell" diff --git a/src/shell-global.c b/src/shell-global.c index 04e2724..e453df2 100644 --- a/src/shell-global.c +++ b/src/shell-global.c @@ -22,7 +22,6 @@ #include #include #include -#include #include #include #include @@ -1143,44 +1142,6 @@ shell_global_on_gc (GjsContext *context, } /** - * shell_global_get_memory_info: - * @global: - * @meminfo: (out caller-allocates): Output location for memory information - * - * Load process-global data about memory usage. - */ -void -shell_global_get_memory_info (ShellGlobal *global, - ShellMemoryInfo *meminfo) -{ - JSContext *context; - gint64 now; - -#ifdef HAVE_MALLINFO - { - struct mallinfo info = mallinfo (); - meminfo->glibc_uordblks = info.uordblks; - } -#else - meminfo->glibc_uordblks = 0; -#endif - - context = gjs_context_get_native_context (global->js_context); - - meminfo->js_bytes = JS_GetGCParameter (JS_GetRuntime (context), JSGC_BYTES); - - meminfo->gjs_boxed = (unsigned int) gjs_counter_boxed.value; - meminfo->gjs_gobject = (unsigned int) gjs_counter_object.value; - meminfo->gjs_function = (unsigned int) gjs_counter_function.value; - meminfo->gjs_closure = (unsigned int) gjs_counter_closure.value; - - now = g_get_monotonic_time (); - - meminfo->last_gc_seconds_ago = (now - global->last_gc_end_time) / G_TIME_SPAN_SECOND; -} - - -/** * shell_global_notify_error: * @global: a #ShellGlobal * @msg: Error message diff --git a/src/shell-global.h b/src/shell-global.h index b445c42..ec4a089 100644 --- a/src/shell-global.h +++ b/src/shell-global.h @@ -69,10 +69,6 @@ typedef struct { guint last_gc_seconds_ago; } ShellMemoryInfo; -void shell_global_get_memory_info (ShellGlobal *global, - ShellMemoryInfo *meminfo); - - /* Run-at-leisure API */ void shell_global_begin_work (ShellGlobal *global); void shell_global_end_work (ShellGlobal *global); -- cgit v0.9.2 debian/patches/git_sttexturecache_dont_crash.patch0000664000000000000000000000407512313663633017756 0ustar From ac76940530039654cf3f01e243541a5c990eb269 Mon Sep 17 00:00:00 2001 From: Giovanni Campagna Date: Mon, 10 Mar 2014 22:43:18 +0100 Subject: [PATCH] StTextureCache: don't crash if we fail to allocate a framebuffer It's possible that FBO creation fails due to hw limits or the driver not exposing the EXT_framebuffer_object extension. In that case, just give up on creating square icons. https://bugzilla.gnome.org/show_bug.cgi?id=724977 --- src/st/st-texture-cache.c | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/src/st/st-texture-cache.c b/src/st/st-texture-cache.c index f102f39..d12118c 100644 --- a/src/st/st-texture-cache.c +++ b/src/st/st-texture-cache.c @@ -527,6 +527,7 @@ data_to_cogl_handle (const guchar *data, CoglHandle texture, offscreen; CoglColor clear_color; guint size; + GError *error; size = MAX (width, height); @@ -543,7 +544,26 @@ data_to_cogl_handle (const guchar *data, COGL_TEXTURE_NO_SLICING, COGL_PIXEL_FORMAT_ANY); - offscreen = cogl_offscreen_new_to_texture (texture); + offscreen = cogl_offscreen_new_with_texture (texture); + + error = NULL; + if (!cogl_framebuffer_allocate (offscreen, &error)) + { + g_warning ("Failed to allocate FBO (sized %d): %s", size, error->message); + + cogl_object_unref (texture); + cogl_object_unref (offscreen); + g_clear_error (&error); + + return cogl_texture_new_from_data (width, + height, + COGL_TEXTURE_NONE, + has_alpha ? COGL_PIXEL_FORMAT_RGBA_8888 : COGL_PIXEL_FORMAT_RGB_888, + COGL_PIXEL_FORMAT_ANY, + rowstride, + data); + } + cogl_color_set_from_4ub (&clear_color, 0, 0, 0, 0); cogl_push_framebuffer (offscreen); cogl_clear (&clear_color, COGL_BUFFER_BIT_COLOR); -- 1.9.1 debian/patches/revert-disable-periodic-gc.patch0000664000000000000000000000172712266103132016736 0ustar From 361da4a8a19ebc35642c6aa5358f435b2385f4f9 Mon Sep 17 00:00:00 2001 From: Tim Lunn Date: Mon, 29 Jul 2013 10:32:08 +1000 Subject: [PATCH] Revert "global: don't run a garbage collection on tweeners end" This reverts commit 6f605598de1eb4361ef912e85edb27a8b7b96b21. --- diff --git a/src/shell-global.c b/src/shell-global.c index 74af6cd..c9e01d0 100644 --- a/src/shell-global.c +++ b/src/shell-global.c @@ -1434,6 +1434,13 @@ run_leisure_functions (gpointer data) if (global->work_count > 0) return FALSE; + /* Previously we called gjs_maybe_gc(). However, it simply doesn't + * trigger often enough. Garbage collection is very fast here, so + * let's just aggressively GC. This will help avoid both heap + * fragmentation, and the GC kicking in when we don't want it to. + */ + gjs_context_gc (global->js_context); + /* No leisure closures, so we are done */ if (global->leisure_closures == NULL) return FALSE; -- 1.8.3.2 debian/patches/revert-shelldbus-export-timestamps.patch0000664000000000000000000000366312276007775020662 0ustar From 7cff99c5ada332a1504992114c5e4d760aed44ef Mon Sep 17 00:00:00 2001 From: Tim Lunn Date: Mon, 6 Jan 2014 07:40:13 +1100 Subject: [PATCH] Revert "shellDBus: Export the timestamp of shortcuts through D-Bus" This reverts commit db497a2ecfccc8ad9284353826f32fc75ca78ecd. --- js/ui/shellDBus.js | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) --- a/js/ui/shellDBus.js +++ b/js/ui/shellDBus.js @@ -46,7 +46,6 @@ \ \ \ - \ \ \ \ @@ -87,8 +86,8 @@ this._grabbers = new Hash.Map(); global.display.connect('accelerator-activated', Lang.bind(this, - function(display, action, deviceid, timestamp) { - this._emitAcceleratorActivated(action, deviceid, timestamp); + function(display, action, deviceid) { + this._emitAcceleratorActivated(action, deviceid); })); }, @@ -183,7 +182,7 @@ return invocation.return_value(GLib.Variant.new('(b)', [ungrabSucceeded])); }, - _emitAcceleratorActivated: function(action, deviceid, timestamp) { + _emitAcceleratorActivated: function(action, deviceid) { let destination = this._grabbedAccelerators.get(action); if (!destination) return; @@ -194,7 +193,7 @@ this._dbusImpl.get_object_path(), info ? info.name : null, 'AcceleratorActivated', - GLib.Variant.new('(uuu)', [action, deviceid, timestamp])); + GLib.Variant.new('(uu)', [action, deviceid])); }, _grabAcceleratorForSender: function(accelerator, flags, sender) { debian/patches/ubuntu-lightdm-user-switching.patch0000664000000000000000000000413512266103132017560 0ustar From b043396a553e047178fd2bc5e3b69870963580fc Mon Sep 17 00:00:00 2001 From: Tim Lunn Date: Tue, 9 Oct 2012 20:18:28 +1100 Subject: [PATCH] userMenu: allow user switching when using lightdm When running lightdm and gnome-shell, its currently not possible to switch users via the usermenu. This commit adds a dbus call to switch to the lightdm greeter. https://bugzilla.gnome.org/show_bug.cgi?id=685794 --- js/ui/status/system.js | 29 +++++++++++++++++++++++------ 1 file changed, 23 insertions(+), 6 deletions(-) --- a/js/ui/status/system.js +++ b/js/ui/status/system.js @@ -379,13 +379,15 @@ _onLoginScreenActivate: function() { this.menu.itemActivated(BoxPointer.PopupAnimation.NONE); Main.overview.hide(); - if (Main.screenShield) + if (Main.screenShield) { Main.screenShield.lock(false); - - Clutter.threads_add_repaint_func_full(Clutter.RepaintFlags.POST_PAINT, function() { - Gdm.goto_login_session_sync(null); - return false; - }); + Clutter.threads_add_repaint_func_full(Clutter.RepaintFlags.POST_PAINT, function() { + Gdm.goto_login_session_sync(null); + return false; + }); + } + else + this._lightdmLoginSession(); }, _onQuitSessionActivate: function() { @@ -403,4 +405,19 @@ this.menu.itemActivated(); this._loginManager.suspend(); }, + + _lightdmLoginSession: function() { + try { + let seat = GLib.getenv("XDG_SEAT_PATH"); + let result = Gio.DBus.system.call_sync('org.freedesktop.DisplayManager', + seat, + 'org.freedesktop.DisplayManager.Seat', + 'SwitchToGreeter', null, null, + Gio.DBusCallFlags.NONE, + -1, null); + return result; + } catch(e) { + return false; + } + } }); debian/patches/git_remove_js-version_set.patch0000664000000000000000000000151212276021456017036 0ustar From 178b8471cc0a8e69fd1d16235f48b8724910b16e Mon Sep 17 00:00:00 2001 From: Jasper St. Pierre Date: Thu, 02 Jan 2014 18:26:48 +0000 Subject: shell-global: Remove an explicit js-version set gjs's default js-version is already 1.8, and we're planning on removing this API in the future, in accordance with upstream. --- --- a/src/shell-global.c +++ b/src/shell-global.c @@ -287,7 +287,6 @@ search_path = g_strsplit (shell_js, ":", -1); global->js_context = g_object_new (GJS_TYPE_CONTEXT, "search-path", search_path, - "js-version", "1.8", "gc-notifications", TRUE, NULL); g_signal_connect (global->js_context, "gc", G_CALLBACK (shell_global_on_gc), global); debian/patches/ubuntu_lock_on_suspend.patch0000664000000000000000000000170512266103132016426 0ustar Description: add support for the ubuntu lock on suspend option Author: Tim Lunn Bug-Ubuntu: https://bugs.launchpad.net/bugs/1063110 --- --- js/ui/screenShield.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) --- a/js/ui/screenShield.js +++ b/js/ui/screenShield.js @@ -33,6 +33,7 @@ const SCREENSAVER_SCHEMA = 'org.gnome.desktop.screensaver'; const LOCK_ENABLED_KEY = 'lock-enabled'; const LOCK_DELAY_KEY = 'lock-delay'; +const SUSPEND_LOCK_ENABLED_KEY = 'ubuntu-lock-on-suspend'; const LOCKED_STATE_STR = 'screenShield.locked'; // fraction of screen height the arrow must reach before completing @@ -725,7 +726,7 @@ this._aboutToSuspend = aboutToSuspend; if (aboutToSuspend) { - if (!this._settings.get_boolean(LOCK_ENABLED_KEY)) { + if (!this._settings.get_boolean(SUSPEND_LOCK_ENABLED_KEY)) { this._uninhibitSuspend(); return; } debian/patches/git_remove_e4x.patch0000664000000000000000000015274512277762475014621 0ustar From b908a3d70af279caad71a7ad87a301621b08271f Mon Sep 17 00:00:00 2001 From: Tim Lunn Date: Thu, 24 Oct 2013 21:51:58 +0000 Subject: Stringify the xml definitions for E4X removal https://bugzilla.gnome.org/show_bug.cgi?id=691409 --- --- a/js/extensionPrefs/main.js +++ b/js/extensionPrefs/main.js @@ -13,13 +13,15 @@ const Config = imports.misc.config; const ExtensionUtils = imports.misc.extensionUtils; -const GnomeShellIface = - - - - - -; +const GnomeShellIface = ' \ + \ + \ + \ + \ + \ + \ + \ +'; const GnomeShellProxy = Gio.DBusProxy.makeProxyWrapper(GnomeShellIface); --- a/js/gdm/fingerprint.js +++ b/js/gdm/fingerprint.js @@ -5,11 +5,13 @@ const Shell = imports.gi.Shell; const Signals = imports.signals; -const FprintManagerIface = - - - -; +const FprintManagerIface = ' \ + \ + \ + \ + \ + \ +'; const FprintManagerInfo = Gio.DBusInterfaceInfo.new_for_xml(FprintManagerIface); --- a/js/gdm/oVirt.js +++ b/js/gdm/oVirt.js @@ -4,11 +4,13 @@ const Lang = imports.lang; const Signals = imports.signals; -const OVirtCredentialsIface = - - - -; +const OVirtCredentialsIface = ' \ + \ + \ + \ + \ + \ +'; const OVirtCredentialsInfo = Gio.DBusInterfaceInfo.new_for_xml(OVirtCredentialsIface); --- a/js/gdm/realmd.js +++ b/js/gdm/realmd.js @@ -5,52 +5,58 @@ const Shell = imports.gi.Shell; const Signals = imports.signals; -const ProviderIface = - - - - - - - - - -; +const ProviderIface = ' \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ +'; const Provider = Gio.DBusProxy.makeProxyWrapper(ProviderIface); -const ServiceIface = - - - - - - - - - - - -; +const ServiceIface = ' \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ +'; const Service = Gio.DBusProxy.makeProxyWrapper(ServiceIface); -const RealmIface = - - - - - - - - - - - - - - - - -; +const RealmIface = ' \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ +'; const Realm = Gio.DBusProxy.makeProxyWrapper(RealmIface); const Manager = new Lang.Class({ --- a/js/misc/gnomeSession.js +++ b/js/misc/gnomeSession.js @@ -4,15 +4,17 @@ const Lang = imports.lang; const Signals = imports.signals; -const PresenceIface = - - - - - - - -; +const PresenceIface = ' \ + \ + \ + \ + \ + \ + \ + \ + \ + \ +'; const PresenceStatus = { AVAILABLE: 0, @@ -30,14 +32,16 @@ // Note inhibitors are immutable objects, so they don't // change at runtime (changes always come in the form // of new inhibitors) -const InhibitorIface = - - - - - - -; +const InhibitorIface = ' \ + \ + \ + \ + \ + \ + \ + \ + \ +'; var InhibitorProxy = Gio.DBusProxy.makeProxyWrapper(InhibitorIface); function Inhibitor(objectPath, initCallback, cancellable) { @@ -45,27 +49,29 @@ } // Not the full interface, only the methods we use -const SessionManagerIface = - - - - - - - - - - - - - - - - - - - -; +const SessionManagerIface = ' \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ +'; var SessionManagerProxy = Gio.DBusProxy.makeProxyWrapper(SessionManagerIface); function SessionManager(initCallback, cancellable) { --- a/js/misc/loginManager.js +++ b/js/misc/loginManager.js @@ -7,58 +7,66 @@ const Shell = imports.gi.Shell; const Signals = imports.signals; -const SystemdLoginManagerIface = - - - - - - - - - - - - - - - - - - - - - - - -; - -const SystemdLoginSessionIface = - - -; +const SystemdLoginManagerIface = ' \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ +'; + +const SystemdLoginSessionIface = ' \ + \ + \ + \ + \ +'; const SystemdLoginManager = Gio.DBusProxy.makeProxyWrapper(SystemdLoginManagerIface); const SystemdLoginSession = Gio.DBusProxy.makeProxyWrapper(SystemdLoginSessionIface); -const ConsoleKitManagerIface = - - - - - - - - - - - -; - -const ConsoleKitSessionIface = - - -; +const ConsoleKitManagerIface = ' \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ +'; + +const ConsoleKitSessionIface = ' \ + \ + \ + \ + \ +'; const ConsoleKitSession = Gio.DBusProxy.makeProxyWrapper(ConsoleKitSessionIface); const ConsoleKitManager = Gio.DBusProxy.makeProxyWrapper(ConsoleKitManagerIface); --- a/js/misc/modemManager.js +++ b/js/misc/modemManager.js @@ -92,37 +92,41 @@ // The following are not the complete interfaces, just the methods we need // (or may need in the future) -const ModemGsmNetworkInterface = - - - - - - - - - - - - - - - -; +const ModemGsmNetworkInterface = ' \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ +'; const ModemGsmNetworkProxy = Gio.DBusProxy.makeProxyWrapper(ModemGsmNetworkInterface); -const ModemCdmaInterface = - - - - - - - - - -; +const ModemCdmaInterface = ' \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ +'; const ModemCdmaProxy = Gio.DBusProxy.makeProxyWrapper(ModemCdmaInterface); @@ -218,20 +222,26 @@ // Support for the new ModemManager1 interface (MM >= 0.7) //------------------------------------------------------------------------------ -const BroadbandModemInterface = - -; +const BroadbandModemInterface = ' \ + \ + \ + \ +'; const BroadbandModemProxy = Gio.DBusProxy.makeProxyWrapper(BroadbandModemInterface); -const BroadbandModem3gppInterface = - - -; +const BroadbandModem3gppInterface = ' \ + \ + \ + \ + \ +'; const BroadbandModem3gppProxy = Gio.DBusProxy.makeProxyWrapper(BroadbandModem3gppInterface); -const BroadbandModemCdmaInterface = - -; +const BroadbandModemCdmaInterface = ' \ + \ + \ + \ +'; const BroadbandModemCdmaProxy = Gio.DBusProxy.makeProxyWrapper(BroadbandModemCdmaInterface); const BroadbandModem = new Lang.Class({ --- a/js/misc/objectManager.js +++ b/js/misc/objectManager.js @@ -8,19 +8,21 @@ // Specified in the D-Bus specification here: // http://dbus.freedesktop.org/doc/dbus-specification.html#standard-interfaces-objectmanager -const ObjectManagerIface = - - - - - - - - - - - -; +const ObjectManagerIface = ' \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ +'; const ObjectManagerInfo = Gio.DBusInterfaceInfo.new_for_xml(ObjectManagerIface); --- a/js/misc/smartcardManager.js +++ b/js/misc/smartcardManager.js @@ -7,12 +7,14 @@ const ObjectManager = imports.misc.objectManager; -const SmartcardTokenIface = - - - - -; +const SmartcardTokenIface = ' \ + \ + \ + \ + \ + \ + \ +'; let _smartcardManager = null; --- a/js/ui/calendar.js +++ b/js/ui/calendar.js @@ -190,16 +190,18 @@ }); Signals.addSignalMethods(EmptyEventSource.prototype); -const CalendarServerIface = - - - - - - - - -; +const CalendarServerIface = ' \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ +'; const CalendarServerInfo = Gio.DBusInterfaceInfo.new_for_xml(CalendarServerIface); --- a/js/ui/components/autorunManager.js +++ b/js/ui/components/autorunManager.js @@ -75,12 +75,14 @@ /******************************************/ -const HotplugSnifferIface = - - - - -; +const HotplugSnifferIface = ' \ + \ + \ + \ + \ + \ + \ +'; const HotplugSnifferProxy = Gio.DBusProxy.makeProxyWrapper(HotplugSnifferIface); function HotplugSniffer() { --- a/js/ui/endSessionDialog.js +++ b/js/ui/endSessionDialog.js @@ -43,20 +43,22 @@ const GSM_SESSION_MANAGER_LOGOUT_FORCE = 2; -const EndSessionDialogIface = - - - - - - - - - - - - -; +const EndSessionDialogIface = ' \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ +'; const logoutDialogContent = { subjectWithUser: C_("title", "Log Out %s"), @@ -131,13 +133,15 @@ const MAX_USERS_IN_SESSION_DIALOG = 5; -const LogindSessionIface = - - - - - -; +const LogindSessionIface = ' \ + \ + \ + \ + \ + \ + \ + \ +'; const LogindSession = Gio.DBusProxy.makeProxyWrapper(LogindSessionIface); --- a/js/ui/keyboard.js +++ b/js/ui/keyboard.js @@ -23,27 +23,29 @@ const A11Y_APPLICATIONS_SCHEMA = 'org.gnome.desktop.a11y.applications'; const SHOW_KEYBOARD = 'screen-keyboard-enabled'; -const CaribouKeyboardIface = - - - - - - - - - - - - - - - - - - - -; +const CaribouKeyboardIface = ' \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ +'; const Key = new Lang.Class({ Name: 'Key', --- a/js/ui/magnifierDBus.js +++ b/js/ui/magnifierDBus.js @@ -9,85 +9,89 @@ // Subset of gnome-mag's Magnifier dbus interface -- to be expanded. See: // http://git.gnome.org/browse/gnome-mag/tree/xml/...Magnifier.xml -const MagnifierIface = - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -; +const MagnifierIface = ' \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ +'; // Subset of gnome-mag's ZoomRegion dbus interface -- to be expanded. See: // http://git.gnome.org/browse/gnome-mag/tree/xml/...ZoomRegion.xml -const ZoomRegionIface = - - - - - - - - - - - - - - - - - - - - - - -; +const ZoomRegionIface = ' \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ +'; // For making unique ZoomRegion DBus proxy object paths of the form: // '/org/gnome/Magnifier/ZoomRegion/zoomer0', --- a/js/ui/notificationDaemon.js +++ b/js/ui/notificationDaemon.js @@ -18,51 +18,55 @@ let nextNotificationId = 1; // Should really be defined in Gio.js -const BusIface = - - - - -; +const BusIface = ' \ + \ + \ + \ + \ + \ + \ +'; var BusProxy = Gio.DBusProxy.makeProxyWrapper(BusIface); function Bus() { return new BusProxy(Gio.DBus.session, 'org.freedesktop.DBus', '/org/freedesktop/DBus'); } -const NotificationDaemonIface = - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -; +const NotificationDaemonIface = ' \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ +'; const NotificationClosedReason = { EXPIRED: 1, --- a/js/ui/remoteSearch.js +++ b/js/ui/remoteSearch.js @@ -11,49 +11,53 @@ const KEY_FILE_GROUP = 'Shell Search Provider'; -const SearchProviderIface = - - - - - - - - - - - - - - - - -; +const SearchProviderIface = ' \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ +'; -const SearchProvider2Iface = - - - - - - - - - - - - - - - - - - - - - - -; +const SearchProvider2Iface = ' \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ +'; var SearchProviderProxy = Gio.DBusProxy.makeProxyWrapper(SearchProviderIface); var SearchProvider2Proxy = Gio.DBusProxy.makeProxyWrapper(SearchProvider2Iface); --- a/js/ui/screencast.js +++ b/js/ui/screencast.js @@ -9,27 +9,29 @@ const Hash = imports.misc.hash; const Main = imports.ui.main; -const ScreencastIface = - - - - - - - - - - - - - - - - - - - -; +const ScreencastIface = ' \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ +'; const ScreencastService = new Lang.Class({ Name: 'ScreencastService', --- a/js/ui/screenshot.js +++ b/js/ui/screenshot.js @@ -15,45 +15,47 @@ const Main = imports.ui.main; const Tweener = imports.ui.tweener; -const ScreenshotIface = - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -; +const ScreenshotIface = ' \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ +'; const ScreenshotService = new Lang.Class({ Name: 'ScreenshotService', --- a/js/ui/scripting.js +++ b/js/ui/scripting.js @@ -69,16 +69,18 @@ }; } -const PerfHelperIface = - - - - - - - - -; +const PerfHelperIface = ' \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ +'; var PerfHelperProxy = Gio.DBusProxy.makeProxyWrapper(PerfHelperIface); function PerfHelper() { --- a/js/ui/shellDBus.js +++ b/js/ui/shellDBus.js @@ -15,59 +15,63 @@ const Screenshot = imports.ui.screenshot; const ViewSelector = imports.ui.viewSelector; -const GnomeShellIface = - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -; - -const ScreenSaverIface = - - - - - - - - - - - - - - -; +const GnomeShellIface = ' \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ +'; + +const ScreenSaverIface = ' \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ +'; const GnomeShell = new Lang.Class({ Name: 'GnomeShellDBus', @@ -246,41 +250,43 @@ ShellVersion: Config.PACKAGE_VERSION }); -const GnomeShellExtensionsIface = - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -; +const GnomeShellExtensionsIface = ' \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ +'; const GnomeShellExtensions = new Lang.Class({ Name: 'GnomeShellExtensionsDBus', --- a/js/ui/shellMountOperation.js +++ b/js/ui/shellMountOperation.js @@ -521,36 +521,38 @@ }); Signals.addSignalMethods(ShellProcessesDialog.prototype); -const GnomeShellMountOpIface = - - - - - - - - - - - - - - - - - - - - - - - - - - - - -; +const GnomeShellMountOpIface = ' \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ +'; const ShellMountOperationType = { NONE: 0, --- a/js/ui/status/keyboard.js +++ b/js/ui/status/keyboard.js @@ -41,11 +41,13 @@ const BUS_NAME = 'org.gnome.SettingsDaemon.Keyboard'; const OBJECT_PATH = '/org/gnome/SettingsDaemon/Keyboard'; -const KeyboardManagerInterface = - - - -; +const KeyboardManagerInterface = ' \ + \ + \ + \ + \ + \ +'; const KeyboardManagerProxy = Gio.DBusProxy.makeProxyWrapper(KeyboardManagerInterface); --- a/js/ui/status/power.js +++ b/js/ui/status/power.js @@ -11,15 +11,17 @@ const BUS_NAME = 'org.gnome.SettingsDaemon.Power'; const OBJECT_PATH = '/org/gnome/SettingsDaemon/Power'; -const PowerManagerInterface = - - - - - - - -; +const PowerManagerInterface = ' \ + \ + \ + \ + \ + \ + \ + \ + \ + \ +'; const PowerManagerProxy = Gio.DBusProxy.makeProxyWrapper(PowerManagerInterface); --- a/js/ui/status/rfkill.js +++ b/js/ui/status/rfkill.js @@ -9,9 +9,11 @@ const BUS_NAME = 'org.gnome.SettingsDaemon.Rfkill'; const OBJECT_PATH = '/org/gnome/SettingsDaemon/Rfkill'; -const RfkillManagerInterface = - -; +const RfkillManagerInterface = ' \ + \ + \ + \ +'; const RfkillManagerProxy = Gio.DBusProxy.makeProxyWrapper(RfkillManagerInterface); debian/patches/git_remove_gc_notifications.patch0000664000000000000000000000213712276021534017407 0ustar From 0d92451c498ff36313f430a5a058f84e9d714195 Mon Sep 17 00:00:00 2001 From: Jasper St. Pierre Date: Wed, 15 Jan 2014 14:18:53 +0000 Subject: shell-global: Remove unused gc-notifications support This is going to be removed upstream. --- --- a/src/shell-global.c +++ b/src/shell-global.c @@ -93,8 +93,6 @@ guint32 xdnd_timestamp; - gint64 last_gc_end_time; - gboolean has_modal; }; @@ -287,9 +285,7 @@ search_path = g_strsplit (shell_js, ":", -1); global->js_context = g_object_new (GJS_TYPE_CONTEXT, "search-path", search_path, - "gc-notifications", TRUE, NULL); - g_signal_connect (global->js_context, "gc", G_CALLBACK (shell_global_on_gc), global); g_strfreev (search_path); } @@ -1131,13 +1127,6 @@ g_ptr_array_free (arr, TRUE); } -static void -shell_global_on_gc (GjsContext *context, - ShellGlobal *global) -{ - global->last_gc_end_time = g_get_monotonic_time (); -} - /** * shell_global_get_memory_info: * @global: debian/patches/git_shell_global_fix_scale_factor.patch0000664000000000000000000000230612303220262020476 0ustar From 29addc499ca0f8dc5bf9cf6d18eaaa01a5c2b985 Mon Sep 17 00:00:00 2001 From: Jasper St. Pierre Date: Sat, 22 Feb 2014 23:00:57 +0000 Subject: shell-global: Only set the scale factor if get_setting succeeded If gdk_screen_get_setting fails, like if it's running without XSettings, then the GValue will have a value of 0. A lot of code tries to divide by the scale factor. This produces NaN, and combined with the fact that NaN is "leaky", we very quickly end up spinning out of control. --- diff --git a/src/shell-global.c b/src/shell-global.c index 7e0ac8b..59b5273 100644 --- a/src/shell-global.c +++ b/src/shell-global.c @@ -756,8 +756,8 @@ update_scale_factor (GdkScreen *screen, gpointer data) GValue value = G_VALUE_INIT; g_value_init (&value, G_TYPE_INT); - gdk_screen_get_setting (global->gdk_screen, "gdk-window-scaling-factor", &value); - g_object_set (context, "scale-factor", g_value_get_int (&value), NULL); + if (gdk_screen_get_setting (global->gdk_screen, "gdk-window-scaling-factor", &value)) + g_object_set (context, "scale-factor", g_value_get_int (&value), NULL); } /* This is an IBus workaround. The flow of events with IBus is that every time -- cgit v0.9.2 debian/patches/40_change-pam-name-to-match-gdm.patch0000664000000000000000000000060512266103132017335 0ustar --- a/js/gdm/util.js +++ b/js/gdm/util.js @@ -17,7 +17,7 @@ const SmartcardManager = imports.misc.smartcardManager; const Tweener = imports.ui.tweener; -const PASSWORD_SERVICE_NAME = 'gdm-password'; +const PASSWORD_SERVICE_NAME = 'gdm3'; const FINGERPRINT_SERVICE_NAME = 'gdm-fingerprint'; const SMARTCARD_SERVICE_NAME = 'gdm-smartcard'; const OVIRT_SERVICE_NAME = 'gdm-ovirtcred'; debian/patches/series0000664000000000000000000000105412313662465012044 0ustar git_remove_e4x.patch git_remove_js-version_set.patch git_remove_gc_notifications.patch 27-nm-libexec-path.patch #40_change-pam-name-to-match-gdm.patch ubuntu-lightdm-user-switching.patch ubuntu_lock_on_suspend.patch revert-notification-settings-link.patch revert_new_bluetooth.patch #revert-disable-periodic-gc.patch revert_new_brightness_widget.patch revert-shelldbus-export-timestamps.patch git_port_c++.patch git_remove_direct_jsapi_access.patch git_remove_lg_memory_tab.patch git_shell_global_fix_scale_factor.patch git_sttexturecache_dont_crash.patch debian/patches/git_remove_lg_memory_tab.patch0000664000000000000000000000740012275765422016715 0ustar From b929320d4cee2ac3bb6607c5a3928fc8e154e670 Mon Sep 17 00:00:00 2001 From: Tim Lunn Date: Tue, 29 Oct 2013 05:55:24 +0000 Subject: lookingGlass: Remove Memory tab and add a gc Icon to toolbar With js24 it won't be possible to access gjs memory stats from C code. https://bugzilla.gnome.org/show_bug.cgi?id=711052 --- diff --git a/js/ui/lookingGlass.js b/js/ui/lookingGlass.js index 011737c..1583213 100644 --- a/js/ui/lookingGlass.js +++ b/js/ui/lookingGlass.js @@ -629,55 +629,6 @@ const Inspector = new Lang.Class({ Signals.addSignalMethods(Inspector.prototype); -const Memory = new Lang.Class({ - Name: 'Memory', - - _init: function() { - this.actor = new St.BoxLayout({ vertical: true }); - this._glibc_uordblks = new St.Label(); - this.actor.add(this._glibc_uordblks); - - this._js_bytes = new St.Label(); - this.actor.add(this._js_bytes); - - this._gjs_boxed = new St.Label(); - this.actor.add(this._gjs_boxed); - - this._gjs_gobject = new St.Label(); - this.actor.add(this._gjs_gobject); - - this._gjs_function = new St.Label(); - this.actor.add(this._gjs_function); - - this._gjs_closure = new St.Label(); - this.actor.add(this._gjs_closure); - - this._last_gc_seconds_ago = new St.Label(); - this.actor.add(this._last_gc_seconds_ago); - - this._gcbutton = new St.Button({ label: 'Full GC', - style_class: 'lg-obj-inspector-button' }); - this._gcbutton.connect('clicked', Lang.bind(this, function () { System.gc(); this._renderText(); })); - this.actor.add(this._gcbutton, { x_align: St.Align.START, - x_fill: false }); - - this.actor.connect('notify::mapped', Lang.bind(this, this._renderText)); - }, - - _renderText: function() { - if (!this.actor.mapped) - return; - let memInfo = global.get_memory_info(); - this._glibc_uordblks.text = 'glibc_uordblks: ' + memInfo.glibc_uordblks; - this._js_bytes.text = 'js bytes: ' + memInfo.js_bytes; - this._gjs_boxed.text = 'gjs_boxed: ' + memInfo.gjs_boxed; - this._gjs_gobject.text = 'gjs_gobject: ' + memInfo.gjs_gobject; - this._gjs_function.text = 'gjs_function: ' + memInfo.gjs_function; - this._gjs_closure.text = 'gjs_closure: ' + memInfo.gjs_closure; - this._last_gc_seconds_ago.text = 'last_gc_seconds_ago: ' + memInfo.last_gc_seconds_ago; - } -}); - const Extensions = new Lang.Class({ Name: 'Extensions', @@ -880,6 +831,19 @@ const LookingGlass = new Lang.Class({ return true; })); + let gcIcon = new St.Icon({ icon_name: 'gnome-fs-trash-full', + icon_size: 24 }); + toolbar.add_actor(gcIcon); + gcIcon.reactive = true; + gcIcon.connect('button-press-event', Lang.bind(this, function () { + gcIcon.icon_name = 'gnome-fs-trash-empty'; + System.gc(); + this._timeoutId = Mainloop.timeout_add(500, Lang.bind(this, function () { + gcIcon.icon_name = 'gnome-fs-trash-full'; + Mainloop.source_remove(this._timeoutId); + })); + })); + let notebook = new Notebook(); this._notebook = notebook; this.actor.add(notebook.actor, { expand: true }); @@ -907,9 +871,6 @@ const LookingGlass = new Lang.Class({ this._windowList = new WindowList(this); notebook.appendPage('Windows', this._windowList.actor); - this._memory = new Memory(); - notebook.appendPage('Memory', this._memory.actor); - this._extensions = new Extensions(this); notebook.appendPage('Extensions', this._extensions.actor); -- cgit v0.9.2 debian/patches/27-nm-libexec-path.patch0000664000000000000000000000123012266103132015033 0ustar Description: Use Debian specific NM VPN helpers paths Author: Laurent Bigonville Forwarded: not-needed --- a/js/ui/components/networkAgent.js +++ b/js/ui/components/networkAgent.js @@ -687,7 +687,7 @@ } catch(e) { } // ignore errors if key does not exist let path = binary; if (!GLib.path_is_absolute(path)) { - path = GLib.build_filenamev([Config.LIBEXECDIR, path]); + path = GLib.build_filenamev(['/usr/lib/NetworkManager', path]); } if (GLib.file_test(path, GLib.FileTest.IS_EXECUTABLE)) debian/patches/git_port_c++.patch0000664000000000000000000001317012275767666014151 0ustar From e9fbbf40009cf3733ff5bbecdf2369bad8f1acb3 Mon Sep 17 00:00:00 2001 From: Tim Lunn Date: Sun, 06 Oct 2013 08:21:50 +0000 Subject: port shell-js to c++ https://bugzilla.gnome.org/show_bug.cgi?id=711052 --- --- a/configure.ac +++ b/configure.ac @@ -16,6 +16,7 @@ # Checks for programs. AC_PROG_CC +AC_PROG_CXX # Initialize libtool LT_PREREQ([2.2.6]) --- a/src/Makefile.am +++ b/src/Makefile.am @@ -207,7 +207,7 @@ libgnome_shell_js_la_SOURCES = \ shell-js.h \ - shell-js.c \ + shell-js.cpp \ $(NULL) libgnome_shell_js_la_LIBADD = \ --- a/src/shell-js.c +++ /dev/null @@ -1,78 +0,0 @@ -/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */ - -#include "config.h" - -#include "shell-js.h" - -#include -#include -#include -#include - -/** - * shell_js_add_extension_importer: - * @target_object_script: JavaScript code evaluating to a target object - * @target_property: Name of property to use for importer - * @directory: Source directory: - * @error: A #GError - * - * This function sets a property named @target_property on the object - * resulting from the evaluation of @target_object_script code, which - * acts as a GJS importer for directory @directory. - * - * Returns: %TRUE on success - */ -gboolean -shell_js_add_extension_importer (const char *target_object_script, - const char *target_property, - const char *directory, - GError **error) -{ - jsval target_object; - GList *contexts; - JSContext *context; - char *search_path[2] = { 0, 0 }; - gboolean ret = FALSE; - - /* Take the first GjsContext from all of them -- - * we should only ever have one context, so this - * should be alright. */ - contexts = gjs_context_get_all (); - context = gjs_context_get_native_context (contexts->data); - g_list_free_full (contexts, g_object_unref); - - JS_BeginRequest (context); - - /* This is a bit of a hack; ideally we'd be able to pass our target - * object directly into this function, but introspection doesn't - * support that at the moment. Instead evaluate a string to get it. */ - if (!JS_EvaluateScript(context, - JS_GetGlobalObject(context), - target_object_script, - strlen (target_object_script), - "", - 0, - &target_object)) - { - gjs_log_exception(context); - g_set_error(error, - G_IO_ERROR, - G_IO_ERROR_FAILED, - "Unable to import %s", target_object_script); - goto out; - } - - if (!JSVAL_IS_OBJECT (target_object)) - { - g_error ("shell_js_add_extension_importer: invalid target object"); - goto out; - } - - search_path[0] = (char*)directory; - gjs_define_importer (context, JSVAL_TO_OBJECT (target_object), target_property, (const char **)search_path, FALSE); - ret = TRUE; - - out: - JS_EndRequest (context); - return ret; -} --- /dev/null +++ b/src/shell-js.cpp @@ -0,0 +1,78 @@ +/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */ + +#include "config.h" + +#include "shell-js.h" + +#include +#include +#include +#include + +/** + * shell_js_add_extension_importer: + * @target_object_script: JavaScript code evaluating to a target object + * @target_property: Name of property to use for importer + * @directory: Source directory: + * @error: A #GError + * + * This function sets a property named @target_property on the object + * resulting from the evaluation of @target_object_script code, which + * acts as a GJS importer for directory @directory. + * + * Returns: %TRUE on success + */ +gboolean +shell_js_add_extension_importer (const char *target_object_script, + const char *target_property, + const char *directory, + GError **error) +{ + jsval target_object; + GList *contexts; + JSContext *context; + char *search_path[2] = { 0, 0 }; + gboolean ret = FALSE; + + /* Take the first GjsContext from all of them -- + * we should only ever have one context, so this + * should be alright. */ + contexts = gjs_context_get_all (); + context = (JSContext*) gjs_context_get_native_context ((GjsContext*)contexts->data); + g_list_free_full (contexts, g_object_unref); + + JS_BeginRequest (context); + + /* This is a bit of a hack; ideally we'd be able to pass our target + * object directly into this function, but introspection doesn't + * support that at the moment. Instead evaluate a string to get it. */ + if (!JS_EvaluateScript(context, + JS_GetGlobalObject(context), + target_object_script, + strlen (target_object_script), + "", + 0, + &target_object)) + { + gjs_log_exception(context); + g_set_error(error, + G_IO_ERROR, + G_IO_ERROR_FAILED, + "Unable to import %s", target_object_script); + goto out; + } + + if (!JSVAL_IS_OBJECT (target_object)) + { + g_error ("shell_js_add_extension_importer: invalid target object"); + goto out; + } + + search_path[0] = (char*)directory; + gjs_define_importer (context, JSVAL_TO_OBJECT (target_object), target_property, (const char **)search_path, FALSE); + ret = TRUE; + + out: + JS_EndRequest (context); + return ret; +} debian/patches/revert-notification-settings-link.patch0000664000000000000000000000120112266103132020412 0ustar --- a/js/ui/messageTray.js +++ b/js/ui/messageTray.js @@ -1676,12 +1676,6 @@ tray.connect('source-added', Lang.bind(this, this._updateClearSensitivity)); tray.connect('source-removed', Lang.bind(this, this._updateClearSensitivity)); this._updateClearSensitivity(); - - let separator = new PopupMenu.PopupSeparatorMenuItem(); - this.addMenuItem(separator); - - let settingsItem = this.addSettingsAction(_("Notification Settings"), 'gnome-notifications-panel.desktop'); - settingsItem.connect('activate', function() { tray.close(); }); }, _onStatusChanged: function(status) { debian/patches/revert_new_brightness_widget.patch0000664000000000000000000001043212277762474017635 0ustar From b02d5270f0e8d6e7ab22666fade5f5818e1b10f1 Mon Sep 17 00:00:00 2001 From: Tim Lunn Date: Sat, 21 Dec 2013 09:11:24 +1100 Subject: [PATCH] Revert "status: Add new brightness slider widget" This reverts commit cb09ae5cc0fc377550d8e9d123db60ea6a2aee14. --- js/Makefile.am | 1 - js/ui/panel.js | 2 -- js/ui/status/brightness.js | 68 ---------------------------------------------- 3 files changed, 71 deletions(-) delete mode 100644 js/ui/status/brightness.js --- a/js/Makefile.am +++ b/js/Makefile.am @@ -93,7 +93,6 @@ ui/searchDisplay.js \ ui/shellDBus.js \ ui/status/accessibility.js \ - ui/status/brightness.js \ ui/status/keyboard.js \ ui/status/network.js \ ui/status/power.js \ --- a/js/ui/panel.js +++ b/js/ui/panel.js @@ -819,7 +819,6 @@ this._power = new imports.ui.status.power.Indicator(); this._rfkill = new imports.ui.status.rfkill.Indicator(); this._volume = new imports.ui.status.volume.Indicator(); - this._brightness = new imports.ui.status.brightness.Indicator(); this._system = new imports.ui.status.system.Indicator(); this._screencast = new imports.ui.status.screencast.Indicator(); @@ -834,7 +833,6 @@ this._indicators.add_child(PopupMenu.unicodeArrow(St.Side.BOTTOM)); this.menu.addMenuItem(this._volume.menu); - this.menu.addMenuItem(this._brightness.menu); this.menu.addMenuItem(new PopupMenu.PopupSeparatorMenuItem()); this.menu.addMenuItem(this._network.menu); if (this._bluetooth) { --- a/js/ui/status/brightness.js +++ /dev/null @@ -1,68 +0,0 @@ -// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*- - -const Lang = imports.lang; -const Gio = imports.gi.Gio; -const St = imports.gi.St; - -const PanelMenu = imports.ui.panelMenu; -const PopupMenu = imports.ui.popupMenu; -const Slider = imports.ui.slider; - -const BUS_NAME = 'org.gnome.SettingsDaemon.Power'; -const OBJECT_PATH = '/org/gnome/SettingsDaemon/Power'; - -const BrightnessInterface = - -; - -const BrightnessProxy = Gio.DBusProxy.makeProxyWrapper(BrightnessInterface); - -const Indicator = new Lang.Class({ - Name: 'BrightnessIndicator', - Extends: PanelMenu.SystemIndicator, - - _init: function() { - this.parent('display-brightness-symbolic'); - this._proxy = new BrightnessProxy(Gio.DBus.session, BUS_NAME, OBJECT_PATH, - Lang.bind(this, function(proxy, error) { - if (error) { - log(error.message); - return; - } - - this._proxy.connect('g-properties-changed', Lang.bind(this, this._sync)); - this._sync(); - })); - - this._item = new PopupMenu.PopupBaseMenuItem({ activate: false }); - this.menu.addMenuItem(this._item); - - this._slider = new Slider.Slider(0); - this._slider.connect('value-changed', Lang.bind(this, this._sliderChanged)); - this._slider.actor.accessible_name = _("Brightness"); - - let icon = new St.Icon({ icon_name: 'display-brightness-symbolic', - style_class: 'popup-menu-icon' }); - this._item.actor.add(icon); - this._item.actor.add(this._slider.actor, { expand: true }); - this._item.actor.connect('button-press-event', Lang.bind(this, function(actor, event) { - this._slider.startDragging(event); - })); - this._item.actor.connect('key-press-event', Lang.bind(this, function(actor, event) { - return this._slider.onKeyPressEvent(actor, event); - })); - - }, - - _sliderChanged: function(slider, value) { - let percent = value * 100; - this._proxy.Brightness = percent; - }, - - _sync: function() { - let visible = this._proxy.Brightness >= 0; - this._item.actor.visible = visible; - if (visible) - this._slider.setValue(this._proxy.Brightness / 100.0); - }, -}); debian/patches/revert_new_bluetooth.patch0000664000000000000000000001133312266103132016102 0ustar From cc8424314ab4822db15cd269e8ec2291bb9eedb5 Mon Sep 17 00:00:00 2001 From: Tim Lunn Date: Wed, 17 Jul 2013 09:01:08 +1000 Subject: [PATCH] Revert "bluetooth: Port to BlueZ 5" This reverts commit dd74ea99a70fb0c4615b448670a4a1d0b843eab4. Revert "configure: Bump gnome-bluetooth requirement" This reverts commit c7fb65c78e48ed6f687008684a25cceefafb3992. --- configure.ac | 2 +- js/ui/status/bluetooth.js | 44 +++++--------------------------------------- 2 files changed, 6 insertions(+), 40 deletions(-) diff --git a/configure.ac b/configure.ac index 3d4915d..2ba51d7 100644 --- a/configure.ac +++ b/configure.ac @@ -109,7 +109,7 @@ PKG_CHECK_MODULES(DESKTOP_SCHEMAS, gsettings-desktop-schemas >= 3.7.4) PKG_CHECK_MODULES(CARIBOU, caribou-1.0 >= 0.4.8) AC_MSG_CHECKING([for bluetooth support]) -PKG_CHECK_EXISTS([gnome-bluetooth-1.0 >= 3.9.0], +PKG_CHECK_EXISTS([gnome-bluetooth-1.0 >= 3.1.0], [BLUETOOTH_DIR=`$PKG_CONFIG --variable=applet_libdir gnome-bluetooth-1.0` BLUETOOTH_LIBS=`$PKG_CONFIG --variable=applet_libs gnome-bluetooth-1.0` AC_SUBST([BLUETOOTH_LIBS],["$BLUETOOTH_LIBS"]) diff --git a/js/ui/status/bluetooth.js b/js/ui/status/bluetooth.js index bcc853b..f4610c7 100644 --- a/js/ui/status/bluetooth.js +++ b/js/ui/status/bluetooth.js @@ -86,7 +86,6 @@ const Indicator = new Lang.Class({ this._applet.connect('pincode-request', Lang.bind(this, this._pinRequest)); this._applet.connect('confirm-request', Lang.bind(this, this._confirmRequest)); this._applet.connect('auth-request', Lang.bind(this, this._authRequest)); - this._applet.connect('auth-service-request', Lang.bind(this, this._authServiceRequest)); this._applet.connect('cancel-request', Lang.bind(this, this._cancelRequest)); }, @@ -293,14 +292,9 @@ const Indicator = new Lang.Class({ } }, - _authRequest: function(applet, device_path, name, long_name) { + _authRequest: function(applet, device_path, name, long_name, uuid) { this._ensureSource(); - this._source.notify(new AuthNotification(this._source, this._applet, device_path, name, long_name)); - }, - - _authServiceRequest: function(applet, device_path, name, long_name, uuid) { - this._ensureSource(); - this._source.notify(new AuthServiceNotification(this._source, this._applet, device_path, name, long_name, uuid)); + this._source.notify(new AuthNotification(this._source, this._applet, device_path, name, long_name, uuid)); }, _confirmRequest: function(applet, device_path, name, long_name, pin) { @@ -322,34 +316,6 @@ const AuthNotification = new Lang.Class({ Name: 'AuthNotification', Extends: MessageTray.Notification, - _init: function(source, applet, device_path, name, long_name) { - this.parent(source, - _("Bluetooth"), - _("Authorization request from %s").format(name), - { customContent: true }); - this.setResident(true); - - this._applet = applet; - this._devicePath = device_path; - this.addBody(_("Device %s wants to pair with this computer").format(long_name)); - - this.addButton('allow', _("Allow")); - this.addButton('deny', _("Deny")); - - this.connect('action-invoked', Lang.bind(this, function(self, action) { - if (action == 'allow') - this._applet.agent_reply_confirm(this._devicePath, true); - else - this._applet.agent_reply_confirm(this._devicePath, false); - this.destroy(); - })); - } -}); - -const AuthServiceNotification = new Lang.Class({ - Name: 'AuthServiceNotification', - Extends: MessageTray.Notification, - _init: function(source, applet, device_path, name, long_name, uuid) { this.parent(source, _("Bluetooth"), @@ -368,14 +334,14 @@ const AuthServiceNotification = new Lang.Class({ this.connect('action-invoked', Lang.bind(this, function(self, action) { switch (action) { case 'always-grant': - this._applet.agent_reply_auth_service(this._devicePath, true, true); + this._applet.agent_reply_auth(this._devicePath, true, true); break; case 'grant': - this._applet.agent_reply_auth_service(this._devicePath, true, false); + this._applet.agent_reply_auth(this._devicePath, true, false); break; case 'reject': default: - this._applet.agent_reply_auth_service(this._devicePath, false, false); + this._applet.agent_reply_auth(this._devicePath, false, false); } this.destroy(); })); -- 1.8.3.2 debian/copyright0000664000000000000000000000276512266103132011131 0ustar This package was debianized by Sebastien Bacher on Wed, 01 Jul 2009 23:29:31 +0200. It was downloaded from http://ftp.gnome.org/pub/GNOME/sources/gnome-shell/2.28/ Upstream Authors: Colin Walters Dan Winship Marina Zhurakhinskaya Owen Taylor William Jon McCann Files: src/* js/* Copyright: © 2000 Helix Code, Inc. © 2000,2001 Eazel, Inc. © 2001 George Lebl © 2002 Sun Microsystems Inc. © 2004-2005 James M. Cape © 2006-2008 Red Hat, Inc. © 2007 Ryan Lortie © 2008 Intel Corp. License: GPL-2+ (/usr/share/common-licenses/GPL-2) Files: src/gdmuser/* Copyright: © 2007-2008 William Jon McCann © 2004-2005 James M. Cape License: LGPL-2+ (/usr/share/common-licenses/LGPL-2) Files: src/tray/* Copyright: © 2002 Anders Carlsson © 2003-2006 Vincent Untz © 2008 Red Hat, Inc. Files: src/big/* Copyright: © 2005-2008 Red Hat, Inc. © 2008-2009 litl, LLC Files: src/st/* Copyright: © 2008 OpenedHand © 2009 Intel Corporation. © 2003-2004 Dodji Seketeli License: LGPL-2.1 (/usr/share/common-licenses/LGPL-2.1) The Debian packaging is: Copyright © 2009 Sebastien Bacher Copyright © 2009 Collabora Ltd. and is licensed under the GPL version 3, see `/usr/share/common-licenses/GPL-3'. debian/control.in0000664000000000000000000001344512303056623011207 0ustar Source: gnome-shell Section: gnome Priority: optional Maintainer: Ubuntu Developers XSBC-Original-Maintainer: Debian GNOME Maintainers Uploaders: @GNOME_TEAM@ Build-Depends: autotools-dev, cdbs, debhelper (>= 8.1.3~), dh-autoreconf, gnome-bluetooth (>= 2.90.0) [linux-any], gnome-control-center-dev (>= 3.4), gnome-pkg-tools (>= 0.11), gnome-session, gobject-introspection (>= 1.29.15), gsettings-desktop-schemas-dev (>= 3.9.0), gtk-doc-tools, intltool (>= 0.26), libatk-bridge2.0-dev, libcanberra-dev, libcanberra-gtk3-dev, libcaribou-dev (>= 0.4.8), libclutter-1.0-dev (>= 1.13.4), libcroco3-dev (>= 0.6.8), libdbus-glib-1-dev, libecal1.2-dev (>= 3.7.90), libedataserver1.2-dev (>= 3.7.90), libgcr-3-dev (>= 3.7.5), libgirepository1.0-dev (>= 1.29.15), libgjs-dev (>= 1.39.0), libglib2.0-dev (>= 2.37.0), libgnome-bluetooth-dev (>= 3.5.5) [linux-any], libgnome-desktop-3-dev (>= 3.7.90), libgnome-menu-3-dev (>= 3.5.3), libgstreamer1.0-dev (>= 0.11.92), libgtk-3-dev (>= 3.7.9), libibus-1.0-dev, libmutter-dev (>= 3.10.4), libnm-glib-dev (>= 0.9.8) [linux-any], libnm-glib-vpn-dev (>= 0.9.8) [linux-any], libnm-gtk-dev (>= 0.9.8) [linux-any], libnm-util-dev (>= 0.9.8) [linux-any], libpolkit-agent-1-dev (>= 0.100), libpulse-dev (>= 1:2.0), libsecret-1-dev, libstartup-notification0-dev (>= 0.11), libsystemd-login-dev, libsystemd-daemon-dev, libtelepathy-glib-dev (>= 0.17.5), libx11-dev, libxfixes-dev, libxml2-dev, python (>= 2.6) Standards-Version: 3.9.4 Homepage: http://live.gnome.org/GnomeShell Vcs-Svn: svn://anonscm.debian.org/pkg-gnome/desktop/unstable/gnome-shell Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/gnome-shell/ Package: gnome-shell Architecture: any Depends: ${gir:Depends}, ${icon-theme:Depends}, ${misc:Depends}, ${shlibs:Depends}, evolution-data-server (>= 3.7.90), gir1.2-gdm-1.0, gir1.2-accountsservice-1.0, gir1.2-atspi-2.0 (>= 2.9.91), gir1.2-caribou-1.0 (>= 0.4.8), gir1.2-clutter-1.0 (>= 1.11.11), gir1.2-freedesktop, gir1.2-gcr-3 (>= 3.7.5), gir1.2-gkbd-3.0, gir1.2-glib-2.0 (>= 1.37), gir1.2-gnomebluetooth-1.0 (>= 3.6.0) [linux-any], gir1.2-gnomedesktop-3.0 (>= 3.7.90), gir1.2-gtk-3.0 (>= 3.8), gir1.2-ibus-1.0 (>= 1.5.2), gir1.2-mutter-3.0 (>= 3.10.0), gir1.2-networkmanager-1.0 [linux-any], gir1.2-nmgtk-1.0 (>= 0.9.8) [linux-any], gir1.2-pango-1.0, gir1.2-polkit-1.0, gir1.2-soup-2.4 (>= 2.40.1), gir1.2-telepathyglib-0.12, gir1.2-telepathylogger-0.2 (>= 0.8.0), gir1.2-upowerglib-1.0, gjs (>= 1.37.4), gnome-icon-theme-symbolic (>= 2.91), gnome-settings-daemon (>= 3.4.0), gnome-shell-common (= ${source:Version}), gnome-themes-standard, gsettings-desktop-schemas (>= 3.9.0), python (>= 2.6), telepathy-mission-control-5, Recommends: gkbd-capplet, gnome-contacts, gnome-control-center, gnome-user-guide, network-manager, unzip, gdm (>= 3.5.90) Breaks: fglrx-driver (<< 1:11-10), gdm (<< 3.5.90), gnome-control-center (<< 1:3.0), gnome-session (<< 3.0), gnome-tweak-tool (<< 3.5) Conflicts: gnome-screensaver (<< 3.6) Description: graphical shell for the GNOME desktop The GNOME Shell redefines user interactions with the GNOME desktop. In particular, it offers new paradigms for launching applications, accessing documents, and organizing open windows in GNOME. Later, it will introduce a new applets eco-system and offer new solutions for other desktop features, such as notifications and contacts management. The GNOME Shell is intended to replace functions handled by the GNOME Panel and by the window manager in previous versions of GNOME. The GNOME Shell has rich visual effects enabled by new graphical technologies. Package: gnome-shell-common Architecture: all Depends: ${misc:Depends} Replaces: gnome-shell (<< 3.2.1-6) Breaks: gnome-shell (<< 3.2.1-6), gnome-tweak-tool (<< 3.3) Description: common files for the GNOME graphical shell This package contains translations and data files for the GNOME shell. Package: gnome-shell-dbg Architecture: any Section: debug Priority: extra Depends: ${misc:Depends}, gnome-shell (= ${binary:Version}) Recommends: mutter-dbg Description: Debugging symbols for GNOME Shell The GNOME Shell redefines user interactions with the GNOME desktop. In particular, it offers new paradigms for launching applications, accessing documents, and organizing open windows in GNOME. Later, it will introduce a new applets eco-system and offer new solutions for other desktop features, such as notifications and contacts management. The GNOME Shell is intended to replace functions handled by the GNOME Panel and by the window manager in previous versions of GNOME. The GNOME Shell has rich visual effects enabled by new graphical technologies. . This package contains detached debugging symbols. debian/watch0000664000000000000000000000014312266103132010213 0ustar version=3 http://download.gnome.org/sources/gnome-shell/([\d\.]+[02468])/gnome-shell-(.*)\.tar\.xz