r12704 - in /desktop/unstable/deskbar-applet/debian: changelog patches/100-enable-tracker.patch patches/100-gpm-methods.patch patches/200-gconf-schema-fix.patch

[rfrancoise at users.alioth.debian.org]

Author: rfrancoise
Date: Sat Sep 22 09:06:18 2007
New Revision: 12704

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=12704
Log:
* debian/patches/100-gpm-methods.patch: Resync against new upstream.
* debian/patches/100-enable-tracker.patch: New patch taken from Ubuntu
  to enable the tracker plugin if present.
* debian/patches/200-gconf-schema-fix.patch: New patch, fix missing
  <locale> entries in gconf schema.

Added:
    desktop/unstable/deskbar-applet/debian/patches/100-enable-tracker.patch
    desktop/unstable/deskbar-applet/debian/patches/100-gpm-methods.patch
    desktop/unstable/deskbar-applet/debian/patches/200-gconf-schema-fix.patch
Modified:
    desktop/unstable/deskbar-applet/debian/changelog

Modified: desktop/unstable/deskbar-applet/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/deskbar-applet/debian/changelog?rev=12704&op=diff
==============================================================================
--- desktop/unstable/deskbar-applet/debian/changelog (original)
+++ desktop/unstable/deskbar-applet/debian/changelog Sat Sep 22 09:06:18 2007
@@ -3,10 +3,14 @@
   * New upstream release.
 
   * debian/patches/100-iceweasel-compat.patch: Resync against new upstream.
-  * debian/patches/100-gpm-methods.patch: Dropped.
+  * debian/patches/100-gpm-methods.patch: Ditto.
   * debian/patches/100-fix-pythonlib.patch: Dropped.
-
- -- Romain Francoise <rfrancoise at debian.org>  Thu, 20 Sep 2007 21:36:36 +0200
+  * debian/patches/100-enable-tracker.patch: New patch taken from Ubuntu
+    to enable the tracker plugin if present.
+  * debian/patches/200-gconf-schema-fix.patch: New patch, fix missing
+    <locale> entries in gconf schema.
+
+ -- Romain Francoise <rfrancoise at debian.org>  Sat, 22 Sep 2007 11:04:09 +0200
 
 deskbar-applet (2.18.1-2) unstable; urgency=low
 

Added: desktop/unstable/deskbar-applet/debian/patches/100-enable-tracker.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/deskbar-applet/debian/patches/100-enable-tracker.patch?rev=12704&op=file
==============================================================================
--- desktop/unstable/deskbar-applet/debian/patches/100-enable-tracker.patch (added)
+++ desktop/unstable/deskbar-applet/debian/patches/100-enable-tracker.patch Sat Sep 22 09:06:18 2007
@@ -1,0 +1,11 @@
+--- a/data/deskbar-applet.schemas.in
++++ b/data/deskbar-applet.schemas.in
+@@ -50,7 +50,7 @@
+ 			<owner>deskbar</owner>
+ 			<type>list</type>
+         	<list_type>string</list_type>
+-        	<default>[HistoryHandler,ProgramsHandler,EvolutionHandler,WebAddressHandler,FileFolderHandler,EpiphanyBookmarksHandler,EpiphanySearchHandler,MozillaBookmarksHandler,MozillaSearchHandler]</default>
++        	<default>[HistoryHandler,ProgramsHandler,EvolutionHandler,WebAddressHandler,FileFolderHandler,EpiphanyBookmarksHandler,EpiphanySearchHandler,MozillaBookmarksHandler,MozillaSearchHandler,TrackerSearchToolHandler]</default>
+ 			<locale name="C">
+ 				<short>Enabled handlers</short>
+ 				<long>The list of exported class names of the enabled handlers sorted by priority. Leftmost has highest priority</long>

Added: desktop/unstable/deskbar-applet/debian/patches/100-gpm-methods.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/deskbar-applet/debian/patches/100-gpm-methods.patch?rev=12704&op=file
==============================================================================
--- desktop/unstable/deskbar-applet/debian/patches/100-gpm-methods.patch (added)
+++ desktop/unstable/deskbar-applet/debian/patches/100-gpm-methods.patch Sat Sep 22 09:06:18 2007
@@ -1,0 +1,17 @@
+--- a/deskbar/handlers/gdmactions.py
++++ b/deskbar/handlers/gdmactions.py
+@@ -237,11 +237,11 @@
+             bus = dbus.Bus(dbus.Bus.TYPE_SESSION)
+             obj = bus.get_object('org.gnome.PowerManager', '/org/gnome/PowerManager')
+             gpm = dbus.Interface (obj, "org.gnome.PowerManager")
+-            if gpm.canSuspend():
++            if gpm.AllowedSuspend():
+                 self.indexer.add(_("Suspend"), SuspendMatch())
+-            if gpm.canHibernate():
++            if gpm.AllowedHibernate():
+                 self.indexer.add(_("Hibernate"), HibernateMatch())
+-            if gpm.canShutdown():
++            if gpm.AllowedShutdown():
+                 self.indexer.add(_("Shutdown"), ShutdownMatch())
+         except dbus.DBusException:
+             return False

Added: desktop/unstable/deskbar-applet/debian/patches/200-gconf-schema-fix.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/deskbar-applet/debian/patches/200-gconf-schema-fix.patch?rev=12704&op=file
==============================================================================
--- desktop/unstable/deskbar-applet/debian/patches/200-gconf-schema-fix.patch (added)
+++ desktop/unstable/deskbar-applet/debian/patches/200-gconf-schema-fix.patch Sat Sep 22 09:06:18 2007
@@ -1,0 +1,24 @@
+--- a/data/deskbar-applet.schemas.in
++++ b/data/deskbar-applet.schemas.in
+@@ -112,6 +112,10 @@
+ 			<owner>deskbar</owner>
+ 			<type>int</type>
+ 	        	<default>100</default>
++			<locale name="C">
++				<short>X-coordinate of window</short>
++				<long>The default position of the window on the screen (x-coordinate)</long>
++			</locale>
+ 		</schema>
+ 		<schema>
+ 			<key>/schemas/apps/deskbar/window_y</key>
+@@ -119,6 +123,10 @@
+ 			<owner>deskbar</owner>
+ 			<type>int</type>
+ 	        	<default>100</default>
++			<locale name="C">
++				<short>Y-coordinate of window</short>
++				<long>The default position of the window on the screen (y-coordinate)</long>
++			</locale>
+ 		</schema>
+ 		<schema>
+ 			<key>/schemas/apps/deskbar/hide_after_action</key>