Commits September 2008

commits@gajim.org

4 participants
83 discussions

[commit-gajim] r10454 - branches/osx_newbuildsys/src
by js＠gajim.org 30 Sep '08

30 Sep '08

Author: js Date: 2008-09-30 18:11:28 +0200 (Tue, 30 Sep 2008) New Revision: 10454 Modified: branches/osx_newbuildsys/src/gajim-remote.py Log: gajim-remote works on OS X now. We just need a startscript to set up the env for DBus if missing. Modified: branches/osx_newbuildsys/src/gajim-remote.py =================================================================== --- branches/osx_newbuildsys/src/gajim-remote.py 2008-09-30 16:08:51 UTC (rev 10453) +++ branches/osx_newbuildsys/src/gajim-remote.py 2008-09-30 16:11:28 UTC (rev 10454) @@ -47,9 +47,6 @@ sys.exit(1) try: - if sys.platform == 'darwin': - import osx.dbus - osx.dbus.load(False) import dbus import dbus.service import dbus.glib

1 0

[commit-gajim] r10453 - in branches/osx_newbuildsys/src: common osx osx/syncmenu osx/syncmenu/syncmenu_c
by js＠gajim.org 30 Sep '08

30 Sep '08

Author: js Date: 2008-09-30 18:08:51 +0200 (Tue, 30 Sep 2008) New Revision: 10453 Added: branches/osx_newbuildsys/src/osx/syncmenu/syncmenu_c/ branches/osx_newbuildsys/src/osx/syncmenu/syncmenu_c/syncmenu.c branches/osx_newbuildsys/src/osx/syncmenu/syncmenu_c/syncmenu.h Removed: branches/osx_newbuildsys/src/osx/dbus.py branches/osx_newbuildsys/src/osx/syncmenu/syncmenu/ branches/osx_newbuildsys/src/osx/syncmenu/syncmenu_c/sync-menu.c branches/osx_newbuildsys/src/osx/syncmenu/syncmenu_c/sync-menu.h Modified: branches/osx_newbuildsys/src/common/dbus_support.py branches/osx_newbuildsys/src/osx/__init__.py branches/osx_newbuildsys/src/osx/syncmenu/Makefile branches/osx_newbuildsys/src/osx/syncmenu/syncmenu_c/Makefile branches/osx_newbuildsys/src/osx/syncmenu/syncmenu_c/pysyncmenu.c Log: Fix a warning in syncmenu & get rid of OS X dbus. DBus stuff introduces a new warning, need to fix that. Modified: branches/osx_newbuildsys/src/common/dbus_support.py =================================================================== --- branches/osx_newbuildsys/src/common/dbus_support.py 2008-09-30 15:57:50 UTC (rev 10452) +++ branches/osx_newbuildsys/src/common/dbus_support.py 2008-09-30 16:08:51 UTC (rev 10453) @@ -32,12 +32,6 @@ _GAJIM_ERROR_IFACE = 'org.gajim.dbus.Error' try: - if sys.platform == 'darwin': - try: - import osx.dbus - osx.dbus.load(True) - except ImportError: - pass import dbus import dbus.service import dbus.glib Modified: branches/osx_newbuildsys/src/osx/__init__.py =================================================================== --- branches/osx_newbuildsys/src/osx/__init__.py 2008-09-30 15:57:50 UTC (rev 10452) +++ branches/osx_newbuildsys/src/osx/__init__.py 2008-09-30 16:08:51 UTC (rev 10453) @@ -27,8 +27,6 @@ def shutdown(): - import dbus - dbus.shutdown() return @@ -42,4 +40,4 @@ device_now_active(None) return -# vim: se ts=3: \ No newline at end of file +# vim: se ts=3: Deleted: branches/osx_newbuildsys/src/osx/dbus.py =================================================================== --- branches/osx_newbuildsys/src/osx/dbus.py 2008-09-30 15:57:50 UTC (rev 10452) +++ branches/osx_newbuildsys/src/osx/dbus.py 2008-09-30 16:08:51 UTC (rev 10453) @@ -1,133 +0,0 @@ -### -### Internal dbus management. This can go away once native gtk+ is in fink or -### macports and we can require their dbus. -### - - - -import os, sys, commands, signal - -if sys.platform != "darwin": - raise ImportError("System platform is not OS/X") - -import osx, osx.nsapp -from common.configpaths import gajimpaths - - -_GTK_BASE = "/Library/Frameworks/GTK+.framework/Versions/Current" - - -def readEnv(): - gajimpaths.add_from_root(u'dbus.env', u'dbus.env') - try: - dbus_env = file(gajimpaths[u'dbus.env'], "r") - except: - return False - try: - line1 = dbus_env.readline() - line2 = dbus_env.readline() - dbus_env.close() - except: - print "Invalid dbus.env file" - return False - return parseEnv(line1, line2) - - -def parseEnv(line1, line2): - try: - if not line1 or not line2: - return False - if (not line1.startswith("DBUS_SESSION_BUS_ADDRESS=") or - not line2.startswith("DBUS_SESSION_BUS_PID=")): - return False - arr = line2.split("=") - pid = arr[1].strip().strip('"') - if not osx.checkPID(int(pid), "dbus-daemon"): - return False - line1 = line1.strip() - loc = line1.find("=") - address = line1[loc + 1:] - address = address.strip().strip('"') - return [address, pid] - except Exception, e: - print "Invalid dbus.env file", e - return False - return None - - -def setEnv(env): - os.environ['DBUS_SESSION_BUS_ADDRESS'] = env[0] - os.environ['DBUS_SESSION_BUS_PID'] = env[1] - return - - -def writeEnv(env): - gajimpaths.add_from_root(u'dbus.env', u'dbus.env') - try: - dbus_env = file(gajimpaths[u'dbus.env'], "w+") - dbus_env.write("DBUS_SESSION_BUS_ADDRESS=\"" + env[0] + "\"\n") - dbus_env.write("DBUS_SESSION_BUS_PID=\"" + env[1] + "\"\n") - dbus_env.close() - except Exception, e: - print "Failed to write file: %s" % gajimpaths[u'dbus.env'] - print str(e) - return - - -def checkUUID(): - if os.path.exists(_GTK_BASE + "/var/lib/dbus/machine-id"): - return - ret = commands.getstatusoutput(_GTK_BASE + "/bin/dbus-uuidgen --ensure") - if ret[0] != 0: - print "Failed to initialize dbus machine UUID:", ret[1] - return - - -def load(start): - # Look for existing external session and just use it if it exists - if (('DBUS_SESSION_BUS_ADDRESS' in os.environ) and - ('DBUS_SESSION_BUS_PID' in os.environ) and - osx.checkPID(int(os.environ['DBUS_SESSION_BUS_PID']), 'dbus-daemon')): - return True - - # Look for our own internal session - env = readEnv() - if env: - # We have a valid existing dbus session, yay - setEnv(env) - return True - - # Initialize the machine's UUID if not done yet - checkUUID() - - if start: - # None found, start a new session - print "Starting new dbus session" - #cmd = os.path.join(osx.nsapp.getBundlePath(), - # "Contents/Resources/bin/dbus-launch --exit-with-session") - cmd = _GTK_BASE + "/bin/dbus-launch --exit-with-session" - ret = commands.getstatusoutput(cmd) - arr = ret[1].split("\n") - if len(arr) != 2: - print "Failed to start internal dbus session:" - print ret[1] - return - env = parseEnv(arr[0].strip(), arr[1].strip()) - if not env: - print "Failed to start internal dbus session:" - print ret[1] - return - setEnv(env) - writeEnv(env) - return True - return False - - -def shutdown(): - env = readEnv() - if not env: - return - os.kill(int(env[1]), signal.SIGINT) - return - -# vim: se ts=3: \ No newline at end of file Modified: branches/osx_newbuildsys/src/osx/syncmenu/Makefile =================================================================== --- branches/osx_newbuildsys/src/osx/syncmenu/Makefile 2008-09-30 15:57:50 UTC (rev 10452) +++ branches/osx_newbuildsys/src/osx/syncmenu/Makefile 2008-09-30 16:08:51 UTC (rev 10453) @@ -1,6 +1,4 @@ -SUBDIRS = syncmenu - -SRCS = test-menu.py +SUBDIRS = syncmenu_c DISTCLEAN = syncmenu.so include ../../../buildsys.mk @@ -13,4 +11,4 @@ # Don't depend on the actual file, we can create the symlink anyway syncmenu.so: rm -f syncmenu.so - ln -s syncmenu/syncmenu.so syncmenu.so + ln -s syncmenu_c/syncmenu.so syncmenu.so Property changes on: branches/osx_newbuildsys/src/osx/syncmenu/syncmenu_c ___________________________________________________________________ Added: svn:mergeinfo + Modified: branches/osx_newbuildsys/src/osx/syncmenu/syncmenu_c/Makefile =================================================================== --- branches/osx_newbuildsys/src/osx/syncmenu/syncmenu/Makefile 2008-09-29 11:11:49 UTC (rev 10446) +++ branches/osx_newbuildsys/src/osx/syncmenu/syncmenu_c/Makefile 2008-09-30 16:08:51 UTC (rev 10453) @@ -1,7 +1,7 @@ # Python calls these .so, even on OS X, which is very wrong. It should be .impl! PLUGIN = syncmenu.so SRCS = pysyncmenu.c \ - sync-menu.c + syncmenu.c include ../../../../buildsys.mk include ../../../../extra.mk Modified: branches/osx_newbuildsys/src/osx/syncmenu/syncmenu_c/pysyncmenu.c =================================================================== --- branches/osx_newbuildsys/src/osx/syncmenu/syncmenu/pysyncmenu.c 2008-09-29 11:11:49 UTC (rev 10446) +++ branches/osx_newbuildsys/src/osx/syncmenu/syncmenu_c/pysyncmenu.c 2008-09-30 16:08:51 UTC (rev 10453) @@ -1,5 +1,5 @@ /* -## src/osx/syncmenu/pysyncmenu.c +## src/osx/syncmenu/syncmenu_c/pysyncmenu.c ## ## Copyright (C) 2007 Yann Leboulanger <asterix AT lagaule.org> ## @@ -23,7 +23,7 @@ #include <string.h> #include <Python.h> #include <pygobject.h> -#include "sync-menu.h" +#include "syncmenu.h" PyDoc_STRVAR(pysync_menu_takeover_menu__doc__, Deleted: branches/osx_newbuildsys/src/osx/syncmenu/syncmenu_c/sync-menu.c =================================================================== --- branches/osx_newbuildsys/src/osx/syncmenu/syncmenu/sync-menu.c 2008-09-29 11:11:49 UTC (rev 10446) +++ branches/osx_newbuildsys/src/osx/syncmenu/syncmenu_c/sync-menu.c 2008-09-30 16:08:51 UTC (rev 10453) @@ -1,728 +0,0 @@ -/* GTK+ Integration for the Mac OS X Menubar. - * - * Copyright (C) 2007 Pioneer Research Center USA, Inc. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library 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 - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. - */ - -#include <gtk/gtk.h> -#include <gdk/gdkkeysyms.h> - -#include <Carbon/Carbon.h> - -#include "sync-menu.h" - - -/* TODO - * - * - Setup shortcuts, possibly transforming ctrl->cmd - * - Sync menus - * - Create on demand? (can this be done with gtk+? ie fill in menu items when the menu is opened) - * - Figure out what to do per app/window... - * - Toggle/radio items - * - */ - -#define GTK_QUARTZ_MENU_CREATOR 'GTKC' -#define GTK_QUARTZ_ITEM_WIDGET 'GWID' - - -static void sync_menu_shell (GtkMenuShell *menu_shell, - MenuRef carbon_menu, - gboolean toplevel); - - -/* - * utility functions - */ - -static GtkWidget * -find_menu_label (GtkWidget *widget) -{ - GtkWidget *label = NULL; - - if (GTK_IS_LABEL (widget)) - return widget; - - if (GTK_IS_CONTAINER (widget)) - { - GList *children; - GList *l; - - children = gtk_container_get_children (GTK_CONTAINER (widget)); - - for (l = children; l; l = l->next) - { - label = find_menu_label (l->data); - if (label) - break; - } - - g_list_free (children); - } - - return label; -} - -static const gchar * -get_menu_label_text (GtkWidget *menu_item, - GtkWidget **label) -{ - *label = find_menu_label (menu_item); - if (!*label) - return NULL; - - return gtk_label_get_text (GTK_LABEL (*label)); -} - -static gboolean -accel_find_func (GtkAccelKey *key, - GClosure *closure, - gpointer data) -{ - return (GClosure *) data == closure; -} - - -/* - * CarbonMenu functions - */ - -typedef struct -{ - MenuRef menu; -} CarbonMenu; - -static GQuark carbon_menu_quark = 0; - -static CarbonMenu * -carbon_menu_new (void) -{ - return g_slice_new0 (CarbonMenu); -} - -static void -carbon_menu_free (CarbonMenu *menu) -{ - g_slice_free (CarbonMenu, menu); -} - -static CarbonMenu * -carbon_menu_get (GtkWidget *widget) -{ - return g_object_get_qdata (G_OBJECT (widget), carbon_menu_quark); -} - -static void -carbon_menu_connect (GtkWidget *menu, - MenuRef menuRef) -{ - CarbonMenu *carbon_menu = carbon_menu_get (menu); - - if (!carbon_menu) - { - carbon_menu = carbon_menu_new (); - - g_object_set_qdata_full (G_OBJECT (menu), carbon_menu_quark, - carbon_menu, - (GDestroyNotify) carbon_menu_free); - } - - carbon_menu->menu = menuRef; -} - - -/* - * CarbonMenuItem functions - */ - -typedef struct -{ - MenuRef menu; - MenuItemIndex index; - MenuRef submenu; - GClosure *accel_closure; -} CarbonMenuItem; - -static GQuark carbon_menu_item_quark = 0; - -static CarbonMenuItem * -carbon_menu_item_new (void) -{ - return g_slice_new0 (CarbonMenuItem); -} - -static void -carbon_menu_item_free (CarbonMenuItem *menu_item) -{ - if (menu_item->accel_closure) - g_closure_unref (menu_item->accel_closure); - - g_slice_free (CarbonMenuItem, menu_item); -} - -static CarbonMenuItem * -carbon_menu_item_get (GtkWidget *widget) -{ - return g_object_get_qdata (G_OBJECT (widget), carbon_menu_item_quark); -} - -static void -carbon_menu_item_update_state (CarbonMenuItem *carbon_item, - GtkWidget *widget) -{ - gboolean sensitive; - gboolean visible; - UInt32 set_attrs = 0; - UInt32 clear_attrs = 0; - - g_object_get (widget, - "sensitive", &sensitive, - "visible", &visible, - NULL); - - if (!sensitive) - set_attrs |= kMenuItemAttrDisabled; - else - clear_attrs |= kMenuItemAttrDisabled; - - if (!visible) - set_attrs |= kMenuItemAttrHidden; - else - clear_attrs |= kMenuItemAttrHidden; - - ChangeMenuItemAttributes (carbon_item->menu, carbon_item->index, - set_attrs, clear_attrs); -} - -static void -carbon_menu_item_update_active (CarbonMenuItem *carbon_item, - GtkWidget *widget) -{ - gboolean active; - - g_object_get (widget, - "active", &active, - NULL); - - CheckMenuItem (carbon_item->menu, carbon_item->index, - active); -} - -static void -carbon_menu_item_update_submenu (CarbonMenuItem *carbon_item, - GtkWidget *widget) -{ - GtkWidget *submenu; - - submenu = gtk_menu_item_get_submenu (GTK_MENU_ITEM (widget)); - - if (submenu) - { - GtkWidget *label = NULL; - - carbon_item->submenu = NULL; - GetMenuItemHierarchicalMenu(carbon_item->menu, carbon_item->index, - &carbon_item->submenu); - if (!carbon_item->submenu) - { - const gchar *label_text; - CFStringRef cfstr = NULL; - - label_text = get_menu_label_text (widget, &label); - if (label_text) - cfstr = CFStringCreateWithCString (NULL, label_text, - kCFStringEncodingUTF8); - CreateNewMenu (0, 0, &carbon_item->submenu); - SetMenuTitleWithCFString (carbon_item->submenu, cfstr); - SetMenuItemHierarchicalMenu (carbon_item->menu, carbon_item->index, - carbon_item->submenu); - if (cfstr) - CFRelease (cfstr); - } - - sync_menu_shell (GTK_MENU_SHELL (submenu), carbon_item->submenu, FALSE); - } - else - { - SetMenuItemHierarchicalMenu (carbon_item->menu, carbon_item->index, - NULL); - carbon_item->submenu = NULL; - } -} - -static void -carbon_menu_item_update_label (CarbonMenuItem *carbon_item, - GtkWidget *widget) -{ - GtkWidget *label; - const gchar *label_text; - CFStringRef cfstr = NULL; - - label_text = get_menu_label_text (widget, &label); - if (label_text) - cfstr = CFStringCreateWithCString (NULL, label_text, - kCFStringEncodingUTF8); - - SetMenuItemTextWithCFString (carbon_item->menu, carbon_item->index, - cfstr); - - if (cfstr) - CFRelease (cfstr); -} - -static void -carbon_menu_item_update_accelerator (CarbonMenuItem *carbon_item, - GtkWidget *widget) -{ - GtkWidget *label; - - get_menu_label_text (widget, &label); - - if (GTK_IS_ACCEL_LABEL (label) && - GTK_ACCEL_LABEL (label)->accel_closure) - { - GtkAccelKey *key; - - key = gtk_accel_group_find (GTK_ACCEL_LABEL (label)->accel_group, - accel_find_func, - GTK_ACCEL_LABEL (label)->accel_closure); - - if (key && - key->accel_key && - key->accel_flags & GTK_ACCEL_VISIBLE) - { - GdkDisplay *display = gtk_widget_get_display (widget); - GdkKeymap *keymap = gdk_keymap_get_for_display (display); - GdkKeymapKey *keys; - gint n_keys; - - if (gdk_keymap_get_entries_for_keyval (keymap, key->accel_key, - &keys, &n_keys)) - { - UInt8 modifiers = 0; - - SetMenuItemCommandKey (carbon_item->menu, carbon_item->index, - true, keys[0].keycode); - - g_free (keys); - - if (key->accel_mods) - { - if (key->accel_mods & GDK_SHIFT_MASK) - modifiers |= kMenuShiftModifier; - - if (key->accel_mods & GDK_MOD1_MASK) - modifiers |= kMenuOptionModifier; - } - - if (!(key->accel_mods & GDK_CONTROL_MASK)) - { - modifiers |= kMenuNoCommandModifier; - } - - SetMenuItemModifiers (carbon_item->menu, carbon_item->index, - modifiers); - - return; - } - } - } - - /* otherwise, clear the menu shortcut */ - SetMenuItemModifiers (carbon_item->menu, carbon_item->index, - kMenuNoModifiers | kMenuNoCommandModifier); - ChangeMenuItemAttributes (carbon_item->menu, carbon_item->index, - 0, kMenuItemAttrUseVirtualKey); - SetMenuItemCommandKey (carbon_item->menu, carbon_item->index, - false, 0); -} - -static void -carbon_menu_item_accel_changed (GtkAccelGroup *accel_group, - guint keyval, - GdkModifierType modifier, - GClosure *accel_closure, - GtkWidget *widget) -{ - CarbonMenuItem *carbon_item = carbon_menu_item_get (widget); - GtkWidget *label; - - get_menu_label_text (widget, &label); - - if (GTK_IS_ACCEL_LABEL (label) && - GTK_ACCEL_LABEL (label)->accel_closure == accel_closure) - carbon_menu_item_update_accelerator (carbon_item, widget); -} - -static void -carbon_menu_item_update_accel_closure (CarbonMenuItem *carbon_item, - GtkWidget *widget) -{ - GtkAccelGroup *group; - GtkWidget *label; - - get_menu_label_text (widget, &label); - - if (carbon_item->accel_closure) - { - group = gtk_accel_group_from_accel_closure (carbon_item->accel_closure); - if (group) - g_signal_handlers_disconnect_by_func (group, - carbon_menu_item_accel_changed, - widget); - - g_closure_unref (carbon_item->accel_closure); - carbon_item->accel_closure = NULL; - } - - if (GTK_IS_ACCEL_LABEL (label)) - carbon_item->accel_closure = GTK_ACCEL_LABEL (label)->accel_closure; - - if (carbon_item->accel_closure) - { - g_closure_ref (carbon_item->accel_closure); - - group = gtk_accel_group_from_accel_closure (carbon_item->accel_closure); - - g_signal_connect_object (group, "accel-changed", - G_CALLBACK (carbon_menu_item_accel_changed), - widget, 0); - } - - carbon_menu_item_update_accelerator (carbon_item, widget); -} - -static void -carbon_menu_item_notify (GObject *object, - GParamSpec *pspec, - CarbonMenuItem *carbon_item) -{ - if (!strcmp (pspec->name, "sensitive") || - !strcmp (pspec->name, "visible")) - { - carbon_menu_item_update_state (carbon_item, GTK_WIDGET (object)); - } - else if (!strcmp (pspec->name, "active")) - { - carbon_menu_item_update_active (carbon_item, GTK_WIDGET (object)); - } - else if (!strcmp (pspec->name, "submenu")) - { - carbon_menu_item_update_submenu (carbon_item, GTK_WIDGET (object)); - } -} - -static void -carbon_menu_item_notify_label (GObject *object, - GParamSpec *pspec, - gpointer data) -{ - CarbonMenuItem *carbon_item = carbon_menu_item_get (GTK_WIDGET (object)); - - if (!strcmp (pspec->name, "label")) - { - carbon_menu_item_update_label (carbon_item, - GTK_WIDGET (object)); - } - else if (!strcmp (pspec->name, "accel-closure")) - { - carbon_menu_item_update_accel_closure (carbon_item, - GTK_WIDGET (object)); - } -} - -static CarbonMenuItem * -carbon_menu_item_connect (GtkWidget *menu_item, - GtkWidget *label, - MenuRef menu, - MenuItemIndex index) -{ - CarbonMenuItem *carbon_item = carbon_menu_item_get (menu_item); - - if (!carbon_item) - { - carbon_item = carbon_menu_item_new (); - - g_object_set_qdata_full (G_OBJECT (menu_item), carbon_menu_item_quark, - carbon_item, - (GDestroyNotify) carbon_menu_item_free); - - g_signal_connect (menu_item, "notify", - G_CALLBACK (carbon_menu_item_notify), - carbon_item); - - if (label) - g_signal_connect_swapped (label, "notify::label", - G_CALLBACK (carbon_menu_item_notify_label), - menu_item); - } - - carbon_item->menu = menu; - carbon_item->index = index; - - return carbon_item; -} - -/* - * carbon event handler - */ - -gboolean menuitem_activate_wrapper(gpointer data) -{ - gtk_menu_item_activate((GtkMenuItem*)data); - return FALSE; -} - -static OSStatus -menu_event_handler_func (EventHandlerCallRef event_handler_call_ref, - EventRef event_ref, - void *data) -{ - UInt32 event_class = GetEventClass (event_ref); - UInt32 event_kind = GetEventKind (event_ref); - MenuRef menu_ref; - - switch (event_class) - { - case kEventClassCommand: - /* This is called when activating (is that the right GTK+ term?) - * a menu item. - */ - if (event_kind == kEventCommandProcess) - { - HICommand command; - OSStatus err; - - //g_print ("Menu: kEventClassCommand/kEventCommandProcess\n"); - - err = GetEventParameter (event_ref, kEventParamDirectObject, - typeHICommand, 0, - sizeof (command), 0, &command); - - if (err == noErr) - { - GtkWidget *widget = NULL; - - if (command.commandID == kHICommandQuit) - { - gtk_main_quit (); /* Just testing... */ - return noErr; - } - - /* Get any GtkWidget associated with the item. */ - err = GetMenuItemProperty (command.menu.menuRef, - command.menu.menuItemIndex, - GTK_QUARTZ_MENU_CREATOR, - GTK_QUARTZ_ITEM_WIDGET, - sizeof (widget), 0, &widget); - if (err == noErr && widget) - { - g_idle_add(menuitem_activate_wrapper, - (gpointer)GTK_MENU_ITEM (widget)); - return noErr; - } - } - } - break; - - case kEventClassMenu: - GetEventParameter (event_ref, - kEventParamDirectObject, - typeMenuRef, - NULL, - sizeof (menu_ref), - NULL, - &menu_ref); - - switch (event_kind) - { - case kEventMenuTargetItem: - /* This is called when an item is selected (what is the - * GTK+ term? prelight?) - */ - //g_print ("kEventClassMenu/kEventMenuTargetItem\n"); - break; - - case kEventMenuOpening: - /* Is it possible to dynamically build the menu here? We - * can at least set visibility/sensitivity. - */ - //g_print ("kEventClassMenu/kEventMenuOpening\n"); - break; - - case kEventMenuClosed: - //g_print ("kEventClassMenu/kEventMenuClosed\n"); - break; - - default: - break; - } - - break; - - default: - break; - } - - return CallNextEventHandler (event_handler_call_ref, event_ref); -} - -static void -setup_menu_event_handler (void) -{ - EventHandlerUPP menu_event_handler_upp; - EventHandlerRef menu_event_handler_ref; - const EventTypeSpec menu_events[] = { - { kEventClassCommand, kEventCommandProcess }, - { kEventClassMenu, kEventMenuTargetItem }, - { kEventClassMenu, kEventMenuOpening }, - { kEventClassMenu, kEventMenuClosed } - }; - - /* FIXME: We might have to install one per window? */ - - menu_event_handler_upp = NewEventHandlerUPP (menu_event_handler_func); - InstallEventHandler (GetApplicationEventTarget (), menu_event_handler_upp, - GetEventTypeCount (menu_events), menu_events, 0, - &menu_event_handler_ref); - -#if 0 - /* FIXME: Remove the handler with: */ - RemoveEventHandler(menu_event_handler_ref); - DisposeEventHandlerUPP(menu_event_handler_upp); -#endif -} - -static void -sync_menu_shell (GtkMenuShell *menu_shell, - MenuRef carbon_menu, - gboolean toplevel) -{ - GList *children; - GList *l; - MenuItemIndex carbon_index = 1; - - carbon_menu_connect (GTK_WIDGET (menu_shell), carbon_menu); - - children = gtk_container_get_children (GTK_CONTAINER (menu_shell)); - - UInt16 carbon_item_count = CountMenuItems(carbon_menu); - - for (l = children; l; l = l->next) - { - GtkWidget *menu_item = l->data; - CarbonMenuItem *carbon_item; - - if (GTK_IS_TEAROFF_MENU_ITEM (menu_item)) - continue; - - if (toplevel && g_object_get_data (G_OBJECT (menu_item), - "gtk-empty-menu-item")) - continue; - - GtkWidget *label = NULL; - const gchar *label_text = NULL; - - label_text = get_menu_label_text (menu_item, &label); - if (label_text && strcmp(label_text, "_SKIP_") == 0) - { - carbon_index++; - continue; - } - else if (!label_text) - label_text = ""; - - MenuItemAttributes attributes = 0; - if (GTK_IS_SEPARATOR_MENU_ITEM (menu_item)) - attributes |= kMenuItemAttrSeparator; - if (!GTK_WIDGET_IS_SENSITIVE (menu_item)) - attributes |= kMenuItemAttrDisabled; - if (!GTK_WIDGET_VISIBLE (menu_item)) - attributes |= kMenuItemAttrHidden; - - CFStringRef cfstr = CFStringCreateWithCString (NULL, label_text, - kCFStringEncodingUTF8); - if (carbon_index > carbon_item_count) - AppendMenuItemTextWithCFString(carbon_menu, cfstr, attributes, 0, - NULL); - else if (!toplevel && (carbon_index > carbon_item_count)) - InsertMenuItemTextWithCFString (carbon_menu, cfstr, - carbon_index, attributes, 0); - else - SetMenuItemTextWithCFString(carbon_menu, carbon_index, cfstr); - CFRelease (cfstr); - - MenuItemAttributes c_attributes = kMenuItemAttrSectionHeader | - kMenuItemAttrAutoDisable; - if (!(attributes & kMenuItemAttrDisabled)) - c_attributes |= kMenuItemAttrDisabled; - if (!(attributes & kMenuItemAttrSeparator)) - c_attributes |= kMenuItemAttrSeparator; - if (!(attributes & kMenuItemAttrHidden)) - c_attributes |= kMenuItemAttrHidden; - ChangeMenuItemAttributes(carbon_menu, carbon_index, - attributes, c_attributes); - SetMenuItemProperty (carbon_menu, carbon_index, - GTK_QUARTZ_MENU_CREATOR, - GTK_QUARTZ_ITEM_WIDGET, - sizeof (menu_item), &menu_item); - - carbon_item = carbon_menu_item_connect (menu_item, label, - carbon_menu, - carbon_index); - - if (GTK_IS_CHECK_MENU_ITEM (menu_item)) - carbon_menu_item_update_active (carbon_item, menu_item); - - carbon_menu_item_update_accel_closure (carbon_item, menu_item); - - if (gtk_menu_item_get_submenu (GTK_MENU_ITEM (menu_item))) - carbon_menu_item_update_submenu (carbon_item, menu_item); - - carbon_index++; - } - - while (carbon_index <= carbon_item_count) - { - DeleteMenuItem (carbon_menu, carbon_index); - carbon_index++; - } - - g_list_free (children); -} - -void -sync_menu_takeover_menu (GtkMenuShell *menu_shell) -{ - static MenuRef carbon_menubar = NULL; - - g_return_if_fail (GTK_IS_MENU_SHELL (menu_shell)); - - if (carbon_menu_quark == 0) - carbon_menu_quark = g_quark_from_static_string ("CarbonMenu"); - - if (carbon_menu_item_quark == 0) - carbon_menu_item_quark = g_quark_from_static_string ("CarbonMenuItem"); - - if (!carbon_menubar) - { - carbon_menubar = AcquireRootMenu(); - setup_menu_event_handler (); - } - - sync_menu_shell (menu_shell, carbon_menubar, TRUE); -} Deleted: branches/osx_newbuildsys/src/osx/syncmenu/syncmenu_c/sync-menu.h =================================================================== --- branches/osx_newbuildsys/src/osx/syncmenu/syncmenu/sync-menu.h 2008-09-29 11:11:49 UTC (rev 10446) +++ branches/osx_newbuildsys/src/osx/syncmenu/syncmenu_c/sync-menu.h 2008-09-30 16:08:51 UTC (rev 10453) @@ -1,27 +0,0 @@ -/* GTK+ Integration for the Mac OS X Menubar. - * - * Copyright (C) 2007 Pioneer Research Center USA, Inc. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library 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 - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. - */ - -#include <gtk/gtk.h> - -G_BEGIN_DECLS - -void sync_menu_takeover_menu (GtkMenuShell *menu_shell); - -G_END_DECLS Copied: branches/osx_newbuildsys/src/osx/syncmenu/syncmenu_c/syncmenu.c (from rev 10446, branches/osx_newbuildsys/src/osx/syncmenu/syncmenu/sync-menu.c) =================================================================== --- branches/osx_newbuildsys/src/osx/syncmenu/syncmenu_c/syncmenu.c (rev 0) +++ branches/osx_newbuildsys/src/osx/syncmenu/syncmenu_c/syncmenu.c 2008-09-30 16:08:51 UTC (rev 10453) @@ -0,0 +1,728 @@ +/* GTK+ Integration for the Mac OS X Menubar. + * + * Copyright (C) 2007 Pioneer Research Center USA, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. + */ + +#include <gtk/gtk.h> +#include <gdk/gdkkeysyms.h> + +#include <Carbon/Carbon.h> + +#include "syncmenu.h" + + +/* TODO + * + * - Setup shortcuts, possibly transforming ctrl->cmd + * - Sync menus + * - Create on demand? (can this be done with gtk+? ie fill in menu items when the menu is opened) + * - Figure out what to do per app/window... + * - Toggle/radio items + * + */ + +#define GTK_QUARTZ_MENU_CREATOR 'GTKC' +#define GTK_QUARTZ_ITEM_WIDGET 'GWID' + + +static void sync_menu_shell (GtkMenuShell *menu_shell, + MenuRef carbon_menu, + gboolean toplevel); + + +/* + * utility functions + */ + +static GtkWidget * +find_menu_label (GtkWidget *widget) +{ + GtkWidget *label = NULL; + + if (GTK_IS_LABEL (widget)) + return widget; + + if (GTK_IS_CONTAINER (widget)) + { + GList *children; + GList *l; + + children = gtk_container_get_children (GTK_CONTAINER (widget)); + + for (l = children; l; l = l->next) + { + label = find_menu_label (l->data); + if (label) + break; + } + + g_list_free (children); + } + + return label; +} + +static const gchar * +get_menu_label_text (GtkWidget *menu_item, + GtkWidget **label) +{ + *label = find_menu_label (menu_item); + if (!*label) + return NULL; + + return gtk_label_get_text (GTK_LABEL (*label)); +} + +static gboolean +accel_find_func (GtkAccelKey *key, + GClosure *closure, + gpointer data) +{ + return (GClosure *) data == closure; +} + + +/* + * CarbonMenu functions + */ + +typedef struct +{ + MenuRef menu; +} CarbonMenu; + +static GQuark carbon_menu_quark = 0; + +static CarbonMenu * +carbon_menu_new (void) +{ + return g_slice_new0 (CarbonMenu); +} + +static void +carbon_menu_free (CarbonMenu *menu) +{ + g_slice_free (CarbonMenu, menu); +} + +static CarbonMenu * +carbon_menu_get (GtkWidget *widget) +{ + return g_object_get_qdata (G_OBJECT (widget), carbon_menu_quark); +} + +static void +carbon_menu_connect (GtkWidget *menu, + MenuRef menuRef) +{ + CarbonMenu *carbon_menu = carbon_menu_get (menu); + + if (!carbon_menu) + { + carbon_menu = carbon_menu_new (); + + g_object_set_qdata_full (G_OBJECT (menu), carbon_menu_quark, + carbon_menu, + (GDestroyNotify) carbon_menu_free); + } + + carbon_menu->menu = menuRef; +} + + +/* + * CarbonMenuItem functions + */ + +typedef struct +{ + MenuRef menu; + MenuItemIndex index; + MenuRef submenu; + GClosure *accel_closure; +} CarbonMenuItem; + +static GQuark carbon_menu_item_quark = 0; + +static CarbonMenuItem * +carbon_menu_item_new (void) +{ + return g_slice_new0 (CarbonMenuItem); +} + +static void +carbon_menu_item_free (CarbonMenuItem *menu_item) +{ + if (menu_item->accel_closure) + g_closure_unref (menu_item->accel_closure); + + g_slice_free (CarbonMenuItem, menu_item); +} + +static CarbonMenuItem * +carbon_menu_item_get (GtkWidget *widget) +{ + return g_object_get_qdata (G_OBJECT (widget), carbon_menu_item_quark); +} + +static void +carbon_menu_item_update_state (CarbonMenuItem *carbon_item, + GtkWidget *widget) +{ + gboolean sensitive; + gboolean visible; + UInt32 set_attrs = 0; + UInt32 clear_attrs = 0; + + g_object_get (widget, + "sensitive", &sensitive, + "visible", &visible, + NULL); + + if (!sensitive) + set_attrs |= kMenuItemAttrDisabled; + else + clear_attrs |= kMenuItemAttrDisabled; + + if (!visible) + set_attrs |= kMenuItemAttrHidden; + else + clear_attrs |= kMenuItemAttrHidden; + + ChangeMenuItemAttributes (carbon_item->menu, carbon_item->index, + set_attrs, clear_attrs); +} + +static void +carbon_menu_item_update_active (CarbonMenuItem *carbon_item, + GtkWidget *widget) +{ + gboolean active; + + g_object_get (widget, + "active", &active, + NULL); + + CheckMenuItem (carbon_item->menu, carbon_item->index, + active); +} + +static void +carbon_menu_item_update_submenu (CarbonMenuItem *carbon_item, + GtkWidget *widget) +{ + GtkWidget *submenu; + + submenu = gtk_menu_item_get_submenu (GTK_MENU_ITEM (widget)); + + if (submenu) + { + GtkWidget *label = NULL; + + carbon_item->submenu = NULL; + GetMenuItemHierarchicalMenu(carbon_item->menu, carbon_item->index, + &carbon_item->submenu); + if (!carbon_item->submenu) + { + const gchar *label_text; + CFStringRef cfstr = NULL; + + label_text = get_menu_label_text (widget, &label); + if (label_text) + cfstr = CFStringCreateWithCString (NULL, label_text, + kCFStringEncodingUTF8); + CreateNewMenu (0, 0, &carbon_item->submenu); + SetMenuTitleWithCFString (carbon_item->submenu, cfstr); + SetMenuItemHierarchicalMenu (carbon_item->menu, carbon_item->index, + carbon_item->submenu); + if (cfstr) + CFRelease (cfstr); + } + + sync_menu_shell (GTK_MENU_SHELL (submenu), carbon_item->submenu, FALSE); + } + else + { + SetMenuItemHierarchicalMenu (carbon_item->menu, carbon_item->index, + NULL); + carbon_item->submenu = NULL; + } +} + +static void +carbon_menu_item_update_label (CarbonMenuItem *carbon_item, + GtkWidget *widget) +{ + GtkWidget *label; + const gchar *label_text; + CFStringRef cfstr = NULL; + + label_text = get_menu_label_text (widget, &label); + if (label_text) + cfstr = CFStringCreateWithCString (NULL, label_text, + kCFStringEncodingUTF8); + + SetMenuItemTextWithCFString (carbon_item->menu, carbon_item->index, + cfstr); + + if (cfstr) + CFRelease (cfstr); +} + +static void +carbon_menu_item_update_accelerator (CarbonMenuItem *carbon_item, + GtkWidget *widget) +{ + GtkWidget *label; + + get_menu_label_text (widget, &label); + + if (GTK_IS_ACCEL_LABEL (label) && + GTK_ACCEL_LABEL (label)->accel_closure) + { + GtkAccelKey *key; + + key = gtk_accel_group_find (GTK_ACCEL_LABEL (label)->accel_group, + accel_find_func, + GTK_ACCEL_LABEL (label)->accel_closure); + + if (key && + key->accel_key && + key->accel_flags & GTK_ACCEL_VISIBLE) + { + GdkDisplay *display = gtk_widget_get_display (widget); + GdkKeymap *keymap = gdk_keymap_get_for_display (display); + GdkKeymapKey *keys; + gint n_keys; + + if (gdk_keymap_get_entries_for_keyval (keymap, key->accel_key, + &keys, &n_keys)) + { + UInt8 modifiers = 0; + + SetMenuItemCommandKey (carbon_item->menu, carbon_item->index, + true, keys[0].keycode); + + g_free (keys); + + if (key->accel_mods) + { + if (key->accel_mods & GDK_SHIFT_MASK) + modifiers |= kMenuShiftModifier; + + if (key->accel_mods & GDK_MOD1_MASK) + modifiers |= kMenuOptionModifier; + } + + if (!(key->accel_mods & GDK_CONTROL_MASK)) + { + modifiers |= kMenuNoCommandModifier; + } + + SetMenuItemModifiers (carbon_item->menu, carbon_item->index, + modifiers); + + return; + } + } + } + + /* otherwise, clear the menu shortcut */ + SetMenuItemModifiers (carbon_item->menu, carbon_item->index, + kMenuNoModifiers | kMenuNoCommandModifier); + ChangeMenuItemAttributes (carbon_item->menu, carbon_item->index, + 0, kMenuItemAttrUseVirtualKey); + SetMenuItemCommandKey (carbon_item->menu, carbon_item->index, + false, 0); +} + +static void +carbon_menu_item_accel_changed (GtkAccelGroup *accel_group, + guint keyval, + GdkModifierType modifier, + GClosure *accel_closure, + GtkWidget *widget) +{ + CarbonMenuItem *carbon_item = carbon_menu_item_get (widget); + GtkWidget *label; + + get_menu_label_text (widget, &label); + + if (GTK_IS_ACCEL_LABEL (label) && + GTK_ACCEL_LABEL (label)->accel_closure == accel_closure) + carbon_menu_item_update_accelerator (carbon_item, widget); +} + +static void +carbon_menu_item_update_accel_closure (CarbonMenuItem *carbon_item, + GtkWidget *widget) +{ + GtkAccelGroup *group; + GtkWidget *label; + + get_menu_label_text (widget, &label); + + if (carbon_item->accel_closure) + { + group = gtk_accel_group_from_accel_closure (carbon_item->accel_closure); + if (group) + g_signal_handlers_disconnect_by_func (group, + carbon_menu_item_accel_changed, + widget); + + g_closure_unref (carbon_item->accel_closure); + carbon_item->accel_closure = NULL; + } + + if (GTK_IS_ACCEL_LABEL (label)) + carbon_item->accel_closure = GTK_ACCEL_LABEL (label)->accel_closure; + + if (carbon_item->accel_closure) + { + g_closure_ref (carbon_item->accel_closure); + + group = gtk_accel_group_from_accel_closure (carbon_item->accel_closure); + + g_signal_connect_object (group, "accel-changed", + G_CALLBACK (carbon_menu_item_accel_changed), + widget, 0); + } + + carbon_menu_item_update_accelerator (carbon_item, widget); +} + +static void +carbon_menu_item_notify (GObject *object, + GParamSpec *pspec, + CarbonMenuItem *carbon_item) +{ + if (!strcmp (pspec->name, "sensitive") || + !strcmp (pspec->name, "visible")) + { + carbon_menu_item_update_state (carbon_item, GTK_WIDGET (object)); + } + else if (!strcmp (pspec->name, "active")) + { + carbon_menu_item_update_active (carbon_item, GTK_WIDGET (object)); + } + else if (!strcmp (pspec->name, "submenu")) + { + carbon_menu_item_update_submenu (carbon_item, GTK_WIDGET (object)); + } +} + +static void +carbon_menu_item_notify_label (GObject *object, + GParamSpec *pspec, + gpointer data) +{ + CarbonMenuItem *carbon_item = carbon_menu_item_get (GTK_WIDGET (object)); + + if (!strcmp (pspec->name, "label")) + { + carbon_menu_item_update_label (carbon_item, + GTK_WIDGET (object)); + } + else if (!strcmp (pspec->name, "accel-closure")) + { + carbon_menu_item_update_accel_closure (carbon_item, + GTK_WIDGET (object)); + } +} + +static CarbonMenuItem * +carbon_menu_item_connect (GtkWidget *menu_item, + GtkWidget *label, + MenuRef menu, + MenuItemIndex index) +{ + CarbonMenuItem *carbon_item = carbon_menu_item_get (menu_item); + + if (!carbon_item) + { + carbon_item = carbon_menu_item_new (); + + g_object_set_qdata_full (G_OBJECT (menu_item), carbon_menu_item_quark, + carbon_item, + (GDestroyNotify) carbon_menu_item_free); + + g_signal_connect (menu_item, "notify", + G_CALLBACK (carbon_menu_item_notify), + carbon_item); + + if (label) + g_signal_connect_swapped (label, "notify::label", + G_CALLBACK (carbon_menu_item_notify_label), + menu_item); + } + + carbon_item->menu = menu; + carbon_item->index = index; + + return carbon_item; +} + +/* + * carbon event handler + */ + +gboolean menuitem_activate_wrapper(gpointer data) +{ + gtk_menu_item_activate((GtkMenuItem*)data); + return FALSE; +} + +static OSStatus +menu_event_handler_func (EventHandlerCallRef event_handler_call_ref, + EventRef event_ref, + void *data) +{ + UInt32 event_class = GetEventClass (event_ref); + UInt32 event_kind = GetEventKind (event_ref); + MenuRef menu_ref; + + switch (event_class) + { + case kEventClassCommand: + /* This is called when activating (is that the right GTK+ term?) + * a menu item. + */ + if (event_kind == kEventCommandProcess) + { + HICommand command; + OSStatus err; + + //g_print ("Menu: kEventClassCommand/kEventCommandProcess\n"); + + err = GetEventParameter (event_ref, kEventParamDirectObject, + typeHICommand, 0, + sizeof (command), 0, &command); + + if (err == noErr) + { + GtkWidget *widget = NULL; + + if (command.commandID == kHICommandQuit) + { + gtk_main_quit (); /* Just testing... */ + return noErr; + } + + /* Get any GtkWidget associated with the item. */ + err = GetMenuItemProperty (command.menu.menuRef, + command.menu.menuItemIndex, + GTK_QUARTZ_MENU_CREATOR, + GTK_QUARTZ_ITEM_WIDGET, + sizeof (widget), 0, &widget); + if (err == noErr && widget) + { + g_idle_add(menuitem_activate_wrapper, + (gpointer)GTK_MENU_ITEM (widget)); + return noErr; + } + } + } + break; + + case kEventClassMenu: + GetEventParameter (event_ref, + kEventParamDirectObject, + typeMenuRef, + NULL, + sizeof (menu_ref), + NULL, + &menu_ref); + + switch (event_kind) + { + case kEventMenuTargetItem: + /* This is called when an item is selected (what is the + * GTK+ term? prelight?) + */ + //g_print ("kEventClassMenu/kEventMenuTargetItem\n"); + break; + + case kEventMenuOpening: + /* Is it possible to dynamically build the menu here? We + * can at least set visibility/sensitivity. + */ + //g_print ("kEventClassMenu/kEventMenuOpening\n"); + break; + + case kEventMenuClosed: + //g_print ("kEventClassMenu/kEventMenuClosed\n"); + break; + + default: + break; + } + + break; + + default: + break; + } + + return CallNextEventHandler (event_handler_call_ref, event_ref); +} + +static void +setup_menu_event_handler (void) +{ + EventHandlerUPP menu_event_handler_upp; + EventHandlerRef menu_event_handler_ref; + const EventTypeSpec menu_events[] = { + { kEventClassCommand, kEventCommandProcess }, + { kEventClassMenu, kEventMenuTargetItem }, + { kEventClassMenu, kEventMenuOpening }, + { kEventClassMenu, kEventMenuClosed } + }; + + /* FIXME: We might have to install one per window? */ + + menu_event_handler_upp = NewEventHandlerUPP (menu_event_handler_func); + InstallEventHandler (GetApplicationEventTarget (), menu_event_handler_upp, + GetEventTypeCount (menu_events), menu_events, 0, + &menu_event_handler_ref); + +#if 0 + /* FIXME: Remove the handler with: */ + RemoveEventHandler(menu_event_handler_ref); + DisposeEventHandlerUPP(menu_event_handler_upp); +#endif +} + +static void +sync_menu_shell (GtkMenuShell *menu_shell, + MenuRef carbon_menu, + gboolean toplevel) +{ + GList *children; + GList *l; + MenuItemIndex carbon_index = 1; + + carbon_menu_connect (GTK_WIDGET (menu_shell), carbon_menu); + + children = gtk_container_get_children (GTK_CONTAINER (menu_shell)); + + UInt16 carbon_item_count = CountMenuItems(carbon_menu); + + for (l = children; l; l = l->next) + { + GtkWidget *menu_item = l->data; + CarbonMenuItem *carbon_item; + + if (GTK_IS_TEAROFF_MENU_ITEM (menu_item)) + continue; + + if (toplevel && g_object_get_data (G_OBJECT (menu_item), + "gtk-empty-menu-item")) + continue; + + GtkWidget *label = NULL; + const gchar *label_text = NULL; + + label_text = get_menu_label_text (menu_item, &label); + if (label_text && strcmp(label_text, "_SKIP_") == 0) + { + carbon_index++; + continue; + } + else if (!label_text) + label_text = ""; + + MenuItemAttributes attributes = 0; + if (GTK_IS_SEPARATOR_MENU_ITEM (menu_item)) + attributes |= kMenuItemAttrSeparator; + if (!GTK_WIDGET_IS_SENSITIVE (menu_item)) + attributes |= kMenuItemAttrDisabled; + if (!GTK_WIDGET_VISIBLE (menu_item)) + attributes |= kMenuItemAttrHidden; + + CFStringRef cfstr = CFStringCreateWithCString (NULL, label_text, + kCFStringEncodingUTF8); + if (carbon_index > carbon_item_count) + AppendMenuItemTextWithCFString(carbon_menu, cfstr, attributes, 0, + NULL); + else if (!toplevel && (carbon_index > carbon_item_count)) + InsertMenuItemTextWithCFString (carbon_menu, cfstr, + carbon_index, attributes, 0); + else + SetMenuItemTextWithCFString(carbon_menu, carbon_index, cfstr); + CFRelease (cfstr); + + MenuItemAttributes c_attributes = kMenuItemAttrSectionHeader | + kMenuItemAttrAutoDisable; + if (!(attributes & kMenuItemAttrDisabled)) + c_attributes |= kMenuItemAttrDisabled; + if (!(attributes & kMenuItemAttrSeparator)) + c_attributes |= kMenuItemAttrSeparator; + if (!(attributes & kMenuItemAttrHidden)) + c_attributes |= kMenuItemAttrHidden; + ChangeMenuItemAttributes(carbon_menu, carbon_index, + attributes, c_attributes); + SetMenuItemProperty (carbon_menu, carbon_index, + GTK_QUARTZ_MENU_CREATOR, + GTK_QUARTZ_ITEM_WIDGET, + sizeof (menu_item), &menu_item); + + carbon_item = carbon_menu_item_connect (menu_item, label, + carbon_menu, + carbon_index); + + if (GTK_IS_CHECK_MENU_ITEM (menu_item)) + carbon_menu_item_update_active (carbon_item, menu_item); + + carbon_menu_item_update_accel_closure (carbon_item, menu_item); + + if (gtk_menu_item_get_submenu (GTK_MENU_ITEM (menu_item))) + carbon_menu_item_update_submenu (carbon_item, menu_item); + + carbon_index++; + } + + while (carbon_index <= carbon_item_count) + { + DeleteMenuItem (carbon_menu, carbon_index); + carbon_index++; + } + + g_list_free (children); +} + +void +sync_menu_takeover_menu (GtkMenuShell *menu_shell) +{ + static MenuRef carbon_menubar = NULL; + + g_return_if_fail (GTK_IS_MENU_SHELL (menu_shell)); + + if (carbon_menu_quark == 0) + carbon_menu_quark = g_quark_from_static_string ("CarbonMenu"); + + if (carbon_menu_item_quark == 0) + carbon_menu_item_quark = g_quark_from_static_string ("CarbonMenuItem"); + + if (!carbon_menubar) + { + carbon_menubar = AcquireRootMenu(); + setup_menu_event_handler (); + } + + sync_menu_shell (menu_shell, carbon_menubar, TRUE); +} Property changes on: branches/osx_newbuildsys/src/osx/syncmenu/syncmenu_c/syncmenu.c ___________________________________________________________________ Added: svn:mergeinfo + Copied: branches/osx_newbuildsys/src/osx/syncmenu/syncmenu_c/syncmenu.h (from rev 10446, branches/osx_newbuildsys/src/osx/syncmenu/syncmenu/sync-menu.h) =================================================================== --- branches/osx_newbuildsys/src/osx/syncmenu/syncmenu_c/syncmenu.h (rev 0) +++ branches/osx_newbuildsys/src/osx/syncmenu/syncmenu_c/syncmenu.h 2008-09-30 16:08:51 UTC (rev 10453) @@ -0,0 +1,27 @@ +/* GTK+ Integration for the Mac OS X Menubar. + * + * Copyright (C) 2007 Pioneer Research Center USA, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. + */ + +#include <gtk/gtk.h> + +G_BEGIN_DECLS + +void sync_menu_takeover_menu (GtkMenuShell *menu_shell); + +G_END_DECLS Property changes on: branches/osx_newbuildsys/src/osx/syncmenu/syncmenu_c/syncmenu.h ___________________________________________________________________ Added: svn:mergeinfo +

1 0

[commit-gajim] r10452 - branches/osx_newbuildsys/src/osx/syncmenu/syncmenu
by js＠gajim.org 30 Sep '08

30 Sep '08

Author: js Date: 2008-09-30 17:57:50 +0200 (Tue, 30 Sep 2008) New Revision: 10452 Removed: branches/osx_newbuildsys/src/osx/syncmenu/syncmenu/__init__.py Log: That file shouldn't have been in the commit. Deleted: branches/osx_newbuildsys/src/osx/syncmenu/syncmenu/__init__.py =================================================================== --- branches/osx_newbuildsys/src/osx/syncmenu/syncmenu/__init__.py 2008-09-30 15:40:06 UTC (rev 10451) +++ branches/osx_newbuildsys/src/osx/syncmenu/syncmenu/__init__.py 2008-09-30 15:57:50 UTC (rev 10452) @@ -1,3 +0,0 @@ -# No-op file that just helps python with the syncmenu module directory. - -# vim: se ts=3:

1 0

[commit-gajim] r10451 - in branches/osx_newbuildsys: . src src/osx/syncmenu src/osx/syncmenu/syncmenu
by js＠gajim.org 30 Sep '08

30 Sep '08

Author: js Date: 2008-09-30 17:40:06 +0200 (Tue, 30 Sep 2008) New Revision: 10451 Added: branches/osx_newbuildsys/src/osx/syncmenu/__init__.py branches/osx_newbuildsys/src/osx/syncmenu/syncmenu/__init__.py Modified: branches/osx_newbuildsys/configure.ac branches/osx_newbuildsys/src/roster_window.py Log: Fix condition for building trayicon, get syncmenu working. Modified: branches/osx_newbuildsys/configure.ac =================================================================== --- branches/osx_newbuildsys/configure.ac 2008-09-30 15:21:44 UTC (rev 10450) +++ branches/osx_newbuildsys/configure.ac 2008-09-30 15:40:06 UTC (rev 10451) @@ -122,20 +122,6 @@ AC_SUBST(PYTHON_FLAGS, $PYTHON_FLAGS) dnl **** -dnl tray icon -dnl **** -AC_ARG_ENABLE(trayicon, - [ --disable-trayicon do not build trayicon module [default yes]], - enable_trayicon=$enableval, enable_trayicon=yes) -if test "x$enable_trayicon" = "xyes"; then - have_trayicon=true - AC_SUBST(TRAYMODULE, traymodule) -else - have_trayicon=false - AC_SUBST(TRAYMODULE,) -fi - -dnl **** dnl Cocoa dnl **** AC_ARG_ENABLE([cocoa], @@ -188,9 +174,21 @@ have_idle_osx=false fi fi -AM_CONDITIONAL(BUILD_IDLE_OSX, $have_carbon) -AM_CONDITIONAL(BUILD_CARBON, $have_carbon) +dnl **** +dnl tray icon +dnl **** +AC_ARG_ENABLE(trayicon, + [ --disable-trayicon do not build trayicon module [default yes]], + enable_trayicon=$enableval, enable_trayicon=yes) +if test "x$enable_trayicon" = "xyes" -a "x$have_cocoa" = "xyes"; then + have_trayicon=true + AC_SUBST(TRAYMODULE, traymodule) +else + have_trayicon=false + AC_SUBST(TRAYMODULE,) +fi + ACLOCAL_AMFLAGS="\${ACLOCAL_FLAGS}" AC_SUBST(ACLOCAL_AMFLAGS) Added: branches/osx_newbuildsys/src/osx/syncmenu/__init__.py =================================================================== --- branches/osx_newbuildsys/src/osx/syncmenu/__init__.py (rev 0) +++ branches/osx_newbuildsys/src/osx/syncmenu/__init__.py 2008-09-30 15:40:06 UTC (rev 10451) @@ -0,0 +1,3 @@ +# No-op file that just helps python with the syncmenu module directory. + +# vim: se ts=3: Added: branches/osx_newbuildsys/src/osx/syncmenu/syncmenu/__init__.py =================================================================== --- branches/osx_newbuildsys/src/osx/syncmenu/syncmenu/__init__.py (rev 0) +++ branches/osx_newbuildsys/src/osx/syncmenu/syncmenu/__init__.py 2008-09-30 15:40:06 UTC (rev 10451) @@ -0,0 +1,3 @@ +# No-op file that just helps python with the syncmenu module directory. + +# vim: se ts=3: Modified: branches/osx_newbuildsys/src/roster_window.py =================================================================== --- branches/osx_newbuildsys/src/roster_window.py 2008-09-30 15:21:44 UTC (rev 10450) +++ branches/osx_newbuildsys/src/roster_window.py 2008-09-30 15:40:06 UTC (rev 10451) @@ -74,7 +74,7 @@ from common.pep import MOODS, ACTIVITIES try: - from osx import syncmenu + from osx.syncmenu import syncmenu except ImportError: pass

1 0

[commit-gajim] r10450 - trunk/src
by asterix＠gajim.org 30 Sep '08

30 Sep '08

Author: asterix Date: 2008-09-30 17:21:44 +0200 (Tue, 30 Sep 2008) New Revision: 10450 Modified: trunk/src/session.py Log: some coding standards Modified: trunk/src/session.py =================================================================== --- trunk/src/session.py 2008-09-30 13:05:09 UTC (rev 10449) +++ trunk/src/session.py 2008-09-30 15:21:44 UTC (rev 10450) @@ -38,8 +38,9 @@ import negotiation class ChatControlSession(stanza_session.EncryptedStanzaSession): - def __init__(self, conn, jid, thread_id, type = 'chat'): - stanza_session.EncryptedStanzaSession.__init__(self, conn, jid, thread_id, type = 'chat') + def __init__(self, conn, jid, thread_id, type='chat'): + stanza_session.EncryptedStanzaSession.__init__(self, conn, jid, thread_id, + type='chat') self.control = None @@ -72,7 +73,7 @@ break # No XEP-0085 support, fallback to XEP-0022 if not chatstate: - chatstate_child = msg.getTag('x', namespace = common.xmpp.NS_EVENT) + chatstate_child = msg.getTag('x', namespace=common.xmpp.NS_EVENT) if chatstate_child: chatstate = 'active' composing_xep = 'XEP-0022' @@ -94,7 +95,7 @@ # XEP-0172 User Nickname user_nick = msg.getTagData('nick') if not user_nick: - user_nick ='' + user_nick = '' form_node = None for xtag in msg.getTags('x'): @@ -116,8 +117,8 @@ if self.is_loggable() and msgtxt: try: - msg_id = gajim.logger.write(log_type, full_jid_with_resource, msgtxt, - tim=tim, subject=subject) + msg_id = gajim.logger.write(log_type, full_jid_with_resource, + msgtxt, tim=tim, subject=subject) except exceptions.PysqliteOperationalError, e: self.conn.dispatch('ERROR', (_('Disk WriteError'), str(e))) @@ -133,11 +134,13 @@ if gajim.jid_is_transport(jid): jid = jid.replace('@', '') - groupchat_control = gajim.interface.msg_win_mgr.get_gc_control(jid, self.conn.name) + groupchat_control = gajim.interface.msg_win_mgr.get_gc_control(jid, + self.conn.name) if not groupchat_control and \ jid in gajim.interface.minimized_controls[self.conn.name]: - groupchat_control = gajim.interface.minimized_controls[self.conn.name][jid] + groupchat_control = gajim.interface.minimized_controls[self.conn.name]\ + [jid] pm = False if groupchat_control and groupchat_control.type_id == \ @@ -151,7 +154,8 @@ # does this resource have the highest priority of any available? is_highest = not highest_contact or not highest_contact.resource or \ - resource == highest_contact.resource or highest_contact.show == 'offline' + resource == highest_contact.resource or highest_contact.show == \ + 'offline' # Handle chat states contact = gajim.contacts.get_contact(self.conn.name, jid, resource) @@ -181,13 +185,13 @@ return if gajim.config.get('ignore_unknown_contacts') and \ - not gajim.contacts.get_contacts(self.conn.name, jid) and not pm: + not gajim.contacts.get_contacts(self.conn.name, jid) and not pm: return if not contact: # contact is not in the roster, create a fake one to display # notification - contact = contacts.Contact(jid = jid, resource = resource) + contact = contacts.Contact(jid=jid, resource=resource) advanced_notif_num = notify.get_advanced_notification('message_received', self.conn.name, contact) @@ -198,7 +202,8 @@ jid_of_control = full_jid_with_resource if not self.control: - ctrl = gajim.interface.msg_win_mgr.get_control(jid_of_control, self.conn.name) + ctrl = gajim.interface.msg_win_mgr.get_control(jid_of_control, + self.conn.name) if ctrl: self.control = ctrl self.control.set_session(self) @@ -213,8 +218,8 @@ nickname = resource if self.control: # print if a control is open - self.control.print_conversation(msgtxt, - tim = tim, xhtml = xhtml, encrypted = encrypted) + self.control.print_conversation(msgtxt, tim=tim, xhtml=xhtml, + encrypted=encrypted) else: # otherwise pass it off to the control to be queued groupchat_control.on_private_message(nickname, msgtxt, tim, @@ -242,10 +247,9 @@ first, nickname, msg, focused], advanced_notif_num) if gajim.interface.remote_ctrl: - gajim.interface.remote_ctrl.raise_signal('NewMessage', - (self.conn.name, [full_jid_with_resource, msgtxt, tim, - encrypted, msg_type, subject, chatstate, msg_id, - composing_xep, user_nick, xhtml, form_node])) + gajim.interface.remote_ctrl.raise_signal('NewMessage', (self.conn.name, + [full_jid_with_resource, msgtxt, tim, encrypted, msg_type, subject, + chatstate, msg_id, composing_xep, user_nick, xhtml, form_node])) # display the message or show notification in the roster def roster_message(self, jid, msg, tim, encrypted=False, msg_type='', @@ -333,8 +337,10 @@ type_ = 'normal' event_type = 'single_message_received' - show_in_roster = notify.get_show_in_roster(event_type, self.conn.name, contact, self) - show_in_systray = notify.get_show_in_systray(event_type, self.conn.name, contact) + show_in_roster = notify.get_show_in_roster(event_type, self.conn.name, + contact, self) + show_in_systray = notify.get_show_in_systray(event_type, self.conn.name, + contact) event = gajim.events.create_event(type_, (msg, subject, msg_type, tim, encrypted, resource, msg_id, xhtml, self, form_node), @@ -371,7 +377,8 @@ if form.getType() == 'form' and 'security' in form.asDict(): # we don't support 3-message negotiation as the responder if 'dhkeys' in form.asDict(): - self.fail_bad_negotiation('3 message negotiation not supported when responding', ('dhkeys',)) + self.fail_bad_negotiation('3 message negotiation not supported ' + 'when responding', ('dhkeys',)) return negotiated, not_acceptable, ask_user = self.verify_options_bob(form) @@ -388,14 +395,16 @@ not_acceptable.append(key) self.respond_e2e_bob(form, negotiated, not_acceptable) - self.dialog = dialogs.YesNoDialog(_('Confirm these session options'), + self.dialog = dialogs.YesNoDialog(_('Confirm these session ' + 'options'), _('''The remote client wants to negotiate an session with these features: %s - Are these options acceptable?''') % (negotiation.describe_features(ask_user)), - on_response_yes=accept_nondefault_options, - on_response_no=reject_nondefault_options) + Are these options acceptable?''') % (negotiation.describe_features( + ask_user)), + on_response_yes=accept_nondefault_options, + on_response_no=reject_nondefault_options) else: self.respond_e2e_bob(form, negotiated, not_acceptable) @@ -403,7 +412,8 @@ # alice accepts elif self.status == 'requested-e2e' and form.getType() == 'submit': - negotiated, not_acceptable, ask_user = self.verify_options_alice(form) + negotiated, not_acceptable, ask_user = self.verify_options_alice( + form) if ask_user: def accept_nondefault_options(is_checked): @@ -421,9 +431,11 @@ dialog.destroy() dialog = dialogs.YesNoDialog(_('Confirm these session options'), - _('The remote client selected these options:\n\n%s\n\nContinue with the session?') % (negotiation.describe_features(ask_user)), - on_response_yes = accept_nondefault_options, - on_response_no = reject_nondefault_options) + _('The remote client selected these options:\n\n%s\n\n' + 'Continue with the session?') % ( + negotiation.describe_features(ask_user)), + on_response_yes = accept_nondefault_options, + on_response_no = reject_nondefault_options) else: try: self.accept_e2e_alice(form, negotiated) @@ -460,8 +472,8 @@ return - # non-esession negotiation. this isn't very useful, but i'm keeping it around - # to test my test suite. + # non-esession negotiation. this isn't very useful, but i'm keeping it + # around to test my test suite. if form.getType() == 'form': if not self.control: jid, resource = gajim.get_room_and_nick_from_fjid(self.jid) @@ -471,10 +483,10 @@ if not contact: contact = gajim.contacts.create_contact(jid=jid, - resource=resource, show=self.conn.get_status()) + resource=resource, show=self.conn.get_status()) - gajim.interface.new_chat(contact, account, - resource = resource, session = self) + gajim.interface.new_chat(contact, account, resource=resource, + session=self) negotiation.FeatureNegotiationWindow(account, self.jid, self, form)

1 0

[commit-gajim] r10449 - trunk/src
by asterix＠gajim.org 30 Sep '08

30 Sep '08

Author: asterix Date: 2008-09-30 15:05:09 +0200 (Tue, 30 Sep 2008) New Revision: 10449 Modified: trunk/src/gajim.py Log: get_gc_control is in MessageWindowMgr class. Fixes #4357 Modified: trunk/src/gajim.py =================================================================== --- trunk/src/gajim.py 2008-09-30 10:22:55 UTC (rev 10448) +++ trunk/src/gajim.py 2008-09-30 13:05:09 UTC (rev 10449) @@ -1408,7 +1408,7 @@ self.roster.on_disconnect(None, room_jid, account) else: win = self.msg_win_mgr.get_window(room_jid, account) - ctrl = win.get_gc_control(room_jid, account) + ctrl = self.msg_win_mgr.get_gc_control(room_jid, account) win.remove_tab(ctrl, 3) dlg = dialogs.InputDialog(_('Password Required'),

1 0

[commit-gajim] r10448 - trunk/src/common
by asterix＠gajim.org 30 Sep '08

30 Sep '08

Author: asterix Date: 2008-09-30 12:22:55 +0200 (Tue, 30 Sep 2008) New Revision: 10448 Modified: trunk/src/common/connection_handlers.py Log: prevent traceback when removing an inexistant session. Fixes #1288 Modified: trunk/src/common/connection_handlers.py =================================================================== --- trunk/src/common/connection_handlers.py 2008-09-29 20:52:53 UTC (rev 10447) +++ trunk/src/common/connection_handlers.py 2008-09-30 10:22:55 UTC (rev 10448) @@ -1304,6 +1304,8 @@ def delete_session(self, jid, thread_id): if not jid in self.sessions: jid = gajim.get_jid_without_resource(jid) + if not jid in self.sessions: + return del self.sessions[jid][thread_id]

1 0

[commit-gajim] r10447 - trunk/src
by asterix＠gajim.org 29 Sep '08

29 Sep '08

Author: asterix Date: 2008-09-29 22:52:53 +0200 (Mon, 29 Sep 2008) New Revision: 10447 Modified: trunk/src/chat_control.py trunk/src/gajim.py trunk/src/roster_window.py Log: don't remove contact when there is pending events on another resource. Fixes #4350 Modified: trunk/src/chat_control.py =================================================================== --- trunk/src/chat_control.py 2008-09-29 11:11:49 UTC (rev 10446) +++ trunk/src/chat_control.py 2008-09-29 20:52:53 UTC (rev 10447) @@ -2188,7 +2188,8 @@ # Remove contact instance if contact has been removed key = (self.contact.jid, self.account) roster = gajim.interface.roster - if key in roster.contacts_to_be_removed.keys(): + if key in roster.contacts_to_be_removed.keys() and \ + not roster.contact_has_pending_roster_events(self.contact, self.account): backend = roster.contacts_to_be_removed[key]['backend'] del roster.contacts_to_be_removed[key] roster.remove_contact(self.contact.jid, self.account, force=True, Modified: trunk/src/gajim.py =================================================================== --- trunk/src/gajim.py 2008-09-29 11:11:49 UTC (rev 10446) +++ trunk/src/gajim.py 2008-09-29 20:52:53 UTC (rev 10447) @@ -1476,7 +1476,7 @@ not name and not groups: # contact removes us. if contacts: - self.roster.remove_contact(jid, account, force=True, backend=True) + self.roster.remove_contact(jid, account, backend=True) return elif not contacts: if sub == 'remove': @@ -1488,7 +1488,7 @@ self.roster.add_contact(jid, account) else: # it is an existing contact that might has changed - re_add = False + re_draw = False # if sub or groups changed: remove and re-add # Maybe observer status changed: # according to xep 0162, contact is not an observer anymore when @@ -1496,8 +1496,7 @@ old_groups = contacts[0].get_shown_groups() if contacts[0].sub != sub or contacts[0].ask != ask\ or old_groups != groups: - self.roster.remove_contact(jid, account, force=True) - re_add = True + re_draw = True for contact in contacts: if not name: name = '' @@ -1505,8 +1504,7 @@ contact.sub = sub contact.ask = ask contact.groups = groups or [] - if re_add: - self.roster.add_contact(jid, account) + if re_draw: # Refilter and update old groups for group in old_groups: self.roster.draw_group(group, account) Modified: trunk/src/roster_window.py =================================================================== --- trunk/src/roster_window.py 2008-09-29 11:11:49 UTC (rev 10446) +++ trunk/src/roster_window.py 2008-09-29 20:52:53 UTC (rev 10447) @@ -2003,7 +2003,7 @@ # Remove resource when going offline if show in ('offline', 'error') and \ - len(gajim.events.get_events(account, fjid)) == 0: + not self.contact_has_pending_roster_events(contact, account): ctrl = gajim.interface.msg_win_mgr.get_control(fjid, account) if ctrl: ctrl.update_ui()

1 0

[commit-gajim] r10446 - trunk/src
by asterix＠gajim.org 29 Sep '08

29 Sep '08

Author: asterix Date: 2008-09-29 13:11:49 +0200 (Mon, 29 Sep 2008) New Revision: 10446 Modified: trunk/src/groupchat_control.py Log: prevent sending invalid XML chars in pm and in muc. Fixes #4354 Modified: trunk/src/groupchat_control.py =================================================================== --- trunk/src/groupchat_control.py 2008-09-29 05:00:41 UTC (rev 10445) +++ trunk/src/groupchat_control.py 2008-09-29 11:11:49 UTC (rev 10446) @@ -132,6 +132,11 @@ if not message: return + message = helpers.remove_invalid_xml_chars(message) + + if not message: + return + # We need to make sure that we can still send through the room and that # the recipient did not go away contact = gajim.contacts.get_first_contact_from_jid(self.account, @@ -1607,6 +1612,11 @@ if not message: return + message = helpers.remove_invalid_xml_chars(message) + + if not message: + return + if message != '' or message != '\n': self.save_sent_message(message)

1 0

[commit-gajim] r10445 - trunk/src
by asterix＠gajim.org 29 Sep '08

29 Sep '08

Author: asterix Date: 2008-09-29 07:00:41 +0200 (Mon, 29 Sep 2008) New Revision: 10445 Modified: trunk/src/lastfm.py Log: fix indentation that caused streamable song from lastfm not displayed Modified: trunk/src/lastfm.py =================================================================== --- trunk/src/lastfm.py 2008-09-28 01:16:13 UTC (rev 10444) +++ trunk/src/lastfm.py 2008-09-29 05:00:41 UTC (rev 10445) @@ -110,9 +110,9 @@ else: album = None - timeNode = track.getElementsByTagName('date')[0] - self.lastSongs.append((artist, name, album, - int(timeNode.getAttribute('uts')))) + timeNode = track.getElementsByTagName('date')[0] + self.lastSongs.append((artist, name, album, + int(timeNode.getAttribute('uts')))) self.scrobbling = True return True

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits September 2008