[Python-apps-commits] r1496 - in packages/emesene/trunk/debian (2 files)

[pochu-guest at users.alioth.debian.org]

    Date: Friday, June 27, 2008 @ 22:54:15
  Author: pochu-guest
Revision: 1496

* debian/patches/use_webbrowser_module_to_open_html_local_files.patch:
  - Use webbrowser module instead of desktop.py from emesene to open
    local html files, as desktop.py will use gnome-open for GNOME which
    uses gnome-vfs, which since 1:2.22.0-4 makes text/* a subgroup of
    text/plain, making them being opened with a text editor instead of
    the browser. LP: #241765.
    For Lenny+1, if upstream doesn't change this code, it could be
    possible to just switch desktop.py to use gvfs-open.

Added:
  packages/emesene/trunk/debian/patches/use_webbrowser_module_to_open_html_local_files.patch
Modified:
  packages/emesene/trunk/debian/changelog

Modified: packages/emesene/trunk/debian/changelog
===================================================================
--- packages/emesene/trunk/debian/changelog	2008-06-27 22:27:11 UTC (rev 1495)
+++ packages/emesene/trunk/debian/changelog	2008-06-27 22:54:15 UTC (rev 1496)
@@ -8,8 +8,16 @@
   * debian/patches/from_upstream_fix_gtk_image_loading.patch:
     - Patch from upstream r1394, loads an stock image if the personal one
       couldn't be loaded.
+  * debian/patches/use_webbrowser_module_to_open_html_local_files.patch:
+    - Use webbrowser module instead of desktop.py from emesene to open
+      local html files, as desktop.py will use gnome-open for GNOME which
+      uses gnome-vfs, which since 1:2.22.0-4 makes text/* a subgroup of
+      text/plain, making them being opened with a text editor instead of
+      the browser. LP: #241765.
+      For Lenny+1, if upstream doesn't change this code, it could be
+      possible to just switch desktop.py to use gvfs-open.
 
- -- Emilio Pozuelo Monfort <pochu at ubuntu.com>  Sat, 28 Jun 2008 00:06:21 +0200
+ -- Emilio Pozuelo Monfort <pochu at ubuntu.com>  Sat, 28 Jun 2008 00:48:15 +0200
 
 emesene (1.0-dist-2) unstable; urgency=low
 

Added: packages/emesene/trunk/debian/patches/use_webbrowser_module_to_open_html_local_files.patch
===================================================================
--- packages/emesene/trunk/debian/patches/use_webbrowser_module_to_open_html_local_files.patch	                        (rev 0)
+++ packages/emesene/trunk/debian/patches/use_webbrowser_module_to_open_html_local_files.patch	2008-06-27 22:54:15 UTC (rev 1496)
@@ -0,0 +1,52 @@
+diff -ruNp emesene-1.0-dist.orig/plugins_base/LibNotify.py emesene-1.0-dist/plugins_base/LibNotify.py
+--- emesene-1.0-dist.orig/plugins_base/LibNotify.py	2008-03-23 22:56:22.000000000 +0100
++++ emesene-1.0-dist/plugins_base/LibNotify.py	2008-06-28 00:46:24.000000000 +0200
+@@ -21,6 +21,7 @@ import gobject
+ 
+ import Plugin
+ import desktop
++import webbrowser
+ from emesenelib.common import escape
+ from emesenelib.common import unescape
+ from Parser import PangoDataType
+@@ -221,7 +222,7 @@ class MainClass(Plugin.Plugin):
+ 
+         elif execute == 'mail':
+             def openMail(notification, action):
+-                desktop.open(self.controller.hotmail.getLoginPage\
++                webbrowser.open(self.controller.hotmail.getLoginPage\
+                     (data[0], data[1], data[2]))
+             notification.add_action('default', 'Open Mail', openMail)
+ 
+diff -ruNp emesene-1.0-dist.orig/plugins_base/Notification.py emesene-1.0-dist/plugins_base/Notification.py
+--- emesene-1.0-dist.orig/plugins_base/Notification.py	2008-03-24 08:03:45.000000000 +0100
++++ emesene-1.0-dist/plugins_base/Notification.py	2008-06-28 00:46:51.000000000 +0200
+@@ -696,7 +696,7 @@ class MainClass(Plugin.Plugin):
+         self.controller.newConversation(None, params[0], params[1], True)
+ 
+     def openMail(self, params):
+-        desktop.open(self.controller.hotmail.getLoginPage\
++        webbrowser.open(self.controller.hotmail.getLoginPage\
+                 (params[0], params[1], params[2]))
+ 
+     def start(self):
+diff -ruNp emesene-1.0-dist.orig/UserPanel.py emesene-1.0-dist/UserPanel.py
+--- emesene-1.0-dist.orig/UserPanel.py	2008-03-20 01:17:29.000000000 +0100
++++ emesene-1.0-dist/UserPanel.py	2008-06-28 00:45:39.000000000 +0200
+@@ -22,6 +22,7 @@ import gtk
+ import pango
+ 
+ import desktop
++import webbrowser
+ import Widgets
+ import FancyLabel
+ import StatusMenu
+@@ -320,7 +321,7 @@ class UserPanel(gtk.HBox):
+             self.controller.setMediaEnabled(False)
+             
+     def onMaiButtonClicked(self, *args):
+-        desktop.open(self.controller.hotmail.getLoginPage())
++        webbrowser.open(self.controller.hotmail.getLoginPage())
+         
+ class BaseImageButton:
+     def __init__(self, icon, string=None):