[Python-apps-commits] r2600 - in packages/emesene/trunk/debian (11 files)
pochu-guest at users.alioth.debian.org
pochu-guest at users.alioth.debian.org
Sat Mar 14 11:13:54 UTC 2009
Date: Saturday, March 14, 2009 @ 11:13:54
Author: pochu-guest
Revision: 2600
to support Amarok2. It uses DBus instead of DCOP, so when
Amarok 2 is in testing we can remove python-dcop from Suggests.
* Prefix patches with a number.
* debian/patches/03_from_upstream_fix_file_transfers_wlm2009.patch:
- New patch from upstream r1578, fix file transfers with
WLM2009 clients.
* Standards-Version is 3.8.1, no changes needed.
Added:
packages/emesene/trunk/debian/patches/01_from_upstream_fix_logger_exceptions.patch
(from rev 2566, packages/emesene/trunk/debian/patches/from_upstream_fix_logger_exceptions.patch)
packages/emesene/trunk/debian/patches/02_from_upstream_fix_banshee_1.0_support.patch
(from rev 2566, packages/emesene/trunk/debian/patches/from_upstream_fix_banshee_1.0_support.patch)
packages/emesene/trunk/debian/patches/03_from_upstream_fix_file_transfers_wlm2009.patch
packages/emesene/trunk/debian/patches/04_currentSong_plugin_support_amarok2.patch
(from rev 2566, packages/emesene/trunk/debian/patches/currentSong_plugin_support_amarok2.patch)
packages/emesene/trunk/debian/patches/10_use_webbrowser_module_to_open_html_local_files.patch
(from rev 2566, packages/emesene/trunk/debian/patches/use_webbrowser_module_to_open_html_local_files.patch)
Modified:
packages/emesene/trunk/debian/changelog
packages/emesene/trunk/debian/control
Deleted:
packages/emesene/trunk/debian/patches/currentSong_plugin_support_amarok2.patch
packages/emesene/trunk/debian/patches/from_upstream_fix_banshee_1.0_support.patch
packages/emesene/trunk/debian/patches/from_upstream_fix_logger_exceptions.patch
packages/emesene/trunk/debian/patches/use_webbrowser_module_to_open_html_local_files.patch
Modified: packages/emesene/trunk/debian/changelog
===================================================================
--- packages/emesene/trunk/debian/changelog 2009-03-14 10:54:15 UTC (rev 2599)
+++ packages/emesene/trunk/debian/changelog 2009-03-14 11:13:54 UTC (rev 2600)
@@ -7,8 +7,13 @@
[ Emilio Pozuelo Monfort ]
* debian/patches/currentSong_plugin_support_amarok2.patch:
- Add plugin from http://www.emesene.org/trac/ticket/1955
- to support Amarok2. It uses DBus instead of DCOP, so after
- Lenny is released we can remove python-dcop from Suggests.
+ to support Amarok2. It uses DBus instead of DCOP, so when
+ Amarok 2 is in testing we can remove python-dcop from Suggests.
+ * Prefix patches with a number.
+ * debian/patches/03_from_upstream_fix_file_transfers_wlm2009.patch:
+ - New patch from upstream r1578, fix file transfers with
+ WLM2009 clients.
+ * Standards-Version is 3.8.1, no changes needed.
-- Emilio Pozuelo Monfort <pochu at ubuntu.com> Sun, 21 Dec 2008 18:13:09 +0100
Modified: packages/emesene/trunk/debian/control
===================================================================
--- packages/emesene/trunk/debian/control 2009-03-14 10:54:15 UTC (rev 2599)
+++ packages/emesene/trunk/debian/control 2009-03-14 11:13:54 UTC (rev 2600)
@@ -7,7 +7,7 @@
debhelper (>= 5.0.51~),
python2.5
Build-Depends-Indep: python-central (>= 0.5.6)
-Standards-Version: 3.8.0
+Standards-Version: 3.8.1
XS-Python-Version: >=2.5
Homepage: http://www.emesene.org/
Vcs-Svn: svn://svn.debian.org/python-apps/packages/emesene/trunk/
Copied: packages/emesene/trunk/debian/patches/01_from_upstream_fix_logger_exceptions.patch (from rev 2566, packages/emesene/trunk/debian/patches/from_upstream_fix_logger_exceptions.patch)
===================================================================
--- packages/emesene/trunk/debian/patches/01_from_upstream_fix_logger_exceptions.patch (rev 0)
+++ packages/emesene/trunk/debian/patches/01_from_upstream_fix_logger_exceptions.patch 2009-03-14 11:13:54 UTC (rev 2600)
@@ -0,0 +1,49 @@
+Index: plugins_base/Logger.py
+===================================================================
+--- plugins_base/Logger.py (revisión: 1480)
++++ plugins_base/Logger.py (copia de trabajo)
+@@ -137,7 +137,7 @@
+ def user_exists(self, account):
+ '''return the user id if the account exists -1 otherwise'''
+
+- self.cursor.execute(Logger.USER_EXISTS, (account,))
++ self.cursor.execute(Logger.USER_EXISTS, (unicode(account),))
+
+ result = self.cursor.fetchall()
+ if len(result) >= 1:
+@@ -152,7 +152,7 @@
+ user_id = self.user_exists(account)
+
+ if user_id == -1:
+- self.cursor.execute(Logger.USER_ADD, (account,))
++ self.cursor.execute(Logger.USER_ADD, (unicode(account),))
+ self.connection.commit()
+ return self.cursor.lastrowid
+
+@@ -165,7 +165,7 @@
+ user_id = self.user_add(account)
+ event_id = self.event_add(name, stamp)
+ self.cursor.execute(Logger.USER_EVENT_ADD, (event_id,
+- user_id, data))
++ user_id, data.decode("utf8")))
+ self.connection.commit()
+ return self.cursor.lastrowid
+
+@@ -173,7 +173,7 @@
+ '''add an event with name "name", return the id'''
+ if stamp is None:
+ stamp = time.time()
+- self.cursor.execute(Logger.EVENT_ADD, (stamp, name))
++ self.cursor.execute(Logger.EVENT_ADD, (stamp, unicode(name)))
+ self.connection.commit()
+ return self.cursor.lastrowid
+
+@@ -185,7 +185,7 @@
+ event_id = self.event_add(name, stamp)
+ user_id = self.user_add(account)
+ self.cursor.execute(Logger.CONVERSATION_EVENT_ADD, (event_id,
+- conversation_id, user_id, data))
++ conversation_id, user_id, data.decode("utf8")))
+ self.connection.commit()
+ return self.cursor.lastrowid
+
Copied: packages/emesene/trunk/debian/patches/02_from_upstream_fix_banshee_1.0_support.patch (from rev 2566, packages/emesene/trunk/debian/patches/from_upstream_fix_banshee_1.0_support.patch)
===================================================================
--- packages/emesene/trunk/debian/patches/02_from_upstream_fix_banshee_1.0_support.patch (rev 0)
+++ packages/emesene/trunk/debian/patches/02_from_upstream_fix_banshee_1.0_support.patch 2009-03-14 11:13:54 UTC (rev 2600)
@@ -0,0 +1,66 @@
+Index: plugins_base/currentSong/Banshee.py
+===================================================================
+--- plugins_base/currentSong/Banshee.py (revision 1347)
++++ plugins_base/currentSong/Banshee.py (revision 1348)
+@@ -16,8 +16,8 @@
+ # along with emesene; if not, write to the Free Software
+ # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+-VERSION = '0.02'
+-IFACE_NAME = 'org.gnome.Banshee'
+-IFACE_PATH = '/org/gnome/Banshee/Player'
++VERSION = '1.0'
++IFACE_NAME = 'org.bansheeproject.Banshee'
++IFACE_PATH = '/org/bansheeproject/Banshee/PlayerEngine'
+
+ import CurrentSong
+@@ -35,28 +35,31 @@
+
+ def setCurrentSongData( self ):
+ if self.iface:
+- self.title = self.iface.GetPlayingTitle()
+- self.artist = self.iface.GetPlayingArtist()
+- self.album = self.iface.GetPlayingAlbum()
++ info = self.iface.GetCurrentTrack()
++ self.title = info["name"]
++ self.artist = info["artist"]
++ self.album = info["album"]
+
+ def isPlaying( self ):
+- if not self.iface: return False
+-
+- if not self.iface.GetPlayingTitle():
+- print "nao passou teste"
+- return False
+- if self.iface.GetPlayingTitle() != None:
+- print "passou teste"
++ if not self.isNameActive(IFACE_NAME):
++ return False
++ if not self.iface:
++ return False
++
++ if self.iface.GetCurrentState() == "playing":
+ return True
+- return False
++ else:
++ return False
+
+ def check( self ):
+- if not self.iface or not self.isNameActive(IFACE_NAME):
+- return
++ if not self.isNameActive(IFACE_NAME):
++ return False
++ if not self.iface:
++ return False
+
+- if self.iface.GetPlayingTitle() != self.title:
+- self.setCurrentSongData()
+- return True
+-
++ if self.iface.GetCurrentState() == "playing":
++ if self.iface.GetCurrentTrack()["name"] != self.title:
++ self.setCurrentSongData()
++ return True
++
+ return False
+-
Added: packages/emesene/trunk/debian/patches/03_from_upstream_fix_file_transfers_wlm2009.patch
===================================================================
--- packages/emesene/trunk/debian/patches/03_from_upstream_fix_file_transfers_wlm2009.patch (rev 0)
+++ packages/emesene/trunk/debian/patches/03_from_upstream_fix_file_transfers_wlm2009.patch 2009-03-14 11:13:54 UTC (rev 2600)
@@ -0,0 +1,12 @@
+=== modified file 'emesenelib/p2p/tlp.py'
+--- emesenelib/msn_tlp.py 2008-12-25 15:49:20 +0000
++++ emesenelib/msn_tlp.py 2009-03-12 20:37:42 +0000
+@@ -241,7 +241,7 @@
+ self.send_acknowledge(bin_header)
+
+ # session and flag 0 means slp
+- if body and bin_header.session_id == 0 and bin_header.flag == 0:
++ if body and bin_header.session_id == 0 and (bin_header.flag & 0xff) == 0:
+ try:
+ slp = msn_slp.SLPMessage(body[48:-4])
+ except msn_slp.SLPError:
Copied: packages/emesene/trunk/debian/patches/04_currentSong_plugin_support_amarok2.patch (from rev 2566, packages/emesene/trunk/debian/patches/currentSong_plugin_support_amarok2.patch)
===================================================================
--- packages/emesene/trunk/debian/patches/04_currentSong_plugin_support_amarok2.patch (rev 0)
+++ packages/emesene/trunk/debian/patches/04_currentSong_plugin_support_amarok2.patch 2009-03-14 11:13:54 UTC (rev 2600)
@@ -0,0 +1,77 @@
+Index: plugins_base/currentSong/Amarok2.py
+===================================================================
+--- plugins_base/currentSong/Amarok2.py (revisión: 0)
++++ plugins_base/currentSong/Amarok2.py (revisión: 0)
+@@ -0,0 +1,60 @@
++# -*- coding: utf-8 -*-
++
++# This file is part of emesene.
++#
++# Emesene is free software; you can redistribute it and/or modify
++# it under the terms of the GNU General Public License as published by
++# the Free Software Foundation; either version 2 of the License, or
++# (at your option) any later version.
++#
++# emesene is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++# GNU General Public License for more details.
++#
++# You should have received a copy of the GNU General Public License
++# along with emesene; if not, write to the Free Software
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
++# Creator: Otávio Souza <leader at kinuxlinux.org>
++
++import os
++import CurrentSong
++
++import dbus
++
++class Amarok2(CurrentSong.CurrentSong):
++ def __init__(self):
++ CurrentSong.CurrentSong.__init__(self)
++ if self.isRunning():
++ self.amarok = dbus.SessionBus().get_object('org.kde.amarok','/Player');
++ self.track = dbus.SessionBus().get_object('org.kde.amarok','/TrackList');
++
++ self.check()
++
++ def isRunning(self):
++ if os.popen('ps -A | grep amarok').read() == "":
++ self.running = False
++ else:
++ self.running = True
++
++ return self.running
++
++ def isPlaying(self):
++ if self.isRunning():
++ return bool(self.amarok.PositionGet() > 0)
++ else:
++ return False
++
++ def getStatus(self):
++ return (True , 'Ok')
++
++ def check(self):
++ if self.isPlaying():
++ self.info = self.track.GetMetadata(self.track.GetCurrentTrack());
++ self.artist = str(self.info['artist'])
++ self.album = str(self.info['album'])
++ self.title = str(self.info['title']);
++ return True
++ else:
++ return False;
++
+Index: plugins_base/currentSong/__init__.py
+===================================================================
+--- plugins_base/currentSong/__init__.py (revisión: 1525)
++++ plugins_base/currentSong/__init__.py (copia de trabajo)
+@@ -19,6 +19,7 @@
+ from os import name
+ if name == 'posix':
+ from Amarok import Amarok
++ from Amarok2 import Amarok2
+ from Exaile import Exaile
+ from Xmms import Xmms
+ from Banshee import Banshee
Copied: packages/emesene/trunk/debian/patches/10_use_webbrowser_module_to_open_html_local_files.patch (from rev 2566, packages/emesene/trunk/debian/patches/use_webbrowser_module_to_open_html_local_files.patch)
===================================================================
--- packages/emesene/trunk/debian/patches/10_use_webbrowser_module_to_open_html_local_files.patch (rev 0)
+++ packages/emesene/trunk/debian/patches/10_use_webbrowser_module_to_open_html_local_files.patch 2009-03-14 11:13:54 UTC (rev 2600)
@@ -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):
Deleted: packages/emesene/trunk/debian/patches/currentSong_plugin_support_amarok2.patch
===================================================================
--- packages/emesene/trunk/debian/patches/currentSong_plugin_support_amarok2.patch 2009-03-14 10:54:15 UTC (rev 2599)
+++ packages/emesene/trunk/debian/patches/currentSong_plugin_support_amarok2.patch 2009-03-14 11:13:54 UTC (rev 2600)
@@ -1,77 +0,0 @@
-Index: plugins_base/currentSong/Amarok2.py
-===================================================================
---- plugins_base/currentSong/Amarok2.py (revisión: 0)
-+++ plugins_base/currentSong/Amarok2.py (revisión: 0)
-@@ -0,0 +1,60 @@
-+# -*- coding: utf-8 -*-
-+
-+# This file is part of emesene.
-+#
-+# Emesene is free software; you can redistribute it and/or modify
-+# it under the terms of the GNU General Public License as published by
-+# the Free Software Foundation; either version 2 of the License, or
-+# (at your option) any later version.
-+#
-+# emesene is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+# GNU General Public License for more details.
-+#
-+# You should have received a copy of the GNU General Public License
-+# along with emesene; if not, write to the Free Software
-+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-+# Creator: Otávio Souza <leader at kinuxlinux.org>
-+
-+import os
-+import CurrentSong
-+
-+import dbus
-+
-+class Amarok2(CurrentSong.CurrentSong):
-+ def __init__(self):
-+ CurrentSong.CurrentSong.__init__(self)
-+ if self.isRunning():
-+ self.amarok = dbus.SessionBus().get_object('org.kde.amarok','/Player');
-+ self.track = dbus.SessionBus().get_object('org.kde.amarok','/TrackList');
-+
-+ self.check()
-+
-+ def isRunning(self):
-+ if os.popen('ps -A | grep amarok').read() == "":
-+ self.running = False
-+ else:
-+ self.running = True
-+
-+ return self.running
-+
-+ def isPlaying(self):
-+ if self.isRunning():
-+ return bool(self.amarok.PositionGet() > 0)
-+ else:
-+ return False
-+
-+ def getStatus(self):
-+ return (True , 'Ok')
-+
-+ def check(self):
-+ if self.isPlaying():
-+ self.info = self.track.GetMetadata(self.track.GetCurrentTrack());
-+ self.artist = str(self.info['artist'])
-+ self.album = str(self.info['album'])
-+ self.title = str(self.info['title']);
-+ return True
-+ else:
-+ return False;
-+
-Index: plugins_base/currentSong/__init__.py
-===================================================================
---- plugins_base/currentSong/__init__.py (revisión: 1525)
-+++ plugins_base/currentSong/__init__.py (copia de trabajo)
-@@ -19,6 +19,7 @@
- from os import name
- if name == 'posix':
- from Amarok import Amarok
-+ from Amarok2 import Amarok2
- from Exaile import Exaile
- from Xmms import Xmms
- from Banshee import Banshee
Deleted: packages/emesene/trunk/debian/patches/from_upstream_fix_banshee_1.0_support.patch
===================================================================
--- packages/emesene/trunk/debian/patches/from_upstream_fix_banshee_1.0_support.patch 2009-03-14 10:54:15 UTC (rev 2599)
+++ packages/emesene/trunk/debian/patches/from_upstream_fix_banshee_1.0_support.patch 2009-03-14 11:13:54 UTC (rev 2600)
@@ -1,66 +0,0 @@
-Index: plugins_base/currentSong/Banshee.py
-===================================================================
---- plugins_base/currentSong/Banshee.py (revision 1347)
-+++ plugins_base/currentSong/Banshee.py (revision 1348)
-@@ -16,8 +16,8 @@
- # along with emesene; if not, write to the Free Software
- # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
--VERSION = '0.02'
--IFACE_NAME = 'org.gnome.Banshee'
--IFACE_PATH = '/org/gnome/Banshee/Player'
-+VERSION = '1.0'
-+IFACE_NAME = 'org.bansheeproject.Banshee'
-+IFACE_PATH = '/org/bansheeproject/Banshee/PlayerEngine'
-
- import CurrentSong
-@@ -35,28 +35,31 @@
-
- def setCurrentSongData( self ):
- if self.iface:
-- self.title = self.iface.GetPlayingTitle()
-- self.artist = self.iface.GetPlayingArtist()
-- self.album = self.iface.GetPlayingAlbum()
-+ info = self.iface.GetCurrentTrack()
-+ self.title = info["name"]
-+ self.artist = info["artist"]
-+ self.album = info["album"]
-
- def isPlaying( self ):
-- if not self.iface: return False
--
-- if not self.iface.GetPlayingTitle():
-- print "nao passou teste"
-- return False
-- if self.iface.GetPlayingTitle() != None:
-- print "passou teste"
-+ if not self.isNameActive(IFACE_NAME):
-+ return False
-+ if not self.iface:
-+ return False
-+
-+ if self.iface.GetCurrentState() == "playing":
- return True
-- return False
-+ else:
-+ return False
-
- def check( self ):
-- if not self.iface or not self.isNameActive(IFACE_NAME):
-- return
-+ if not self.isNameActive(IFACE_NAME):
-+ return False
-+ if not self.iface:
-+ return False
-
-- if self.iface.GetPlayingTitle() != self.title:
-- self.setCurrentSongData()
-- return True
--
-+ if self.iface.GetCurrentState() == "playing":
-+ if self.iface.GetCurrentTrack()["name"] != self.title:
-+ self.setCurrentSongData()
-+ return True
-+
- return False
--
Deleted: packages/emesene/trunk/debian/patches/from_upstream_fix_logger_exceptions.patch
===================================================================
--- packages/emesene/trunk/debian/patches/from_upstream_fix_logger_exceptions.patch 2009-03-14 10:54:15 UTC (rev 2599)
+++ packages/emesene/trunk/debian/patches/from_upstream_fix_logger_exceptions.patch 2009-03-14 11:13:54 UTC (rev 2600)
@@ -1,49 +0,0 @@
-Index: plugins_base/Logger.py
-===================================================================
---- plugins_base/Logger.py (revisión: 1480)
-+++ plugins_base/Logger.py (copia de trabajo)
-@@ -137,7 +137,7 @@
- def user_exists(self, account):
- '''return the user id if the account exists -1 otherwise'''
-
-- self.cursor.execute(Logger.USER_EXISTS, (account,))
-+ self.cursor.execute(Logger.USER_EXISTS, (unicode(account),))
-
- result = self.cursor.fetchall()
- if len(result) >= 1:
-@@ -152,7 +152,7 @@
- user_id = self.user_exists(account)
-
- if user_id == -1:
-- self.cursor.execute(Logger.USER_ADD, (account,))
-+ self.cursor.execute(Logger.USER_ADD, (unicode(account),))
- self.connection.commit()
- return self.cursor.lastrowid
-
-@@ -165,7 +165,7 @@
- user_id = self.user_add(account)
- event_id = self.event_add(name, stamp)
- self.cursor.execute(Logger.USER_EVENT_ADD, (event_id,
-- user_id, data))
-+ user_id, data.decode("utf8")))
- self.connection.commit()
- return self.cursor.lastrowid
-
-@@ -173,7 +173,7 @@
- '''add an event with name "name", return the id'''
- if stamp is None:
- stamp = time.time()
-- self.cursor.execute(Logger.EVENT_ADD, (stamp, name))
-+ self.cursor.execute(Logger.EVENT_ADD, (stamp, unicode(name)))
- self.connection.commit()
- return self.cursor.lastrowid
-
-@@ -185,7 +185,7 @@
- event_id = self.event_add(name, stamp)
- user_id = self.user_add(account)
- self.cursor.execute(Logger.CONVERSATION_EVENT_ADD, (event_id,
-- conversation_id, user_id, data))
-+ conversation_id, user_id, data.decode("utf8")))
- self.connection.commit()
- return self.cursor.lastrowid
-
Deleted: 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 2009-03-14 10:54:15 UTC (rev 2599)
+++ packages/emesene/trunk/debian/patches/use_webbrowser_module_to_open_html_local_files.patch 2009-03-14 11:13:54 UTC (rev 2600)
@@ -1,52 +0,0 @@
-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):
More information about the Python-apps-commits
mailing list