Changeset 7701

Timestamp:

12/20/06 07:58:39 (22 months ago)

Author:

asterix

Message:

merge diff from trunk

Location:

branches/gajim_0.11

Files:

• ChangeLog (modified) (1 diff)
• gajim.iss (modified) (2 diffs)
• setup_win32.py (modified) (2 diffs)
• src/gtkgui_helpers.py (modified) (1 diff)

branches/gajim_0.11/ChangeLog

@@ -21 +21 @@
   * Annotations (XEP-0145)
   * XHTML Support 
-  * Rhythmbox song change notification
+  * Rhythmbox and Muine song change notification
   * Ability to operate on more than one contact at once in roster (#1514)
   * Send single message to a whole group 

branches/gajim_0.11/gajim.iss

@@ -1 +1 @@
 [Setup]
 AppName=Gajim
-AppVerName=Gajim version 0.10.1-1
+AppVerName=Gajim version 0.11-1
 DefaultDirName={pf}\Gajim
 DefaultGroupName=Gajim
@@ -22 +22 @@
 Source: "COPYING"; DestDir: "{app}"
 Source: "THANKS"; DestDir: "{app}"
+Source: "AUTHORS"; DestDir: "{app}"
 Source: "dist\gajim.exe"; DestDir: "{app}\src"; components: main
 Source: "dist\history_manager.exe"; DestDir: "{app}\src"; components: main
 Source: "data\*"; DestDir: "{app}\data"; Flags: recursesubdirs
 Source: "po\*.mo"; DestDir: "{app}\po"; Flags: recursesubdirs
+;Source: "gtk\*"; DestDir: "{app}\src\gtk"; Flags: recursesubdirs
 
 [Icons]

branches/gajim_0.11/setup_win32.py

@@ -24 +24 @@
 opts = {
     'py2exe': {
-        'includes': 'pango,atk,gobject,encodings,encodings.*',
+        'includes': 'pango,atk,gobject,cairo,pangocairo,gtk.keysyms,encodings,encodings.*',
         'dll_excludes': [
             'iconv.dll','intl.dll','libatk-1.0-0.dll',
@@ -31 +31 @@
             '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'
+            'libpangowin32-1.0-0.dll','libcairo-2.dll',
+            'libpangocairo-1.0-0.dll','libpangoft2-1.0-0.dll',
         ],
     }

branches/gajim_0.11/src/gtkgui_helpers.py

@@ -356 +356 @@
         except gobject.GError: # 'unknown image format'
                 pixbuf = None
+                if want_type:
+                        return None, None
+                else:
+                        return None
 
         if want_type: