update path to some files so they match the new structure [it is far from...

update path to some files so they match the new structure [it is far from complete and of course it is vital to have the paths fixed before 0.7]

setup_win32.py

@@ -4,7 +4,8 @@
 ## - Yann Le Boulanger <asterix@lagaule.org>
 ## - Vincent Hanquez <tab@snarc.org>
 ##	- Nikos Kouremenos <kourem@gmail.com>
-##      Copyright (C) 2003-2005 Gajim Team
+##
+## Copyright (C) 2003-2005 Gajim Team
 ##
 ## This program is free software; you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published
@@ -20,35 +21,35 @@ from distutils.core import setup
 import py2exe
 import glob
 
-includes = ["encodings",
-            "encodings.utf-8",]
+includes = ['encodings',
+            'encodings.utf-8',]
 
 opts = {
-    "py2exe": {
-        "includes": "pango,atk,gobject,plugins,plugins.gtkgui,plugins.logger,encodings,encodings.*",
-        "dll_excludes": [
-            "iconv.dll","intl.dll","libatk-1.0-0.dll",
-            "libgdk_pixbuf-2.0-0.dll","libgdk-win32-2.0-0.dll",
-            "libglib-2.0-0.dll","libgmodule-2.0-0.dll",
-            "libgobject-2.0-0.dll","libgthread-2.0-0.dll",
-            "libgtk-win32-2.0-0.dll","libpango-1.0-0.dll",
-            "libpangowin32-1.0-0.dll"
+    'py2exe': {
+        'includes': 'pango,atk,gobject,plugins,plugins.gtkgui,plugins.logger,encodings,encodings.*',
+        'dll_excludes': [
+            'iconv.dll','intl.dll','libatk-1.0-0.dll',
+            'libgdk_pixbuf-2.0-0.dll','libgdk-win32-2.0-0.dll',
+            'libglib-2.0-0.dll','libgmodule-2.0-0.dll',
+            'libgobject-2.0-0.dll','libgthread-2.0-0.dll',
+            'libgtk-win32-2.0-0.dll','libpango-1.0-0.dll',
+            'libpangowin32-1.0-0.dll'
         ],
     }
 }
 
 setup(
-    name = "Gajim",
-    description = "A jabber client",
-#    console=["gajim.py"],
-    windows = [{"script": "gajim.py",
-                "icon_resources": [(1, "gajim.ico")]}],
+    name = 'Gajim',
+    description = 'A jabber client',
+#    console=['gajim.py'],
+    windows = [{'script': 'gajim.py',
+                'icon_resources': [(1, 'gajim.ico')]}],
     options=opts,
-    data_files=[("plugins/gtkgui", glob.glob("plugins/gtkgui/gtkgui.glade")),
-                ("plugins/gtkgui/icons/sun", glob.glob("plugins/gtkgui/icons/sun/*.*")),
-                ("plugins/gtkgui/emoticons", glob.glob("plugins/gtkgui/emoticons/*.*")),
-                ("plugins/gtkgui/pixmaps", glob.glob("plugins/gtkgui/pixmaps/*.*")),
-                ("sounds", glob.glob("sounds/*.*")),
-                ("Messages/fr/LC_MESSAGES", glob.glob("Messages/fr/LC_MESSAGES/*.mo"))
+    data_files=[('plugins/gtkgui', glob.glob('plugins/gtkgui/gtkgui.glade')),
+                ('plugins/gtkgui/icons/sun', glob.glob('plugins/gtkgui/icons/sun/*.*')),
+                ('plugins/gtkgui/emoticons', glob.glob('plugins/gtkgui/emoticons/*.*')),
+                ('plugins/gtkgui/pixmaps', glob.glob('plugins/gtkgui/pixmaps/*.*')),
+                ('sounds', glob.glob('data/sounds/*.*')),
+                ('Messages/fr/LC_MESSAGES', glob.glob('Messages/fr/LC_MESSAGES/*.mo'))
     ],
 )

src/common/config.py

@@ -194,14 +194,15 @@ class Config:
 		'Eating': 'I\'m eating, so leave me a message.',
 		'Movie' : 'I\'m watching a movie.' ,
 		'Working': 'I\'m working.',
+		'Phone': 'I\'m on the phone.',
 	}
 
 	soundevents_default = {
-		'first_message_received': [ True, 'sounds/message1.wav' ],
-		'next_message_received': [ True, 'sounds/message2.wav' ],
-		'contact_connected': [ True, 'sounds/connected.wav' ],
-		'contact_disconnected': [ True, 'sounds/disconnected.wav' ],
-		'message_sent': [ True, 'sounds/sent.wav' ],
+		'first_message_received': [ True, '../data/sounds/message1.wav' ],
+		'next_message_received': [ True, '../data/sounds/message2.wav' ],
+		'contact_connected': [ True, '../data/sounds/connected.wav' ],
+		'contact_disconnected': [ True, '../data/sounds/disconnected.wav' ],
+		'message_sent': [ True, '../data/sounds/sent.wav' ],
 	}
 
 	def foreach(self, cb, data = None):