diff options
Diffstat (limited to 'deskutils/deskbar-applet/files')
5 files changed, 19 insertions, 48 deletions
diff --git a/deskutils/deskbar-applet/files/patch-deskbar_Utils.py b/deskutils/deskbar-applet/files/patch-deskbar_Utils.py deleted file mode 100644 index 4c68b77664cc..000000000000 --- a/deskutils/deskbar-applet/files/patch-deskbar_Utils.py +++ /dev/null @@ -1,11 +0,0 @@ ---- deskbar/Utils.py.orig Tue Nov 1 20:32:51 2005 -+++ deskbar/Utils.py Tue Nov 1 20:33:08 2005 -@@ -10,7 +10,7 @@ - - sysdirs = os.getenv("XDG_DATA_DIRS") - if sysdirs == None: -- sysdirs = "/usr/local/share:/usr/share" -+ sysdirs = "/usr/local/share/gnome:/usr/local/share:/usr/share" - - dirs = "%s:%s" % (dirs, sysdirs) - return [dir for dir in dirs.split(":") if dir.strip() != "" and exists(dir)] diff --git a/deskutils/deskbar-applet/files/patch-deskbar___init__.py b/deskutils/deskbar-applet/files/patch-deskbar___init__.py deleted file mode 100644 index dbe19007d25a..000000000000 --- a/deskutils/deskbar-applet/files/patch-deskbar___init__.py +++ /dev/null @@ -1,11 +0,0 @@ ---- deskbar/__init__.py.orig Thu Sep 7 15:04:34 2006 -+++ deskbar/__init__.py Thu Sep 7 15:04:50 2006 -@@ -26,7 +26,7 @@ if _check(name): - if UNINSTALLED_DESKBAR: - SHARED_DATA_DIR = abspath(join(dirname(__file__), '..', 'data')) - else: -- SHARED_DATA_DIR = join(DATA_DIR, "deskbar-applet") -+ SHARED_DATA_DIR = join(DATA_DIR, "gnome", "deskbar-applet") - print "Data Dir: %s" % SHARED_DATA_DIR - - HANDLERS_DIR = [] diff --git a/deskutils/deskbar-applet/files/patch-deskbar_core_Utils.py b/deskutils/deskbar-applet/files/patch-deskbar_core_Utils.py new file mode 100644 index 000000000000..1a41213c334d --- /dev/null +++ b/deskutils/deskbar-applet/files/patch-deskbar_core_Utils.py @@ -0,0 +1,11 @@ +--- deskbar/core/Utils.py.orig 2007-08-13 13:07:20.000000000 -0400 ++++ deskbar/core/Utils.py 2007-08-14 14:35:19.000000000 -0400 +@@ -51,7 +51,7 @@ def get_xdg_data_dirs(): + + sysdirs = os.getenv("XDG_DATA_DIRS") + if sysdirs == None: +- sysdirs = "/usr/local/share:/usr/share" ++ sysdirs = "/usr/local/share" + + dirs = "%s:%s" % (dirs, sysdirs) + return [dir for dir in dirs.split(":") if dir.strip() != "" and exists(dir)] diff --git a/deskutils/deskbar-applet/files/patch-deskbar_deskbar-applet.py b/deskutils/deskbar-applet/files/patch-deskbar_deskbar-applet.py index 4b01cdd9be6f..aeb9dadaaadf 100644 --- a/deskutils/deskbar-applet/files/patch-deskbar_deskbar-applet.py +++ b/deskutils/deskbar-applet/files/patch-deskbar_deskbar-applet.py @@ -1,17 +1,17 @@ ---- deskbar/deskbar-applet.py.orig Mon May 29 19:20:47 2006 -+++ deskbar/deskbar-applet.py Mon May 29 19:20:54 2006 -@@ -42,10 +42,10 @@ if hasattr(gettext, 'bind_textdomain_cod - gettext.bind_textdomain_codeset('deskbar-applet','UTF-8') +--- deskbar/deskbar-applet.py.orig Tue Jul 10 15:28:29 2007 ++++ deskbar/deskbar-applet.py Tue Jul 10 15:29:43 2007 +@@ -43,10 +43,10 @@ + gettext.bind_textdomain_codeset('deskbar-applet','UTF-8') gettext.textdomain('deskbar-applet') -locale.bindtextdomain('deskbar-applet', abspath(join(deskbar.defs.DATA_DIR, "locale"))) -if hasattr(locale, 'bind_textdomain_codeset'): -- locale.bind_textdomain_codeset('deskbar-applet','UTF-8') +- locale.bind_textdomain_codeset('deskbar-applet','UTF-8') -locale.textdomain('deskbar-applet') +#locale.bindtextdomain('deskbar-applet', abspath(join(deskbar.defs.DATA_DIR, "locale"))) +#if hasattr(locale, 'bind_textdomain_codeset'): -+# locale.bind_textdomain_codeset('deskbar-applet','UTF-8') ++# locale.bind_textdomain_codeset('deskbar-applet','UTF-8') +#locale.textdomain('deskbar-applet') - import gtkexcepthook - + # Enable threads + gtk.gdk.threads_init() diff --git a/deskutils/deskbar-applet/files/patch-deskbar_handlers_mozilla.py b/deskutils/deskbar-applet/files/patch-deskbar_handlers_mozilla.py deleted file mode 100644 index ffad36e44f87..000000000000 --- a/deskutils/deskbar-applet/files/patch-deskbar_handlers_mozilla.py +++ /dev/null @@ -1,18 +0,0 @@ ---- deskbar/handlers/mozilla.py.orig Wed Mar 1 13:32:12 2006 -+++ deskbar/handlers/mozilla.py Wed Mar 1 13:33:19 2006 -@@ -189,6 +189,7 @@ class MozillaSearchHandler(deskbar.Handl - get_firefox_home_file("searchplugins"), - get_firefox_home_file("search"), - expanduser("~/.mozilla/searchplugins"), -+ "%%LOCALBASE%%/lib/firefox/searchplugins", - "/usr/lib/firefox/searchplugins", - "/usr/local/lib/firefox/searchplugins", - "/usr/lib/mozilla-firefox/searchplugins", -@@ -197,6 +198,7 @@ class MozillaSearchHandler(deskbar.Handl - smart_dirs = [ - get_mozilla_home_file("search"), - expanduser("~/.mozilla/searchplugins"), -+ "%%LOCALBASE%%/lib/mozilla/searchplugins", - "/usr/lib/mozilla/searchplugins", - "/usr/local/lib/mozilla/searchplugins"] - |