Changeset 8993

Timestamp:

11/17/07 00:11:35 (13 months ago)

Author:

baron

Message:

Adjusted the menu code in an attempt to make it work better on leopard. Removed
the idle_add wrapper for on_quit and moved the idle_add wrapping into the
sync-menu code instead.

Location:

trunk

Files:

• data/nibs/Gajim.nib/info.nib (modified) (1 diff)
• data/nibs/Gajim.nib/keyedobjects.nib (modified) (previous)
• launch.sh (modified) (1 diff)
• src/gajim.py (modified) (1 diff)
• src/osx/syncmenu/Makefile.am (modified) (1 diff)
• src/osx/syncmenu/sync-menu.c (modified) (2 diffs)
• src/roster_window.py (modified) (4 diffs)
• TODO.osx (modified) (1 diff)

trunk/data/nibs/Gajim.nib/info.nib

@@ -4 +4 @@
 <dict>
         <key>IBDocumentLocation</key>
-        <string>69 10 356 240 0 0 1280 832 </string>
+        <string>82 255 356 240 0 0 1280 832 </string>
         <key>IBEditorPositions</key>
         <dict>
                 <key>29</key>
-                <string>245 312 185 44 0 0 1280 832 </string>
+                <string>476 296 342 44 0 0 1280 832 </string>
         </dict>
         <key>IBFramework Version</key>
         <string>446.1</string>
+        <key>IBOldestOS</key>
+        <integer>4</integer>
         <key>IBOpenObjects</key>
         <array>
+                <integer>289</integer>
                 <integer>29</integer>
         </array>
         <key>IBSystem Version</key>
-        <string>8R218</string>
+        <string>8S165</string>
 </dict>
 </plist>

trunk/launch.sh

@@ -5 +5 @@
 if [ "x${OS}" == "xDarwin" ]; then
     export RESOURCEPATH="${BASE}/dist/Gajim.app/Contents/Resources"
+    GTK_DIR="/Library/Frameworks/GTK+.framework/Versions/Current"
+    export PATH="${GTK_DIR}/bin:$PATH"
+    export PYTHONPATH="${GTK_DIR}/lib/python2.5/site-packages:${GTK_DIR}/lib/python2.5/site-packages/gtk-2.0:${PYTHONPATH}"
+    unset GTK_DIR
 fi
 

trunk/src/gajim.py

@@ -298 +298 @@
         elif sys.platform == 'darwin':
                 from osx import checkPID
-                return checkPID(pid, 'gajim')
+                return checkPID(pid, 'Gajim.bin')
         try:
                 if not os.path.exists('/proc'):

trunk/src/osx/syncmenu/Makefile.am

@@ -11 +11 @@
 syncmenulibdir = $(libdir)/gajim
 syncmenu_la_SOURCES = sync-menu.c pysyncmenu.c
-syncmenu_la_LDFLAGS = -module -avoid-version $(GTKLDFLAGS)
-syncmenu_la_CFLAGS = $(GTKCFLAGS) -Wall -g $(INCLUDES)
+syncmenu_la_LDFLAGS = -module -avoid-version -Xcompiler -isysroot -Xcompiler /Developer/SDKs/MacOSX10.4u.sdk -Xcompiler -arch -Xcompiler ppc -Xcompiler -arch -Xcompiler i386 $(GTKLDFLAGS)
+syncmenu_la_CFLAGS = -Xcompiler -isysroot -Xcompiler /Developer/SDKs/MacOSX10.4u.sdk -Xcompiler -arch -Xcompiler ppc -Xcompiler -arch -Xcompiler i386 $(GTKCFLAGS) -Wall -g $(INCLUDES)
 endif
 

trunk/src/osx/syncmenu/sync-menu.c

@@ -478 +478 @@
 }
 
-
 /*
  * carbon event handler
  */
+
+gboolean menuitem_activate_wrapper(gpointer data)
+{
+    gtk_menu_item_activate((GtkMenuItem*)data);
+    return FALSE;
+}
 
 static OSStatus
@@ -527 +532 @@
               if (err == noErr && widget)
                 {
-                  gtk_menu_item_activate (GTK_MENU_ITEM (widget));
+            g_idle_add(menuitem_activate_wrapper,
+                       (gpointer)GTK_MENU_ITEM (widget));
                   return noErr;
                 }

trunk/src/roster_window.py

@@ -4192 +4192 @@
 
         def on_quit_menuitem_activate(self, widget):
-                gobject.idle_add(self.on_quit_menuitem_activate_real, widget)
-
-        def on_quit_menuitem_activate_real(self, widget):
                 accounts = gajim.connections.keys()
                 get_msg = False
@@ -5188 +5185 @@
                 # Massage the GTK menu so it will match up to the OS/X nib style menu
                 # when passed to sync-menu and merged
-                main_menu = self.xml.get_widget('menubar')
-                app_item = gtk.MenuItem('Gajim')
+                main_menu = self.xml.get_widget("menubar")
+                app_item = gtk.MenuItem("Gajim")
                 main_menu.insert(app_item, 0)
-                win_item = gtk.MenuItem('Window')
+                win_item = gtk.MenuItem("Window")
                 main_menu.insert(win_item, 4)
-                actions_menu = self.xml.get_widget('actions_menu_menu')
-                quit_item = self.xml.get_widget('quit_menuitem')
+                actions_menu = self.xml.get_widget("actions_menu_menu")
+                quit_item = self.xml.get_widget("quit_menuitem")
                 actions_menu.remove(quit_item)
-                actions_menu.remove(self.xml.get_widget('separator1'))
-                edit_menu = self.xml.get_widget('edit_menu_menu')
-                edit_menu.remove(self.xml.get_widget('preferences_menuitem'))
-                edit_menu.remove(self.xml.get_widget('separator2'))
-                help_menu = self.xml.get_widget('help_menu_menu')
-                about_item = self.xml.get_widget('about_menuitem')
+                actions_menu.remove(self.xml.get_widget("separator1"))
+                edit_menu = self.xml.get_widget("edit_menu_menu")
+                #edit_menu.remove(self.xml.get_widget("preferences_menuitem"))
+                edit_menu.remove(self.xml.get_widget("separator2"))
+                help_menu = self.xml.get_widget("help_menu_menu")
+                about_item = self.xml.get_widget("about_menuitem")
                 help_menu.remove(about_item)
                 # Build up App menu
@@ -5207 +5204 @@
                 app_item.set_submenu(app_menu)
                 app_menu.append(about_item)
-                app_menu.append(gtk.MenuItem('__SKIP__'))
-                prefs_item = gtk.MenuItem('Preferences...')
+                app_menu.append(gtk.MenuItem("__SKIP__"))
+                prefs_item = gtk.MenuItem("Preferences...")
                 prefs_item.connect("activate", self.on_preferences_menuitem_activate)
                 accels = gtk.AccelGroup()
-                self.xml.get_widget('roster_window').add_accel_group(accels)
-                prefs_item.add_accelerator('activate', accels, ord(','),
+                self.xml.get_widget("roster_window").add_accel_group(accels)
+                prefs_item.add_accelerator("activate", accels, ord(','),
                                                                    gtk.gdk.CONTROL_MASK, gtk.ACCEL_VISIBLE)
                 app_menu.append(prefs_item)
-                app_menu.append(gtk.MenuItem('__SKIP__'))
-                app_menu.append(gtk.MenuItem('__SKIP__'))
-                app_menu.append(gtk.MenuItem('__SKIP__'))
-                app_menu.append(gtk.MenuItem('__SKIP__'))
-                app_menu.append(gtk.MenuItem('__SKIP__'))
-                app_menu.append(gtk.MenuItem('__SKIP__'))
-                app_menu.append(gtk.MenuItem('__SKIP__'))
+                app_menu.append(gtk.MenuItem("__SKIP__"))
+                app_menu.append(gtk.MenuItem("__SKIP__"))
+                app_menu.append(gtk.MenuItem("__SKIP__"))
+                app_menu.append(gtk.MenuItem("__SKIP__"))
+                app_menu.append(gtk.MenuItem("__SKIP__"))
+                app_menu.append(gtk.MenuItem("__SKIP__"))
+                app_menu.append(gtk.MenuItem("__SKIP__"))
                 app_menu.append(quit_item)
                 app_menu.show_all()
@@ -5228 +5225 @@
                 self.make_menu(force = True)
                 # Hide the GTK menubar itself and let the OS/X menubar do its thing
-                self.xml.get_widget('menubar').hide()
+                #self.xml.get_widget("menubar").hide()
                 return
 

trunk/TODO.osx

@@ -24 +24 @@
 -integrate the Gajim and gajim-remote scripts with autoconf and add GTK
  framework detection
--Pass icons to OS/X menu
--set the LSEnvironment in Info.plist for gtk paths instead of hard coding in
- gajim.py
--Maybe setup the pasteboard  services for an OS/X alternative to the
+-Maybe setup the pasteboard services for an OS/X alternative to the
  gajim_remote
 -CFBundleDocumentTypes.NSDocument
+-zeroconf has a parsing problem with the MDNS result.