deskbar-applet r2276 - in trunk: . deskbar/core deskbar/core/gnomedesktop deskbar/handlers deskbar/handlers/actions

[sebp svn gnome org]

Author: sebp
Date: Sat Aug  2 21:28:25 2008
New Revision: 2276
URL: http://svn.gnome.org/viewvc/deskbar-applet?rev=2276&view=rev

Log:
Removed built-in gnomedesktop module an use gnome-python-desktop's instead

Removed:
   trunk/deskbar/core/gnomedesktop/
Modified:
   trunk/ChangeLog
   trunk/configure.ac
   trunk/deskbar/core/Makefile.am
   trunk/deskbar/core/Utils.py
   trunk/deskbar/handlers/actions/OpenDesktopFileAction.py
   trunk/deskbar/handlers/programs.py

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Sat Aug  2 21:28:25 2008
@@ -165,7 +165,6 @@
 deskbar/defs.py
 deskbar/core/Makefile
 deskbar/core/keybinder/Makefile
-deskbar/core/gnomedesktop/Makefile
 deskbar/core/updater/Makefile
 deskbar/core/_userdirs/Makefile
 deskbar/handlers/Makefile

Modified: trunk/deskbar/core/Makefile.am
==============================================================================
--- trunk/deskbar/core/Makefile.am	(original)
+++ trunk/deskbar/core/Makefile.am	Sat Aug  2 21:28:25 2008
@@ -1,4 +1,4 @@
-SUBDIRS = gnomedesktop keybinder updater _userdirs
+SUBDIRS = keybinder updater _userdirs
 	
 deskbar_coredir = $(pythondir)/deskbar/core
 deskbar_core_PYTHON = \

Modified: trunk/deskbar/core/Utils.py
==============================================================================
--- trunk/deskbar/core/Utils.py	(original)
+++ trunk/deskbar/core/Utils.py	Sat Aug  2 21:28:25 2008
@@ -5,7 +5,7 @@
 from os.path import *
 import cgi
 import deskbar
-import deskbar.core.gnomedesktop
+import gnomedesktop
 import gnome.ui
 import gnomevfs
 import gobject
@@ -79,7 +79,7 @@
 
 def load_icon_for_desktop_icon(icon):
     if icon != None:
-        icon = deskbar.core.gnomedesktop.find_icon(ICON_THEME, icon, deskbar.ICON_HEIGHT, 0)
+        icon = gnomedesktop.find_icon(ICON_THEME, icon, deskbar.ICON_HEIGHT, 0)
         if icon != None:
             return load_icon(icon)
         

Modified: trunk/deskbar/handlers/actions/OpenDesktopFileAction.py
==============================================================================
--- trunk/deskbar/handlers/actions/OpenDesktopFileAction.py	(original)
+++ trunk/deskbar/handlers/actions/OpenDesktopFileAction.py	Sat Aug  2 21:28:25 2008
@@ -1,7 +1,7 @@
 from deskbar.core.Utils import get_xdg_data_dirs
 from gettext import gettext as _
 from os.path import join, exists
-import deskbar.core.gnomedesktop
+import gnomedesktop
 import deskbar.interfaces.Action
 import logging
 
@@ -15,7 +15,7 @@
     
     def __init__(self, name, desktop, desktop_file, executable):
         """
-        @type desktop: L{deskbar.core.gnomedesktop.GnomeDesktopItem}
+        @type desktop: L{gnomedesktop.DesktopItem}
         @type desktop_file: path pointing to .desktop file
         @param executeable: Name of the executeable for display 
         """
@@ -74,17 +74,17 @@
 
 def parse_desktop_file(desktop, only_if_visible=True):
     try:
-        desktop = deskbar.core.gnomedesktop.item_new_from_file(desktop, deskbar.core.gnomedesktop.LOAD_ONLY_IF_EXISTS)
+        desktop = gnomedesktop.item_new_from_file(desktop, gnomedesktop.LOAD_ONLY_IF_EXISTS)
     except Exception, e:
         LOGGER.warning('Couldn\'t read desktop file %s:', desktop)
         LOGGER.exception(e)
         return None
     
-    if desktop == None or desktop.get_entry_type() != deskbar.core.gnomedesktop.TYPE_APPLICATION:
+    if desktop == None or desktop.get_entry_type() != gnomedesktop.TYPE_APPLICATION:
         return None
-    if desktop.get_boolean(deskbar.core.gnomedesktop.KEY_TERMINAL):
+    if desktop.get_boolean(gnomedesktop.KEY_TERMINAL):
         return None
-    if only_if_visible and desktop.get_boolean(deskbar.core.gnomedesktop.KEY_NO_DISPLAY):
+    if only_if_visible and desktop.get_boolean(gnomedesktop.KEY_NO_DISPLAY):
         return None
         
     return desktop
\ No newline at end of file

Modified: trunk/deskbar/handlers/programs.py
==============================================================================
--- trunk/deskbar/handlers/programs.py	(original)
+++ trunk/deskbar/handlers/programs.py	Sat Aug  2 21:28:25 2008
@@ -6,7 +6,7 @@
 from os.path import join, expanduser, isdir
 import deskbar, deskbar.core.Indexer
 import deskbar.core.Utils
-import deskbar.core.gnomedesktop
+import gnomedesktop
 import deskbar.interfaces.Action
 import deskbar.interfaces.Match
 import deskbar.interfaces.Module
@@ -137,8 +137,8 @@
     
     def create_match(self, desktop, f):
         return GnomeDictMatch(
-                    name=desktop.get_localestring(deskbar.core.gnomedesktop.KEY_NAME),
-                    icon=desktop.get_string(deskbar.core.gnomedesktop.KEY_ICON),
+                    name=desktop.get_localestring(gnomedesktop.KEY_NAME),
+                    icon=desktop.get_string(gnomedesktop.KEY_ICON),
                     desktop=desktop,
                     desktop_file=f)
         
@@ -161,8 +161,8 @@
     
     def create_match(self, desktop, f):
         return GnomeSearchMatch(
-                    name=desktop.get_localestring(deskbar.core.gnomedesktop.KEY_NAME),
-                    icon=desktop.get_string(deskbar.core.gnomedesktop.KEY_ICON),
+                    name=desktop.get_localestring(gnomedesktop.KEY_NAME),
+                    icon=desktop.get_string(gnomedesktop.KEY_ICON),
                     desktop=desktop,
                     desktop_file=f)
         
@@ -188,8 +188,8 @@
     
     def create_match(self, desktop, f):
         return DevhelpMatch(
-                    name=desktop.get_localestring(deskbar.core.gnomedesktop.KEY_NAME),
-                    icon=desktop.get_string(deskbar.core.gnomedesktop.KEY_ICON),
+                    name=desktop.get_localestring(gnomedesktop.KEY_NAME),
+                    icon=desktop.get_string(gnomedesktop.KEY_ICON),
                     desktop=desktop,
                     desktop_file=f)
         
@@ -340,16 +340,16 @@
                     result = parse_desktop_file(f)
                     if result != None:
                         match = GenericProgramMatch(
-                                    name=result.get_localestring(deskbar.core.gnomedesktop.KEY_NAME),
-                                    icon=result.get_string(deskbar.core.gnomedesktop.KEY_ICON),
+                                    name=result.get_localestring(gnomedesktop.KEY_NAME),
+                                    icon=result.get_string(gnomedesktop.KEY_ICON),
                                     desktop=result,
                                     desktop_file=f)
                         self._indexer.add("%s %s %s %s %s" % (
                                     result.get_string("Exec"),
-                                    result.get_localestring(deskbar.core.gnomedesktop.KEY_NAME),
-                                    result.get_localestring(deskbar.core.gnomedesktop.KEY_COMMENT),
-                                    result.get_string(deskbar.core.gnomedesktop.KEY_NAME),
-                                    result.get_string(deskbar.core.gnomedesktop.KEY_COMMENT),
+                                    result.get_localestring(gnomedesktop.KEY_NAME),
+                                    result.get_localestring(gnomedesktop.KEY_COMMENT),
+                                    result.get_string(gnomedesktop.KEY_NAME),
+                                    result.get_string(gnomedesktop.KEY_COMMENT),
                                 ), match)
 
 def get_priority_for_name(query, name):