Update to 0.11.3

2 files changed, 10 insertions, 47 deletions

diff --git a/misc/gnome-osd/files/patch-gnomeosd_capplet.py b/misc/gnome-osd/files/patch-gnomeosd_capplet.py
new file mode 100644
index 000000000000..2dcfec3e3907
--- /dev/null
+++ b/misc/gnome-osd/files/patch-gnomeosd_capplet.py
@@ -0,0 +1,10 @@
+--- gnomeosd/capplet.py.orig	Wed Aug 23 03:44:56 2006
++++ gnomeosd/capplet.py	Wed Aug 23 03:45:29 2006
+@@ -150,7 +150,6 @@
+ def main():
+     gettext.install("gnome-osd", os.path.join(gnome_osd_conf.datadir, "locale"))
+     locale.setlocale(locale.LC_ALL, '')
+-    locale.bind_textdomain_codeset('gnome-osd','UTF-8')
+     gettext.bind_textdomain_codeset('gnome-osd','UTF-8')
+     gnome.program_init("gnome-osd-properties", gnome_osd_conf.VERSION)
+ 
diff --git a/misc/gnome-osd/files/patch-gnomeosd_server.py b/misc/gnome-osd/files/patch-gnomeosd_server.py
deleted file mode 100644
index ecee9f358d36..000000000000
--- a/misc/gnome-osd/files/patch-gnomeosd_server.py
+++ /dev/null
@@ -1,47 +0,0 @@
---- gnomeosd/server.py.orig	Wed Nov 16 16:26:50 2005
-+++ gnomeosd/server.py	Wed Nov 16 16:28:14 2005
-@@ -378,26 +378,27 @@
- 
-     bonobo.context_running_get().connect("last-unref", last_unref_cb)
- 
--class DBusInterface(dbus.service.Object):
--    def __init__(self, bus_name, object_path="/Server"):
--        dbus.service.Object.__init__(self, bus_name, object_path)
-+if HAVE_DBUS:
-+    class DBusInterface(dbus.service.Object):
-+        def __init__(self, bus_name, object_path="/Server"):
-+            dbus.service.Object.__init__(self, bus_name, object_path)
- 
--    #@dbus.service.method("pt.inescporto.telecom.GnomeOSD")
--    def showMessage(self, message, timeout=-1):
--        return message_show_cb(None, message, timeout)
--    showMessage = dbus.service.method("pt.inescporto.telecom.GnomeOSD")(showMessage)
-+    	#@dbus.service.method("pt.inescporto.telecom.GnomeOSD")
-+        def showMessage(self, message, timeout=-1):
-+            return message_show_cb(None, message, timeout)
-+        showMessage = dbus.service.method("pt.inescporto.telecom.GnomeOSD")(showMessage)
- 
--    #@dbus.service.method("pt.inescporto.telecom.GnomeOSD")
--    def showMessageFull(self, message):
--        return message_show_full_cb(None, message)
--    showMessageFull = dbus.service.method("pt.inescporto.telecom.GnomeOSD")(showMessageFull)
-+    	#@dbus.service.method("pt.inescporto.telecom.GnomeOSD")
-+        def showMessageFull(self, message):
-+            return message_show_full_cb(None, message)
-+        showMessageFull = dbus.service.method("pt.inescporto.telecom.GnomeOSD")(showMessageFull)
-+
-+    def start_dbus_interface():
-+        session_bus = dbus.SessionBus()
-+        name = dbus.service.BusName("pt.inescporto.telecom.GnomeOSD",
-+                                    bus=session_bus)
-+        obj = DBusInterface(name)
- 
--def start_dbus_interface():
--    session_bus = dbus.SessionBus()
--    name = dbus.service.BusName("pt.inescporto.telecom.GnomeOSD",
--                                bus=session_bus)
--    obj = DBusInterface(name)
--    
- 
- def main():
-     print "starting Bonobo interface..."