Imported Upstream version 0.40

15 files changed, 60 insertions, 43 deletions

diff --git a/ChangeLog b/ChangeLog
index 02bb9a1..51979ef 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,13 @@ NEWS
 Major changes for each release are described here. Detailed changes between
 two versions can be retrieved from Git.
 
+0.40
+==== (2015-11-23)
+
+* Correctly escape XML output.
+* Make error message selectable.
+* Fixed spurious D-Bus error message.
+
 0.39
 ==== (2015-07-14)
 
diff --git a/PKG-INFO b/PKG-INFO
index e151cc4..9886700 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: wammu
-Version: 0.39
+Version: 0.40
 Summary: Wammu Mobile Phone Manager
 Home-page: http://wammu.eu/wammu/
 Author: Michal Cihar
@@ -33,7 +33,6 @@ Classifier: Natural Language :: Czech
 Classifier: Natural Language :: German
 Classifier: Natural Language :: Greek
 Classifier: Natural Language :: Spanish
-Classifier: Natural Language :: Estonian
 Classifier: Natural Language :: Finnish
 Classifier: Natural Language :: French
 Classifier: Natural Language :: Galician
diff --git a/Wammu/ContactsXML.py b/Wammu/ContactsXML.py
index 0b4662a..28476db 100644
--- a/Wammu/ContactsXML.py
+++ b/Wammu/ContactsXML.py
@@ -25,6 +25,7 @@ Module for writing contacts to XML.
 
 from Wammu.Locales import ugettext as _
 import Wammu.Data
+from xml.sax.saxutils import escape
 import wx
 import os
 
@@ -47,7 +48,7 @@ def ContactToXML(cfg, folder, contact):
     contactxml = "    <contact>\n"
 
     contactxml += "        <name>"
-    contactxml += contact['Name'].encode('utf-8')
+    contactxml += escape(contact['Name'].encode('utf-8'))
     contactxml += "</name>\n"
 
     for i in contact['Entries']:
@@ -63,41 +64,41 @@ def ContactToXML(cfg, folder, contact):
             addr_country = i['Value']
         elif i['Type'] == 'Text_Note':
             contactxml += "        <note>"
-            contactxml += i['Value'].encode('utf-8')
+            contactxml += escape(i['Value'].encode('utf-8'))
             contactxml += "</note>\n"
         elif i['Type'] == 'Text_URL':
             contactxml += "        <url>"
-            contactxml += i['Value'].encode('utf-8')
+            contactxml += escape(i['Value'].encode('utf-8'))
             contactxml += "</url>\n"
         elif i['Type'] == 'Text_Email':
             if i['Value']:
                 contactxml += "        <email>"
-                contactxml += i['Value'].encode('utf-8')
+                contactxml += escape(i['Value'].encode('utf-8'))
                 contactxml += "</email>\n"
         elif i['Type'] == 'Text_Email2':
             if i['Value']:
                 contactxml += "        <email>"
-                contactxml += i['Value'].encode('utf-8')
+                contactxml += escape(i['Value'].encode('utf-8'))
                 contactxml += "</email>\n"
         elif i['Type'] == 'Number_Mobile':
             contactxml += "        <mobile>"
-            contactxml += i['Value'].encode('utf-8')
+            contactxml += escape(i['Value'].encode('utf-8'))
             contactxml += "</mobile>\n"
         elif i['Type'] == 'Number_Work':
             contactxml += "        <work>"
-            contactxml += i['Value'].encode('utf-8')
+            contactxml += escape(i['Value'].encode('utf-8'))
             contactxml += "</work>\n"
         elif i['Type'] == 'Number_Fax':
             contactxml += "        <fax>"
-            contactxml += i['Value'].encode('utf-8')
+            contactxml += escape(i['Value'].encode('utf-8'))
             contactxml += "</fax>\n"
         elif i['Type'] == 'Number_Home':
             contactxml += "        <home>"
-            contactxml += i['Value'].encode('utf-8')
+            contactxml += escape(i['Value'].encode('utf-8'))
             contactxml += "</home>\n"
         elif i['Type'][:7] == 'Number_':
             contactxml += "        <phone>"
-            contactxml += i['Value'].encode('utf-8')
+            contactxml += escape(i['Value'].encode('utf-8'))
             contactxml += "</phone>\n"
 
     addr_full = addr_zip
@@ -119,7 +120,7 @@ def ContactToXML(cfg, folder, contact):
         addr_full += addr_country
     if addr_full:
         contactxml += "        <address>"
-        contactxml += addr_full.encode('utf-8')
+        contactxml += escape(addr_full.encode('utf-8'))
         contactxml += "</address>\n"
 
     if contact['Date'] is not None:
@@ -129,7 +130,7 @@ def ContactToXML(cfg, folder, contact):
         contactxml += "</birthday>\n"
 
     contactxml += "        <folder>"
-    contactxml += folder.encode('utf-8')
+    contactxml += escape(folder.encode('utf-8'))
     contactxml += "</folder>\n"
 
     contactxml += "    </contact>\n"
@@ -185,7 +186,6 @@ def ContactsExportXML(parent, contactsSM, contactsME):
         f.write("</contacts>\n")
         f.close()
     except IOError:
-        del parent.progress
         wx.MessageDialog(
             parent,
             _('Creating of file %s failed, bailing out.') % path,
diff --git a/Wammu/ErrorMessage.py b/Wammu/ErrorMessage.py
index 7d58c65..21cec51 100644
--- a/Wammu/ErrorMessage.py
+++ b/Wammu/ErrorMessage.py
@@ -61,8 +61,9 @@ class ErrorMessage(wx.Dialog):
             message += (
                     _('Debug log has been automatically saved to %s, you are strongly encouraged to include it in bugreport.')
                     % autolog)
-        msg = wx.StaticText(self, -1, message)
-        msg.Wrap(400)
+        msg = wx.TextCtrl(self, style=wx.TE_BESTWRAP|wx.TE_MULTILINE|wx.TE_READONLY|wx.BORDER_NONE, size=(500, 400))
+        msg.SetValue(message)
+        msg.SetBackgroundColour(wx.SystemSettings.GetColour(4))
         textsizer.Add(msg)
 
         buttonsizer = wx.StdDialogButtonSizer()
diff --git a/Wammu/SMSExport.py b/Wammu/SMSExport.py
index 568b95c..daa0883 100644
--- a/Wammu/SMSExport.py
+++ b/Wammu/SMSExport.py
@@ -68,7 +68,6 @@ def SMSToMailbox(parent, messages, contacts):
 
         f.close()
     except IOError:
-        del parent.progress
         wx.MessageDialog(
             parent,
             _('Creating of file %s failed, bailing out.') % path,
diff --git a/Wammu/SMSXML.py b/Wammu/SMSXML.py
index a087de7..2159ef2 100644
--- a/Wammu/SMSXML.py
+++ b/Wammu/SMSXML.py
@@ -26,6 +26,7 @@ from Wammu.Utils import SearchNumber
 from Wammu.MessageDisplay import SmsTextFormat
 from Wammu.Locales import ugettext as _
 import Wammu.Data
+from xml.sax.saxutils import escape
 import wx
 import os
 
@@ -55,15 +56,15 @@ def SMSToXML(cfg, sms, contact=None):
         smsxml += "</dateenc>\n"
 
     smsxml += "        <text>"
-    smsxml += text.encode('utf-8')
+    smsxml += escape(text.encode('utf-8'))
     smsxml += "</text>\n"
 
     smsxml += "        <telephone>"
-    smsxml += sms['Number'].encode('utf-8')
+    smsxml += escape(sms['Number'].encode('utf-8'))
     smsxml += "</telephone>\n"
 
     smsxml += "        <contact>"
-    smsxml += contact.encode('utf-8')
+    smsxml += escape(contact.encode('utf-8'))
     smsxml += "</contact>\n"
 
     smsxml += "        <folder>"
@@ -120,7 +121,6 @@ def SMSExportXML(parent, messages, contacts):
         f.write("</messages>\n")
         f.close()
     except IOError:
-        del parent.progress
         wx.MessageDialog(
             parent,
             _('Creating of file %s failed, bailing out.') % path,
diff --git a/Wammu/Utils.py b/Wammu/Utils.py
index 2ab77c3..7dfc3bc 100644
--- a/Wammu/Utils.py
+++ b/Wammu/Utils.py
@@ -525,14 +525,15 @@ def DBUSServiceAvailable(bus, interface, try_start_service=False):
         import dbus
     except ImportError:
         return False
-    if try_start_service:
+    obj = bus.get_object('org.freedesktop.DBus', '/org/freedesktop/DBus')
+    dbus_iface = dbus.Interface(obj, 'org.freedesktop.DBus')
+    avail = dbus_iface.ListNames()
+    if interface not in avail and try_start_service:
         try:
             bus.start_service_by_name(interface)
+            avail = dbus_iface.ListNames()
         except dbus.exceptions.DBusException:
             print 'Failed to start DBus service %s' % interface
-    obj = bus.get_object('org.freedesktop.DBus', '/org/freedesktop/DBus')
-    dbus_iface = dbus.Interface(obj, 'org.freedesktop.DBus')
-    avail = dbus_iface.ListNames()
     return interface in avail
 
 
diff --git a/Wammu/__init__.py b/Wammu/__init__.py
index 70f069e..5204575 100644
--- a/Wammu/__init__.py
+++ b/Wammu/__init__.py
@@ -21,7 +21,7 @@ Wammu - Phone manager
 Wammu top level module
 '''
 
-__version__ = '0.39'
+__version__ = '0.40'
 
 gammu_error = None
 configuration = None
diff --git a/description-pak b/description-pak
index 7a4474f..05e44f8 100644
--- a/description-pak
+++ b/description-pak
@@ -1,4 +1,4 @@
-Wammu Mobile Phone Manager 0.39
+Wammu Mobile Phone Manager 0.40
 
 It works with any phone that Gammu supports, including many models from
 Nokia, Siemens, and Alcatel. It has complete support (read, edit,
diff --git a/icon/wammu-300x300.png b/icon/wammu-300x300.png
new file mode 100644
index 0000000..b4197ec
--- /dev/null
+++ b/icon/wammu-300x300.png
diff --git a/icon/wammu.svg b/icon/wammu.svg
index ff0e0bb..3267987 100644
--- a/icon/wammu.svg
+++ b/icon/wammu.svg
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
+   xmlns:cc="http://creativecommons.org/ns#"
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
@@ -9,16 +9,15 @@
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    height="200"
    id="svg1"
-   inkscape:version="0.45.1"
-   sodipodi:docbase="/home/mic/private/svn/wammu/icon"
+   inkscape:version="0.48.5 r10040"
    sodipodi:docname="wammu.svg"
    sodipodi:version="0.32"
    width="200"
    inkscape:output_extension="org.inkscape.output.svg.inkscape"
    version="1.0"
-   inkscape:export-filename="/home/mic/private/svn/wammu/icon/wammu-192x192.png"
-   inkscape:export-xdpi="86.400002"
-   inkscape:export-ydpi="86.400002">
+   inkscape:export-filename="wammu-300x300.png"
+   inkscape:export-xdpi="135"
+   inkscape:export-ydpi="135">
   <metadata
      id="metadata1397">
     <rdf:RDF>
@@ -74,18 +73,20 @@
      borderopacity="1.0"
      id="base"
      inkscape:current-layer="svg1"
-     inkscape:cx="99.762479"
+     inkscape:cx="100.26338"
      inkscape:cy="100.60194"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
      inkscape:window-height="1024"
      inkscape:window-width="1590"
      inkscape:window-x="0"
-     inkscape:window-y="25"
+     inkscape:window-y="27"
      inkscape:zoom="3.9928159"
      pagecolor="#ffffff"
      width="200px"
-     height="200px" />
+     height="200px"
+     showgrid="false"
+     inkscape:window-maximized="0" />
   <defs
      id="defs2">
     <linearGradient
diff --git a/locale/de/wammu.po b/locale/de/wammu.po
index 0d367bd..40a3e36 100644
--- a/locale/de/wammu.po
+++ b/locale/de/wammu.po
@@ -8,15 +8,15 @@ msgstr ""
 "Project-Id-Version: wammu\n"
 "Report-Msgid-Bugs-To: gammu-users@lists.sourceforge.net\n"
 "POT-Creation-Date: 2014-12-29 11:47+0100\n"
-"PO-Revision-Date: 2014-04-16 19:06+0200\n"
-"Last-Translator: Purodha Blissenbach <publi@web.de>\n"
+"PO-Revision-Date: 2015-11-19 09:41+0000\n"
+"Last-Translator: armagetron <armagetron@live.de>\n"
 "Language-Team: German <https://hosted.weblate.org/projects/gammu/wammu/de/>\n"
 "Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 1.9-dev\n"
+"X-Generator: Weblate 2.5-dev\n"
 
 #: Wammu/About.py:43
 msgid "About Wammu"
@@ -4155,6 +4155,9 @@ msgid ""
 "with any phone that Gammu supports, including many models from Nokia, "
 "Siemens, and Alcatel."
 msgstr ""
+"Wammu ist ein Mobiltelefon Manager mit Gammu als Backend. Es funktioniert "
+"mit jedem Telefon, dass von Gammu unterstützt wird, einschließlich vieler "
+"Modelle von Nokia, Siemens und Alcatel."
 
 #: wammu_setup/msgfmt.py:58
 msgid ""
@@ -4165,6 +4168,13 @@ msgid ""
 "edited in the SMS composer. It can export messages to an IMAP4 server (or "
 "other email storage)."
 msgstr ""
+"Es bietet vollständige Unterstützung (lesen, schreiben, löschen, kopieren) "
+"für Kontakte, Todo und Kalender. Es kann SMS lesen, speichern und senden. "
+"Außerdem enthält es einen SMS Composer für multi-part SMS Nachrichten und es "
+"kann SMS Nachrichten anzeigen, die Bilder enthalten. Momentan können nur "
+"Text und vordefinierte Bitmaps oder Töne mit dem SMS Composer bearbeitet "
+"werden. Nachrichten können auf einen IMAP4 Server (oder anderen Mailserver) "
+"exportiert werden."
 
 #~ msgid "&Import"
 #~ msgstr "&Importieren"
diff --git a/setup.py b/setup.py
index 5c7a81f..e838163 100755
--- a/setup.py
+++ b/setup.py
@@ -438,7 +438,6 @@ distutils.core.setup(
         'Natural Language :: German',
         'Natural Language :: Greek',
         'Natural Language :: Spanish',
-        'Natural Language :: Estonian',
         'Natural Language :: Finnish',
         'Natural Language :: French',
         'Natural Language :: Galician',
diff --git a/wammu.iss b/wammu.iss
index 7de86e8..871240d 100644
--- a/wammu.iss
+++ b/wammu.iss
@@ -5,7 +5,7 @@
 

 #define MyAppDosName "wammu"

 #define MyAppName "Wammu"

-#define MyAppVersion "0.39"

+#define MyAppVersion "0.40"

 #define MyAppPublisher "Micha Èihaø"

 #define MyAppURL "http://wammu.eu/"

 #define MyAppPublisherURL "http://cihar.com/"

diff --git a/wammu.spec b/wammu.spec
index 1b4ed7e..aff2942 100644
--- a/wammu.spec
+++ b/wammu.spec
@@ -1,5 +1,5 @@
 Name:           wammu
-Version:        0.39
+Version:        0.40
 Release:        1
 
 %define extension   bz2