[Galago-commits] r2628 - in trunk/galago-gtk-sharp: . galago-gtk sources tests

galago-commits at freedesktop.org galago-commits at freedesktop.org
Fri Mar 24 02:05:47 PST 2006


Author: chipx86
Date: 2006-03-24 02:05:40 -0800 (Fri, 24 Mar 2006)
New Revision: 2628

Added:
   trunk/galago-gtk-sharp/galago-gtk/AccountComboBox.custom
   trunk/galago-gtk-sharp/galago-gtk/ServiceComboBox.custom
Removed:
   trunk/galago-gtk-sharp/galago-gtk/AccountOptionMenu.custom
   trunk/galago-gtk-sharp/galago-gtk/ServiceOptionMenu.custom
Modified:
   trunk/galago-gtk-sharp/ChangeLog
   trunk/galago-gtk-sharp/configure.ac
   trunk/galago-gtk-sharp/galago-gtk/Makefile.am
   trunk/galago-gtk-sharp/galago-gtk/galago-gtk-api.raw
   trunk/galago-gtk-sharp/galago-gtk/galago-gtk-sharp.metadata
   trunk/galago-gtk-sharp/sources/Makefile.am
   trunk/galago-gtk-sharp/tests/test-presence-icon.cs
Log:
Get things ready to move over to the new libgalago-gtk version.  None of this really works yet.


Modified: trunk/galago-gtk-sharp/ChangeLog
===================================================================
--- trunk/galago-gtk-sharp/ChangeLog	2006-03-24 10:00:13 UTC (rev 2627)
+++ trunk/galago-gtk-sharp/ChangeLog	2006-03-24 10:05:40 UTC (rev 2628)
@@ -1,3 +1,18 @@
+Fri Mar 24 02:05:20 PST 2006  Christian Hammond <chipx86 at chipx86.com>
+
+	A galago-gtk/AccountComboBox.custom:
+	A galago-gtk/ServiceComboBox.custom:
+	D galago-gtk/AccountOptionMenu.custom:
+	D galago-gtk/ServiceOptionMenu.custom:
+	* configure.ac:
+	* galago-gtk/galago-gtk-api.raw:
+	* galago-gtk/galago-gtk-sharp.metadata:
+	* galago-gtk/Makefile.am:
+	* sources/Makefile.am:
+	* tests/test-presence-icon.cs:
+	  - Get things ready to move over to the new libgalago-gtk version.
+	    None of this really works yet.
+
 Mon Feb 13 00:22:00 PST 2006  Christian Hammond <chipx86 at chipx86.com>
 
 	D debian:

Modified: trunk/galago-gtk-sharp/configure.ac
===================================================================
--- trunk/galago-gtk-sharp/configure.ac	2006-03-24 10:00:13 UTC (rev 2627)
+++ trunk/galago-gtk-sharp/configure.ac	2006-03-24 10:05:40 UTC (rev 2628)
@@ -3,10 +3,10 @@
 dnl ################################################################
 dnl # Initialize autoconf
 dnl ################################################################
-AC_INIT(galago-gtk-sharp, 0.3.1, chipx86 at gnupdate.org)
+AC_INIT(galago-gtk-sharp, 0.3.1.90, chipx86 at chipx86.com)
 AC_PREREQ(2.50)
 AC_CONFIG_SRCDIR(config.h.in)
-AC_COPYRIGHT([Copyright 2004-2005 Christian Hammond])
+AC_COPYRIGHT([Copyright 2004-2006 Christian Hammond])
 
 
 dnl ################################################################
@@ -15,7 +15,7 @@
 GALAGO_GTK_SHARP_MAJOR_VERSION=0
 GALAGO_GTK_SHARP_MINOR_VERSION=3
 GALAGO_GTK_SHARP_MICRO_VERSION=1
-GALAGO_GTK_SHARP_DEVEL_VERSION=0
+GALAGO_GTK_SHARP_DEVEL_VERSION=90
 
 GALAGO_GTK_SHARP_VERSION=$GALAGO_GTK_SHARP_MAJOR_VERSION.$GALAGO_GTK_SHARP_MINOR_VERSION.$GALAGO_GTK_SHARP_MICRO_VERSION
 
@@ -69,7 +69,7 @@
 dnl ################################################################
 dnl # Look for Mono
 dnl ################################################################
-MONO_REQUIRED_VERSION=0.96
+MONO_REQUIRED_VERSION=1.0
 PKG_CHECK_MODULES(MONO, mono >= $MONO_REQUIRED_VERSION, has_mono=true, has_mono=false)
 
 if test "x$has_mono" = "xtrue"; then
@@ -88,8 +88,8 @@
 		LIB_SUFFIX=
 	fi
 
-	AC_PATH_PROG(GAPI_FIXUP, gapi-fixup, no)
-	AC_PATH_PROG(GAPI_CODEGEN, gapi-codegen, no)
+	AC_PATH_PROG(GAPI_FIXUP, gapi2-fixup, no)
+	AC_PATH_PROG(GAPI_CODEGEN, gapi2-codegen, no)
 else
 	AC_PATH_PROG(CSC, csc.exe, no)
 
@@ -106,10 +106,10 @@
 	fi
 fi
 
-GTK_SHARP_PREFIX=`pkg-config --variable=prefix gtk-sharp`
+GTK_SHARP_PREFIX=`pkg-config --variable=prefix gtk-sharp-2.0`
 AC_SUBST(GTK_SHARP_PREFIX)
 
-PKG_CHECK_MODULES(GALAGO_SHARP, galago-sharp >= 0.3.1)
+PKG_CHECK_MODULES(GALAGO_SHARP, galago-sharp >= 0.3.2.90)
 GALAGO_SHARP_PREFIX=`pkg-config --variable=prefix galago-sharp`
 AC_SUBST(GALAGO_SHARP_PREFIX)
 
@@ -134,7 +134,7 @@
 GTK_SHARP_MIN_VERSION="1.0"
 AC_SUBST(GTK_SHARP_MIN_VERSION)
 
-PKG_CHECK_MODULES(GTK_SHARP, gtk-sharp >= $GTK_SHARP_MIN_VERSION)
+PKG_CHECK_MODULES(GTK_SHARP, gtk-sharp-2.0 >= $GTK_SHARP_MIN_VERSION)
 AC_SUBST(GTK_SHARP_CFLAGS)
 AC_SUBST(GTK_SHARP_LIBS)
 

Copied: trunk/galago-gtk-sharp/galago-gtk/AccountComboBox.custom (from rev 2416, trunk/galago-gtk-sharp/galago-gtk/AccountOptionMenu.custom)

Deleted: trunk/galago-gtk-sharp/galago-gtk/AccountOptionMenu.custom
===================================================================
--- trunk/galago-gtk-sharp/galago-gtk/AccountOptionMenu.custom	2006-03-24 10:00:13 UTC (rev 2627)
+++ trunk/galago-gtk-sharp/galago-gtk/AccountOptionMenu.custom	2006-03-24 10:05:40 UTC (rev 2628)
@@ -1,4 +0,0 @@
-		public Galago.Account Account {
-			get { return Active;  }
-			set { Active = value; }
-		}

Modified: trunk/galago-gtk-sharp/galago-gtk/Makefile.am
===================================================================
--- trunk/galago-gtk-sharp/galago-gtk/Makefile.am	2006-03-24 10:00:13 UTC (rev 2627)
+++ trunk/galago-gtk-sharp/galago-gtk/Makefile.am	2006-03-24 10:05:40 UTC (rev 2628)
@@ -9,11 +9,11 @@
 	$(GTK_SHARP_PREFIX)/share/gapi/gtk-api.xml \
 	$(GTK_SHARP_PREFIX)/share/gapi/gdk-api.xml \
 	$(GTK_SHARP_PREFIX)/share/gapi/gdk-symbols.xml \
-	$(GALAGO_SHARP_PREFIX)/share/gapi/galago-symbols.xml
+	$(GALAGO_SHARP_PREFIX)/share/gapi/galago-api.xml
 
 METADATA = galago-gtk-sharp.metadata
 ASSEMBLY_NAME = galago-gtk-sharp
-references = -pkg:galago-sharp -pkg:gtk-sharp
+references = -pkg:galago-sharp -pkg:gtk-sharp-2.0
 
 TARGET = $(ASSEMBLY)
 ASSEMBLY = $(ASSEMBLY_NAME).dll
@@ -33,9 +33,9 @@
 build_sources = $(addprefix $(srcdir)/, $(sources)) AssemblyInfo.cs
 
 customs = \
-	AccountOptionMenu.custom \
+	AccountComboBox.custom \
 	ContactChooserDialog.custom \
-	ServiceOptionMenu.custom
+	ServiceComboBox.custom
 
 build_customs = $(addprefix $(srcdir)/, $(customs))
 

Copied: trunk/galago-gtk-sharp/galago-gtk/ServiceComboBox.custom (from rev 2416, trunk/galago-gtk-sharp/galago-gtk/ServiceOptionMenu.custom)

Deleted: trunk/galago-gtk-sharp/galago-gtk/ServiceOptionMenu.custom
===================================================================
--- trunk/galago-gtk-sharp/galago-gtk/ServiceOptionMenu.custom	2006-03-24 10:00:13 UTC (rev 2627)
+++ trunk/galago-gtk-sharp/galago-gtk/ServiceOptionMenu.custom	2006-03-24 10:05:40 UTC (rev 2628)
@@ -1,4 +0,0 @@
-		public Galago.Service Service {
-			get { return Active;  }
-			set { Active = value; }
-		}

Modified: trunk/galago-gtk-sharp/galago-gtk/galago-gtk-api.raw
===================================================================
--- trunk/galago-gtk-sharp/galago-gtk/galago-gtk-api.raw	2006-03-24 10:00:13 UTC (rev 2627)
+++ trunk/galago-gtk-sharp/galago-gtk/galago-gtk-api.raw	2006-03-24 10:05:40 UTC (rev 2628)
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <api>
-<!--
+  <!--
 
         This file was automatically generated.
         Please DO NOT MODIFY THIS FILE, modify .metadata files instead.
@@ -8,1088 +8,1033 @@
 -->
   <namespace name="GalagoGtk" library="libgalago-gtk">
     <enum name="ContactChooserFlags" cname="GalagoGtkContactChooserFlags" type="enum">
-      <member cname="GALAGO_GTK_CONTACT_CHOOSER_SELECT_CONTACTS" name="Contacts" value="0x01"/>
-      <member cname="GALAGO_GTK_CONTACT_CHOOSER_SELECT_PEOPLE" name="People" value="0x02"/>
+      <member cname="GALAGO_GTK_CONTACT_CHOOSER_SELECT_CONTACTS" name="Contacts" value="0x01" />
+      <member cname="GALAGO_GTK_CONTACT_CHOOSER_SELECT_PEOPLE" name="People" value="0x02" />
     </enum>
+    <enum name="ContactPathBarRootType" cname="GalagoGtkContactPathBarRootType" type="enum">
+      <member cname="GALAGO_GTK_CONTACT_PATH_BAR_ROOT_SERVICE" name="Service" />
+      <member cname="GALAGO_GTK_CONTACT_PATH_BAR_ROOT_ALL_PEOPLE" name="AllPeople" />
+      <member cname="GALAGO_GTK_CONTACT_PATH_BAR_ROOT_ALL_CONTACTS" name="AllContacts" />
+    </enum>
     <enum name="IconPrecedence" cname="GalagoGtkIconPrecedence" type="enum">
-      <member cname="GALAGO_GTK_ICON_NONE" name="None"/>
-      <member cname="GALAGO_GTK_ICON_GENERIC" name="Generic"/>
-      <member cname="GALAGO_GTK_ICON_PROTOCOL" name="Protocol"/>
-      <member cname="GALAGO_GTK_ICON_AVATAR" name="Avatar"/>
-      <member cname="GALAGO_GTK_ICON_PHOTO" name="Photo"/>
+      <member cname="GALAGO_GTK_ICON_NONE" name="None" />
+      <member cname="GALAGO_GTK_ICON_GENERIC" name="Generic" />
+      <member cname="GALAGO_GTK_ICON_PROTOCOL" name="Protocol" />
+      <member cname="GALAGO_GTK_ICON_AVATAR" name="Avatar" />
+      <member cname="GALAGO_GTK_ICON_PHOTO" name="Photo" />
     </enum>
     <enum name="ServiceListItemType" cname="GalagoGtkServiceListItemType" type="enum">
-      <member cname="GALAGO_GTK_SERVICE_LIST_ITEM_UNSET" name="Unset" value="-1"/>
-      <member cname="GALAGO_GTK_SERVICE_LIST_ITEM_PEOPLE" name="People"/>
-      <member cname="GALAGO_GTK_SERVICE_LIST_ITEM_ALL_CONTACTS" name="AllContacts"/>
-      <member cname="GALAGO_GTK_SERVICE_LIST_ITEM_SERVICE" name="Service"/>
+      <member cname="GALAGO_GTK_SERVICE_LIST_ITEM_UNSET" name="Unset" value="-1" />
+      <member cname="GALAGO_GTK_SERVICE_LIST_ITEM_PEOPLE" name="People" />
+      <member cname="GALAGO_GTK_SERVICE_LIST_ITEM_ALL_CONTACTS" name="AllContacts" />
+      <member cname="GALAGO_GTK_SERVICE_LIST_ITEM_SERVICE" name="Service" />
     </enum>
-    <callback name="TooltipFunc" cname="GalagoGtkTooltipFunc">
-      <return-type type="char*"/>
-      <parameters>
-        <parameter type="const-GtkWidget*" name="widget"/>
-      </parameters>
-    </callback>
     <interface name="ContactChooser" cname="GalagoGtkContactChooser">
+      <signal name="SelectionChanged" cname="selection-changed" when="LAST">
+        <return-type type="void" />
+        <parameters>
+          <parameter type="GalagoGtkContactChooser*" name="chooser" />
+        </parameters>
+      </signal>
+      <signal name="Activated" cname="activated" when="LAST">
+        <return-type type="void" />
+        <parameters>
+          <parameter type="GalagoGtkContactChooser*" name="chooser" />
+        </parameters>
+      </signal>
+      <virtual_method name="SetServiceType" cname="set_service_type">
+        <return-type type="void" />
+        <parameters>
+          <parameter type="GalagoGtkContactChooser*" name="chooser" />
+          <parameter type="GalagoGtkServiceListItemType" name="type" />
+        </parameters>
+      </virtual_method>
+      <virtual_method name="SetService" cname="set_service">
+        <return-type type="void" />
+        <parameters>
+          <parameter type="GalagoGtkContactChooser*" name="chooser" />
+          <parameter type="GalagoService*" name="service" />
+        </parameters>
+      </virtual_method>
+      <virtual_method name="SetContact" cname="set_contact">
+        <return-type type="void" />
+        <parameters>
+          <parameter type="GalagoGtkContactChooser*" name="chooser" />
+          <parameter type="GalagoAccount*" name="contact" />
+        </parameters>
+      </virtual_method>
+      <virtual_method name="SetPerson" cname="set_person">
+        <return-type type="void" />
+        <parameters>
+          <parameter type="GalagoGtkContactChooser*" name="chooser" />
+          <parameter type="GalagoPerson*" name="person" />
+        </parameters>
+      </virtual_method>
+      <virtual_method name="GetContact" cname="get_contact">
+        <return-type type="GalagoAccount*" />
+        <parameters>
+          <parameter type="const-GalagoGtkContactChooser*" name="chooser" />
+        </parameters>
+      </virtual_method>
+      <virtual_method name="GetPerson" cname="get_person">
+        <return-type type="GalagoPerson*" />
+        <parameters>
+          <parameter type="const-GalagoGtkContactChooser*" name="chooser" />
+        </parameters>
+      </virtual_method>
       <method name="GetContact" cname="galago_gtk_contact_chooser_get_contact">
-        <return-type type="GalagoAccount*"/>
+        <return-type type="GalagoAccount*" />
       </method>
       <method name="GetPerson" cname="galago_gtk_contact_chooser_get_person">
-        <return-type type="GalagoPerson*"/>
+        <return-type type="GalagoPerson*" />
       </method>
       <method name="GetType" cname="galago_gtk_contact_chooser_get_type" shared="true">
-        <return-type type="GType"/>
+        <return-type type="GType" />
       </method>
       <method name="SetContact" cname="galago_gtk_contact_chooser_set_contact">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GalagoAccount*" name="contact"/>
+          <parameter type="GalagoAccount*" name="contact" />
         </parameters>
       </method>
       <method name="SetPerson" cname="galago_gtk_contact_chooser_set_person">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GalagoPerson*" name="person"/>
+          <parameter type="GalagoPerson*" name="person" />
         </parameters>
       </method>
       <method name="SetService" cname="galago_gtk_contact_chooser_set_service">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GalagoService*" name="service"/>
+          <parameter type="GalagoService*" name="service" />
         </parameters>
       </method>
       <method name="SetServiceType" cname="galago_gtk_contact_chooser_set_service_type">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GalagoGtkServiceListItemType" name="type"/>
+          <parameter type="GalagoGtkServiceListItemType" name="type" />
         </parameters>
       </method>
     </interface>
     <object name="AccountComboBox" cname="GalagoGtkAccountComboBox" parent="GtkComboBox">
-      <field cname="priv" type="GalagoGtkAccountComboBoxPriv*"/>
+      <field name="Priv" cname="priv" type="GalagoGtkAccountComboBoxPriv*" />
       <callback cname="gtk_reserved1">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="void" name="arg1"/>
+          <parameter type="void" name="arg1" />
         </parameters>
       </callback>
       <callback cname="gtk_reserved2">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="void" name="arg1"/>
+          <parameter type="void" name="arg1" />
         </parameters>
       </callback>
       <callback cname="gtk_reserved3">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="void" name="arg1"/>
+          <parameter type="void" name="arg1" />
         </parameters>
       </callback>
       <callback cname="gtk_reserved4">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="void" name="arg1"/>
+          <parameter type="void" name="arg1" />
         </parameters>
       </callback>
       <signal name="AccountChanged" cname="account_changed" when="LAST">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GalagoGtkAccountComboBox*" name="combobox"/>
-          <parameter type="GalagoAccount*" name="account"/>
+          <parameter type="GalagoGtkAccountComboBox*" name="combobox" />
+          <parameter type="GalagoAccount*" name="account" />
         </parameters>
       </signal>
       <method name="GetActive" cname="galago_gtk_account_combo_box_get_active">
-        <return-type type="GalagoAccount*"/>
+        <return-type type="GalagoAccount*" />
       </method>
       <method name="GetPerson" cname="galago_gtk_account_combo_box_get_person">
-        <return-type type="GalagoPerson*"/>
+        <return-type type="GalagoPerson*" />
       </method>
       <method name="GetService" cname="galago_gtk_account_combo_box_get_service">
-        <return-type type="GalagoService*"/>
+        <return-type type="GalagoService*" />
       </method>
       <method name="GetServicesComboBox" cname="galago_gtk_account_combo_box_get_services_combo_box">
-        <return-type type="GtkWidget*"/>
+        <return-type type="GtkWidget*" />
       </method>
       <method name="GetType" cname="galago_gtk_account_combo_box_get_type" shared="true">
-        <return-type type="GType"/>
+        <return-type type="GType" />
       </method>
       <constructor cname="galago_gtk_account_combo_box_new">
         <parameters>
-          <parameter type="gboolean" name="me_accounts"/>
+          <parameter type="gboolean" name="me_accounts" />
         </parameters>
       </constructor>
       <method name="SetActive" cname="galago_gtk_account_combo_box_set_active">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="const-GalagoAccount*" name="account"/>
+          <parameter type="const-GalagoAccount*" name="account" />
         </parameters>
       </method>
       <method name="SetPerson" cname="galago_gtk_account_combo_box_set_person">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GalagoPerson*" name="person"/>
+          <parameter type="GalagoPerson*" name="person" />
         </parameters>
       </method>
       <method name="SetService" cname="galago_gtk_account_combo_box_set_service">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GalagoService*" name="service"/>
+          <parameter type="GalagoService*" name="service" />
         </parameters>
       </method>
       <method name="SetServicesComboBox" cname="galago_gtk_account_combo_box_set_services_combo_box">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkWidget*" name="service_combobox"/>
+          <parameter type="GtkWidget*" name="service_combobox" />
         </parameters>
       </method>
     </object>
     <object name="AccountLabel" cname="GalagoGtkAccountLabel" parent="GtkLabel">
-      <field cname="priv" type="GalagoGtkAccountLabelPriv*"/>
+      <field name="Priv" cname="priv" type="GalagoGtkAccountLabelPriv*" />
       <callback cname="gtk_reserved1">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="void" name="arg1"/>
+          <parameter type="void" name="arg1" />
         </parameters>
       </callback>
       <callback cname="gtk_reserved2">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="void" name="arg1"/>
+          <parameter type="void" name="arg1" />
         </parameters>
       </callback>
       <callback cname="gtk_reserved3">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="void" name="arg1"/>
+          <parameter type="void" name="arg1" />
         </parameters>
       </callback>
       <callback cname="gtk_reserved4">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="void" name="arg1"/>
+          <parameter type="void" name="arg1" />
         </parameters>
       </callback>
       <method name="GetAccount" cname="galago_gtk_account_label_get_account">
-        <return-type type="GalagoAccount*"/>
+        <return-type type="GalagoAccount*" />
       </method>
       <method name="GetPerson" cname="galago_gtk_account_label_get_person">
-        <return-type type="GalagoPerson*"/>
+        <return-type type="GalagoPerson*" />
       </method>
       <method name="GetType" cname="galago_gtk_account_label_get_type" shared="true">
-        <return-type type="GType"/>
+        <return-type type="GType" />
       </method>
-      <constructor cname="galago_gtk_account_label_new"/>
+      <constructor cname="galago_gtk_account_label_new" />
       <method name="SetAccount" cname="galago_gtk_account_label_set_account">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GalagoAccount*" name="account"/>
+          <parameter type="GalagoAccount*" name="account" />
         </parameters>
       </method>
       <method name="SetPerson" cname="galago_gtk_account_label_set_person">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GalagoPerson*" name="person"/>
+          <parameter type="GalagoPerson*" name="person" />
         </parameters>
       </method>
-      <method name="Update" cname="galago_gtk_account_label_update">
-        <return-type type="void"/>
-      </method>
     </object>
     <object name="AccountMenuItem" cname="GalagoGtkAccountMenuItem" parent="GtkImageMenuItem">
-      <field cname="priv" type="GalagoGtkAccountMenuItemPriv*"/>
+      <field name="Priv" cname="priv" type="GalagoGtkAccountMenuItemPriv*" />
       <callback cname="gtk_reserved1">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="void" name="arg1"/>
+          <parameter type="void" name="arg1" />
         </parameters>
       </callback>
       <callback cname="gtk_reserved2">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="void" name="arg1"/>
+          <parameter type="void" name="arg1" />
         </parameters>
       </callback>
       <callback cname="gtk_reserved3">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="void" name="arg1"/>
+          <parameter type="void" name="arg1" />
         </parameters>
       </callback>
       <callback cname="gtk_reserved4">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="void" name="arg1"/>
+          <parameter type="void" name="arg1" />
         </parameters>
       </callback>
       <method name="GetAccount" cname="galago_gtk_account_menu_item_get_account">
-        <return-type type="GalagoAccount*"/>
+        <return-type type="GalagoAccount*" />
       </method>
       <method name="GetType" cname="galago_gtk_account_menu_item_get_type" shared="true">
-        <return-type type="GType"/>
+        <return-type type="GType" />
       </method>
       <constructor cname="galago_gtk_account_menu_item_new">
         <parameters>
-          <parameter type="GalagoAccount*" name="account"/>
+          <parameter type="GalagoAccount*" name="account" />
         </parameters>
       </constructor>
       <method name="SetAccount" cname="galago_gtk_account_menu_item_set_account">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GalagoAccount*" name="account"/>
+          <parameter type="GalagoAccount*" name="account" />
         </parameters>
       </method>
     </object>
-    <object name="AccountOptionMenu" cname="GalagoGtkAccountOptionMenu" parent="GtkOptionMenu">
-      <field cname="priv" type="GalagoGtkAccountOptionMenuPriv*"/>
-      <callback cname="gtk_reserved1">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="void" name="arg1"/>
-        </parameters>
-      </callback>
-      <callback cname="gtk_reserved2">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="void" name="arg1"/>
-        </parameters>
-      </callback>
-      <callback cname="gtk_reserved3">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="void" name="arg1"/>
-        </parameters>
-      </callback>
-      <callback cname="gtk_reserved4">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="void" name="arg1"/>
-        </parameters>
-      </callback>
-      <signal name="AccountChanged" cname="account_changed" when="LAST">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GalagoGtkAccountOptionMenu*" name="optmenu"/>
-          <parameter type="GalagoAccount*" name="account"/>
-        </parameters>
-      </signal>
-      <method name="GetActive" cname="galago_gtk_account_option_menu_get_active">
-        <return-type type="GalagoAccount*"/>
-      </method>
-      <method name="GetPerson" cname="galago_gtk_account_option_menu_get_person">
-        <return-type type="GalagoPerson*"/>
-      </method>
-      <method name="GetService" cname="galago_gtk_account_option_menu_get_service">
-        <return-type type="GalagoService*"/>
-      </method>
-      <method name="GetServicesOptionMenu" cname="galago_gtk_account_option_menu_get_services_option_menu">
-        <return-type type="GtkWidget*"/>
-      </method>
-      <method name="GetType" cname="galago_gtk_account_option_menu_get_type" shared="true">
-        <return-type type="GType"/>
-      </method>
-      <constructor cname="galago_gtk_account_option_menu_new">
-        <parameters>
-          <parameter type="gboolean" name="me_accounts"/>
-        </parameters>
-      </constructor>
-      <method name="SetActive" cname="galago_gtk_account_option_menu_set_active">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="const-GalagoAccount*" name="account"/>
-        </parameters>
-      </method>
-      <method name="SetPerson" cname="galago_gtk_account_option_menu_set_person">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GalagoPerson*" name="person"/>
-        </parameters>
-      </method>
-      <method name="SetService" cname="galago_gtk_account_option_menu_set_service">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GalagoService*" name="service"/>
-        </parameters>
-      </method>
-      <method name="SetServicesOptionMenu" cname="galago_gtk_account_option_menu_set_services_option_menu">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GtkWidget*" name="service_optmenu"/>
-        </parameters>
-      </method>
-    </object>
     <object name="ContactChooserDialog" cname="GalagoGtkContactChooserDialog" parent="GtkDialog">
-      <field cname="priv" type="GalagoGtkContactChooserDialogPriv*"/>
+      <field name="Priv" cname="priv" type="GalagoGtkContactChooserDialogPriv*" />
       <callback cname="gtk_reserved1">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="void" name="arg1"/>
+          <parameter type="void" name="arg1" />
         </parameters>
       </callback>
       <callback cname="gtk_reserved2">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="void" name="arg1"/>
+          <parameter type="void" name="arg1" />
         </parameters>
       </callback>
       <callback cname="gtk_reserved3">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="void" name="arg1"/>
+          <parameter type="void" name="arg1" />
         </parameters>
       </callback>
       <callback cname="gtk_reserved4">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="void" name="arg1"/>
+          <parameter type="void" name="arg1" />
         </parameters>
       </callback>
       <implements>
-        <interface cname="GalagoGtkContactChooser"/>
+        <interface cname="GalagoGtkContactChooser" />
       </implements>
       <method name="GetType" cname="galago_gtk_contact_chooser_dialog_get_type" shared="true">
-        <return-type type="GType"/>
+        <return-type type="GType" />
       </method>
       <constructor cname="galago_gtk_contact_chooser_dialog_new">
         <parameters>
-          <parameter type="const-gchar*" name="title"/>
-          <parameter type="GtkWindow*" name="parent"/>
-          <parameter type="GalagoGtkContactChooserFlags" name="flags"/>
-          <parameter type="const-gchar*" name="first_button_text"/>
-          <parameter ellipsis="true"/>
+          <parameter type="const-gchar*" name="title" />
+          <parameter type="GtkWindow*" name="parent" />
+          <parameter type="GalagoGtkContactChooserFlags" name="flags" />
+          <parameter type="const-gchar*" name="first_button_text" />
+          <parameter ellipsis="true" />
         </parameters>
       </constructor>
     </object>
     <object name="ContactChooserWidget" cname="GalagoGtkContactChooserWidget" parent="GtkVBox">
-      <field cname="priv" type="GalagoGtkContactChooserWidgetPriv*"/>
+      <field name="Priv" cname="priv" type="GalagoGtkContactChooserWidgetPriv*" />
       <callback cname="gtk_reserved1">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="void" name="arg1"/>
+          <parameter type="void" name="arg1" />
         </parameters>
       </callback>
       <callback cname="gtk_reserved2">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="void" name="arg1"/>
+          <parameter type="void" name="arg1" />
         </parameters>
       </callback>
       <callback cname="gtk_reserved3">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="void" name="arg1"/>
+          <parameter type="void" name="arg1" />
         </parameters>
       </callback>
       <callback cname="gtk_reserved4">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="void" name="arg1"/>
+          <parameter type="void" name="arg1" />
         </parameters>
       </callback>
       <implements>
-        <interface cname="GalagoGtkContactChooser"/>
+        <interface cname="GalagoGtkContactChooser" />
       </implements>
       <method name="GetType" cname="galago_gtk_contact_chooser_widget_get_type" shared="true">
-        <return-type type="GType"/>
+        <return-type type="GType" />
       </method>
-      <constructor cname="galago_gtk_contact_chooser_widget_new"/>
+      <constructor cname="galago_gtk_contact_chooser_widget_new" />
     </object>
     <object name="ContactList" cname="GalagoGtkContactList" parent="GtkTreeView">
-      <field cname="priv" type="GalagoGtkContactListPriv*"/>
+      <field name="Priv" cname="priv" type="GalagoGtkContactListPriv*" />
       <callback cname="gtk_reserved1">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="void" name="arg1"/>
+          <parameter type="void" name="arg1" />
         </parameters>
       </callback>
       <callback cname="gtk_reserved2">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="void" name="arg1"/>
+          <parameter type="void" name="arg1" />
         </parameters>
       </callback>
       <callback cname="gtk_reserved3">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="void" name="arg1"/>
+          <parameter type="void" name="arg1" />
         </parameters>
       </callback>
       <callback cname="gtk_reserved4">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="void" name="arg1"/>
+          <parameter type="void" name="arg1" />
         </parameters>
       </callback>
-      <signal name="Changed" cname="changed" when="LAST">
-        <return-type type="void"/>
+      <signal name="SelectionChanged" cname="selection-changed" when="LAST">
+        <return-type type="void" />
         <parameters>
-          <parameter type="GalagoGtkContactList*" name="contact_list"/>
-          <parameter type="GalagoAccount*" name="account"/>
+          <parameter type="GalagoGtkContactList*" name="contact_list" />
         </parameters>
       </signal>
+      <signal name="ContactActivated" cname="contact-activated" when="LAST">
+        <return-type type="void" />
+        <parameters>
+          <parameter type="GalagoGtkContactList*" name="contact_list" />
+          <parameter type="GalagoAccount*" name="contact" />
+        </parameters>
+      </signal>
+      <method name="AddContact" cname="galago_gtk_contact_list_add_contact">
+        <return-type type="void" />
+        <parameters>
+          <parameter type="GalagoAccount*" name="contact" />
+        </parameters>
+      </method>
+      <method name="Clear" cname="galago_gtk_contact_list_clear">
+        <return-type type="void" />
+      </method>
+      <method name="GetAutoPopulate" cname="galago_gtk_contact_list_get_auto_populate">
+        <return-type type="gboolean" />
+      </method>
       <method name="GetContact" cname="galago_gtk_contact_list_get_contact">
-        <return-type type="GalagoAccount*"/>
+        <return-type type="GalagoAccount*" />
       </method>
+      <method name="GetPerson" cname="galago_gtk_contact_list_get_person">
+        <return-type type="GalagoPerson*" />
+      </method>
       <method name="GetService" cname="galago_gtk_contact_list_get_service">
-        <return-type type="GalagoService*"/>
+        <return-type type="GalagoService*" />
       </method>
       <method name="GetShowOffline" cname="galago_gtk_contact_list_get_show_offline">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
       </method>
       <method name="GetType" cname="galago_gtk_contact_list_get_type" shared="true">
-        <return-type type="GType"/>
+        <return-type type="GType" />
       </method>
-      <constructor cname="galago_gtk_contact_list_new"/>
+      <constructor cname="galago_gtk_contact_list_new">
+        <parameters>
+          <parameter type="gboolean" name="auto_populate" />
+        </parameters>
+      </constructor>
+      <method name="RemoveContact" cname="galago_gtk_contact_list_remove_contact">
+        <return-type type="void" />
+        <parameters>
+          <parameter type="GalagoAccount*" name="contact" />
+        </parameters>
+      </method>
+      <method name="SetAutoPopulate" cname="galago_gtk_contact_list_set_auto_populate">
+        <return-type type="void" />
+        <parameters>
+          <parameter type="gboolean" name="auto_populate" />
+        </parameters>
+      </method>
       <method name="SetContact" cname="galago_gtk_contact_list_set_contact">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GalagoAccount*" name="account"/>
+          <parameter type="GalagoAccount*" name="account" />
         </parameters>
       </method>
+      <method name="SetPerson" cname="galago_gtk_contact_list_set_person">
+        <return-type type="void" />
+        <parameters>
+          <parameter type="GalagoPerson*" name="person" />
+        </parameters>
+      </method>
       <method name="SetService" cname="galago_gtk_contact_list_set_service">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GalagoService*" name="service"/>
+          <parameter type="GalagoService*" name="service" />
         </parameters>
       </method>
       <method name="SetShowOffline" cname="galago_gtk_contact_list_set_show_offline">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="gboolean" name="show_offline"/>
+          <parameter type="gboolean" name="show_offline" />
         </parameters>
       </method>
     </object>
-    <object name="IconEntry" cname="GalagoGtkIconEntry" parent="GtkEntry">
-      <field cname="priv" type="GalagoGtkIconEntryPriv*"/>
+    <object name="ContactPathBar" cname="GalagoGtkContactPathBar" parent="GtkHBox">
+      <field name="Priv" cname="priv" type="GalagoGtkContactPathBarPriv*" />
       <callback cname="gtk_reserved1">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="void" name="arg1"/>
+          <parameter type="void" name="arg1" />
         </parameters>
       </callback>
       <callback cname="gtk_reserved2">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="void" name="arg1"/>
+          <parameter type="void" name="arg1" />
         </parameters>
       </callback>
       <callback cname="gtk_reserved3">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="void" name="arg1"/>
+          <parameter type="void" name="arg1" />
         </parameters>
       </callback>
       <callback cname="gtk_reserved4">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="void" name="arg1"/>
+          <parameter type="void" name="arg1" />
         </parameters>
       </callback>
-      <signal name="IconClicked" cname="icon_clicked" when="LAST">
-        <return-type type="void"/>
+      <signal name="RootActivated" cname="root-activated" when="LAST">
+        <return-type type="void" />
         <parameters>
-          <parameter type="GalagoGtkIconEntry*" name="entry"/>
-          <parameter type="int" name="button"/>
+          <parameter type="GalagoGtkContactPathBar*" name="path_bar" />
         </parameters>
       </signal>
-      <implements>
-        <interface cname="GtkEditable"/>
-      </implements>
-      <method name="GetIcon" cname="galago_gtk_icon_entry_get_icon">
-        <return-type type="GtkWidget*"/>
+      <method name="GetContact" cname="galago_gtk_contact_path_bar_get_contact">
+        <return-type type="GalagoAccount*" />
       </method>
-      <method name="GetIconHighlight" cname="galago_gtk_icon_entry_get_icon_highlight">
-        <return-type type="gboolean"/>
+      <method name="GetPerson" cname="galago_gtk_contact_path_bar_get_person">
+        <return-type type="GalagoPerson*" />
       </method>
-      <method name="GetType" cname="galago_gtk_icon_entry_get_type" shared="true">
-        <return-type type="GType"/>
+      <method name="GetRootType" cname="galago_gtk_contact_path_bar_get_root_type">
+        <return-type type="GalagoGtkContactPathBarRootType" />
       </method>
-      <constructor cname="galago_gtk_icon_entry_new"/>
-      <method name="SetIcon" cname="galago_gtk_icon_entry_set_icon">
-        <return-type type="void"/>
+      <method name="GetService" cname="galago_gtk_contact_path_bar_get_service">
+        <return-type type="GalagoService*" />
+      </method>
+      <method name="GetType" cname="galago_gtk_contact_path_bar_get_type" shared="true">
+        <return-type type="GType" />
+      </method>
+      <constructor cname="galago_gtk_contact_path_bar_new" />
+      <method name="SetContact" cname="galago_gtk_contact_path_bar_set_contact">
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkWidget*" name="icon"/>
+          <parameter type="GalagoAccount*" name="contact" />
         </parameters>
       </method>
-      <method name="SetIconHighlight" cname="galago_gtk_icon_entry_set_icon_highlight">
-        <return-type type="void"/>
+      <method name="SetPerson" cname="galago_gtk_contact_path_bar_set_person">
+        <return-type type="void" />
         <parameters>
-          <parameter type="gboolean" name="highlight"/>
+          <parameter type="GalagoPerson*" name="person" />
         </parameters>
       </method>
+      <method name="SetRootType" cname="galago_gtk_contact_path_bar_set_root_type">
+        <return-type type="void" />
+        <parameters>
+          <parameter type="GalagoGtkContactPathBarRootType" name="root_type" />
+        </parameters>
+      </method>
+      <method name="SetService" cname="galago_gtk_contact_path_bar_set_service">
+        <return-type type="void" />
+        <parameters>
+          <parameter type="GalagoService*" name="service" />
+        </parameters>
+      </method>
     </object>
     <object name="PersonList" cname="GalagoGtkPersonList" parent="GtkTreeView">
-      <field cname="priv" type="GalagoGtkPersonListPriv*"/>
+      <field name="Priv" cname="priv" type="GalagoGtkPersonListPriv*" />
       <callback cname="gtk_reserved1">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="void" name="arg1"/>
+          <parameter type="void" name="arg1" />
         </parameters>
       </callback>
       <callback cname="gtk_reserved2">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="void" name="arg1"/>
+          <parameter type="void" name="arg1" />
         </parameters>
       </callback>
       <callback cname="gtk_reserved3">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="void" name="arg1"/>
+          <parameter type="void" name="arg1" />
         </parameters>
       </callback>
       <callback cname="gtk_reserved4">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="void" name="arg1"/>
+          <parameter type="void" name="arg1" />
         </parameters>
       </callback>
-      <signal name="Changed" cname="changed" when="LAST">
-        <return-type type="void"/>
+      <signal name="SelectionChanged" cname="selection-changed" when="LAST">
+        <return-type type="void" />
         <parameters>
-          <parameter type="GalagoGtkPersonList*" name="person_list"/>
-          <parameter type="GalagoPerson*" name="account"/>
+          <parameter type="GalagoGtkPersonList*" name="person_list" />
         </parameters>
       </signal>
+      <signal name="PersonActivated" cname="person-activated" when="LAST">
+        <return-type type="void" />
+        <parameters>
+          <parameter type="GalagoGtkPersonList*" name="person_list" />
+          <parameter type="GalagoPerson*" name="person" />
+        </parameters>
+      </signal>
       <method name="GetPerson" cname="galago_gtk_person_list_get_person">
-        <return-type type="GalagoPerson*"/>
+        <return-type type="GalagoPerson*" />
       </method>
       <method name="GetShowOffline" cname="galago_gtk_person_list_get_show_offline">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
       </method>
       <method name="GetType" cname="galago_gtk_person_list_get_type" shared="true">
-        <return-type type="GType"/>
+        <return-type type="GType" />
       </method>
-      <constructor cname="galago_gtk_person_list_new"/>
+      <constructor cname="galago_gtk_person_list_new" />
       <method name="SetPerson" cname="galago_gtk_person_list_set_person">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GalagoPerson*" name="account"/>
+          <parameter type="GalagoPerson*" name="account" />
         </parameters>
       </method>
       <method name="SetShowOffline" cname="galago_gtk_person_list_set_show_offline">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="gboolean" name="show_offline"/>
+          <parameter type="gboolean" name="show_offline" />
         </parameters>
       </method>
     </object>
     <object name="PresenceIcon" cname="GalagoGtkPresenceIcon" parent="GtkImage">
-      <field cname="priv" type="GalagoGtkPresenceIconPriv*"/>
+      <field name="Priv" cname="priv" type="GalagoGtkPresenceIconPriv*" />
       <callback cname="gtk_reserved1">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="void" name="arg1"/>
+          <parameter type="void" name="arg1" />
         </parameters>
       </callback>
       <callback cname="gtk_reserved2">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="void" name="arg1"/>
+          <parameter type="void" name="arg1" />
         </parameters>
       </callback>
       <callback cname="gtk_reserved3">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="void" name="arg1"/>
+          <parameter type="void" name="arg1" />
         </parameters>
       </callback>
       <callback cname="gtk_reserved4">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="void" name="arg1"/>
+          <parameter type="void" name="arg1" />
         </parameters>
       </callback>
       <method name="GetAccount" cname="galago_gtk_presence_icon_get_account">
-        <return-type type="GalagoAccount*"/>
+        <return-type type="GalagoAccount*" />
       </method>
       <method name="GetPerson" cname="galago_gtk_presence_icon_get_person">
-        <return-type type="GalagoPerson*"/>
+        <return-type type="GalagoPerson*" />
       </method>
       <method name="GetPrecedence" cname="galago_gtk_presence_icon_get_precedence">
-        <return-type type="GalagoGtkIconPrecedence"/>
+        <return-type type="GalagoGtkIconPrecedence" />
       </method>
       <method name="GetSize" cname="galago_gtk_presence_icon_get_size">
-        <return-type type="GtkIconSize"/>
+        <return-type type="GtkIconSize" />
       </method>
       <method name="GetTooltipText" cname="galago_gtk_presence_icon_get_tooltip_text">
-        <return-type type="char*"/>
+        <return-type type="char*" />
       </method>
       <method name="GetType" cname="galago_gtk_presence_icon_get_type" shared="true">
-        <return-type type="GType"/>
+        <return-type type="GType" />
       </method>
-      <constructor cname="galago_gtk_presence_icon_new"/>
+      <constructor cname="galago_gtk_presence_icon_new" />
       <method name="SetAccount" cname="galago_gtk_presence_icon_set_account">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GalagoAccount*" name="account"/>
+          <parameter type="GalagoAccount*" name="account" />
         </parameters>
       </method>
       <method name="SetPerson" cname="galago_gtk_presence_icon_set_person">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GalagoPerson*" name="person"/>
+          <parameter type="GalagoPerson*" name="person" />
         </parameters>
       </method>
       <method name="SetPrecedence" cname="galago_gtk_presence_icon_set_precedence">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GalagoGtkIconPrecedence" name="precedence"/>
+          <parameter type="GalagoGtkIconPrecedence" name="precedence" />
         </parameters>
       </method>
       <method name="SetSize" cname="galago_gtk_presence_icon_set_size">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkIconSize" name="size"/>
+          <parameter type="GtkIconSize" name="size" />
         </parameters>
       </method>
       <method name="Update" cname="galago_gtk_presence_icon_update">
-        <return-type type="void"/>
+        <return-type type="void" />
       </method>
     </object>
     <object name="PresenceLabel" cname="GalagoGtkPresenceLabel" parent="GtkLabel">
-      <field cname="priv" type="GalagoGtkPresenceLabelPriv*"/>
+      <field name="Priv" cname="priv" type="GalagoGtkPresenceLabelPriv*" />
       <callback cname="gtk_reserved1">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="void" name="arg1"/>
+          <parameter type="void" name="arg1" />
         </parameters>
       </callback>
       <callback cname="gtk_reserved2">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="void" name="arg1"/>
+          <parameter type="void" name="arg1" />
         </parameters>
       </callback>
       <callback cname="gtk_reserved3">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="void" name="arg1"/>
+          <parameter type="void" name="arg1" />
         </parameters>
       </callback>
       <callback cname="gtk_reserved4">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="void" name="arg1"/>
+          <parameter type="void" name="arg1" />
         </parameters>
       </callback>
       <method name="GetAccount" cname="galago_gtk_presence_label_get_account">
-        <return-type type="GalagoAccount*"/>
+        <return-type type="GalagoAccount*" />
       </method>
       <method name="GetDimIdle" cname="galago_gtk_presence_label_get_dim_idle">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
       </method>
       <method name="GetPerson" cname="galago_gtk_presence_label_get_person">
-        <return-type type="GalagoPerson*"/>
+        <return-type type="GalagoPerson*" />
       </method>
       <method name="GetShowIdleTimes" cname="galago_gtk_presence_label_get_show_idle_times">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
       </method>
       <method name="GetType" cname="galago_gtk_presence_label_get_type" shared="true">
-        <return-type type="GType"/>
+        <return-type type="GType" />
       </method>
-      <constructor cname="galago_gtk_presence_label_new"/>
+      <constructor cname="galago_gtk_presence_label_new" />
       <method name="SetAccount" cname="galago_gtk_presence_label_set_account">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GalagoAccount*" name="account"/>
+          <parameter type="GalagoAccount*" name="account" />
         </parameters>
       </method>
       <method name="SetDimIdle" cname="galago_gtk_presence_label_set_dim_idle">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="gboolean" name="dim_idle"/>
+          <parameter type="gboolean" name="dim_idle" />
         </parameters>
       </method>
       <method name="SetPerson" cname="galago_gtk_presence_label_set_person">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GalagoPerson*" name="person"/>
+          <parameter type="GalagoPerson*" name="person" />
         </parameters>
       </method>
       <method name="SetShowIdleTimes" cname="galago_gtk_presence_label_set_show_idle_times">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="gboolean" name="show_idle_times"/>
+          <parameter type="gboolean" name="show_idle_times" />
         </parameters>
       </method>
       <method name="Update" cname="galago_gtk_presence_label_update">
-        <return-type type="void"/>
+        <return-type type="void" />
       </method>
     </object>
     <object name="PresenceMenuItem" cname="GalagoGtkPresenceMenuItem" parent="GtkImageMenuItem">
-      <field cname="priv" type="GalagoGtkPresenceMenuItemPriv*"/>
+      <field name="Priv" cname="priv" type="GalagoGtkPresenceMenuItemPriv*" />
       <callback cname="gtk_reserved1">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="void" name="arg1"/>
+          <parameter type="void" name="arg1" />
         </parameters>
       </callback>
       <callback cname="gtk_reserved2">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="void" name="arg1"/>
+          <parameter type="void" name="arg1" />
         </parameters>
       </callback>
       <callback cname="gtk_reserved3">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="void" name="arg1"/>
+          <parameter type="void" name="arg1" />
         </parameters>
       </callback>
       <callback cname="gtk_reserved4">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="void" name="arg1"/>
+          <parameter type="void" name="arg1" />
         </parameters>
       </callback>
       <method name="GetAccount" cname="galago_gtk_presence_menu_item_get_account">
-        <return-type type="GalagoAccount*"/>
+        <return-type type="GalagoAccount*" />
       </method>
       <method name="GetDimIdle" cname="galago_gtk_presence_menu_item_get_dim_idle">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
       </method>
       <method name="GetPerson" cname="galago_gtk_presence_menu_item_get_person">
-        <return-type type="GalagoPerson*"/>
+        <return-type type="GalagoPerson*" />
       </method>
       <method name="GetShowIdleTimes" cname="galago_gtk_presence_menu_item_get_show_idle_times">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
       </method>
       <method name="GetType" cname="galago_gtk_presence_menu_item_get_type" shared="true">
-        <return-type type="GType"/>
+        <return-type type="GType" />
       </method>
       <constructor cname="galago_gtk_presence_menu_item_new">
         <parameters>
-          <parameter type="GalagoAccount*" name="account"/>
+          <parameter type="GalagoAccount*" name="account" />
         </parameters>
       </constructor>
       <method name="SetAccount" cname="galago_gtk_presence_menu_item_set_account">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GalagoAccount*" name="account"/>
+          <parameter type="GalagoAccount*" name="account" />
         </parameters>
       </method>
       <method name="SetDimIdle" cname="galago_gtk_presence_menu_item_set_dim_idle">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="gboolean" name="dim_idle"/>
+          <parameter type="gboolean" name="dim_idle" />
         </parameters>
       </method>
       <method name="SetPerson" cname="galago_gtk_presence_menu_item_set_person">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GalagoPerson*" name="person"/>
+          <parameter type="GalagoPerson*" name="person" />
         </parameters>
       </method>
       <method name="SetShowIdleTimes" cname="galago_gtk_presence_menu_item_set_show_idle_times">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="gboolean" name="show_idle_times"/>
+          <parameter type="gboolean" name="show_idle_times" />
         </parameters>
       </method>
     </object>
     <object name="ServiceComboBox" cname="GalagoGtkServiceComboBox" parent="GtkComboBox">
-      <field cname="priv" type="GalagoGtkServiceComboBoxPriv*"/>
+      <field name="Priv" cname="priv" type="GalagoGtkServiceComboBoxPriv*" />
       <callback cname="gtk_reserved1">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="void" name="arg1"/>
+          <parameter type="void" name="arg1" />
         </parameters>
       </callback>
       <callback cname="gtk_reserved2">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="void" name="arg1"/>
+          <parameter type="void" name="arg1" />
         </parameters>
       </callback>
       <callback cname="gtk_reserved3">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="void" name="arg1"/>
+          <parameter type="void" name="arg1" />
         </parameters>
       </callback>
       <callback cname="gtk_reserved4">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="void" name="arg1"/>
+          <parameter type="void" name="arg1" />
         </parameters>
       </callback>
       <signal name="ServiceChanged" cname="service_changed" when="LAST">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GalagoGtkServiceComboBox*" name="list"/>
-          <parameter type="GalagoService*" name="service"/>
+          <parameter type="GalagoGtkServiceComboBox*" name="list" />
+          <parameter type="GalagoService*" name="service" />
         </parameters>
       </signal>
       <method name="GetActive" cname="galago_gtk_service_combo_box_get_active">
-        <return-type type="GalagoService*"/>
+        <return-type type="GalagoService*" />
       </method>
       <method name="GetType" cname="galago_gtk_service_combo_box_get_type" shared="true">
-        <return-type type="GType"/>
+        <return-type type="GType" />
       </method>
-      <constructor cname="galago_gtk_service_combo_box_new"/>
+      <constructor cname="galago_gtk_service_combo_box_new" />
       <method name="SetActive" cname="galago_gtk_service_combo_box_set_active">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="const-GalagoService*" name="service"/>
+          <parameter type="const-GalagoService*" name="service" />
         </parameters>
       </method>
     </object>
     <object name="ServiceList" cname="GalagoGtkServiceList" parent="GtkTreeView">
-      <field cname="priv" type="GalagoGtkServiceListPriv*"/>
+      <field name="Priv" cname="priv" type="GalagoGtkServiceListPriv*" />
       <callback cname="gtk_reserved1">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="void" name="arg1"/>
+          <parameter type="void" name="arg1" />
         </parameters>
       </callback>
       <callback cname="gtk_reserved2">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="void" name="arg1"/>
+          <parameter type="void" name="arg1" />
         </parameters>
       </callback>
       <callback cname="gtk_reserved3">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="void" name="arg1"/>
+          <parameter type="void" name="arg1" />
         </parameters>
       </callback>
       <callback cname="gtk_reserved4">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="void" name="arg1"/>
+          <parameter type="void" name="arg1" />
         </parameters>
       </callback>
-      <signal name="Changed" cname="changed" when="LAST">
-        <return-type type="void"/>
+      <signal name="SelectionChanged" cname="selection-changed" when="LAST">
+        <return-type type="void" />
         <parameters>
-          <parameter type="GalagoGtkServiceList*" name="service_list"/>
-          <parameter type="GalagoGtkServiceListItemType" name="type"/>
-          <parameter type="GalagoService*" name="service"/>
+          <parameter type="GalagoGtkServiceList*" name="service_list" />
         </parameters>
       </signal>
+      <signal name="ServiceActivated" cname="service-activated" when="LAST">
+        <return-type type="void" />
+        <parameters>
+          <parameter type="GalagoGtkServiceList*" name="service_list" />
+          <parameter type="GalagoGtkServiceListItemType" name="type" />
+          <parameter type="GalagoService*" name="service" />
+        </parameters>
+      </signal>
+      <method name="GetItemType" cname="galago_gtk_service_list_get_item_type">
+        <return-type type="GalagoGtkServiceListItemType" />
+      </method>
       <method name="GetService" cname="galago_gtk_service_list_get_service">
-        <return-type type="GalagoService*"/>
+        <return-type type="GalagoService*" />
       </method>
       <method name="GetType" cname="galago_gtk_service_list_get_type" shared="true">
-        <return-type type="GType"/>
+        <return-type type="GType" />
       </method>
-      <constructor cname="galago_gtk_service_list_new"/>
+      <constructor cname="galago_gtk_service_list_new" />
       <method name="SetItemType" cname="galago_gtk_service_list_set_item_type">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GalagoGtkServiceListItemType" name="type"/>
+          <parameter type="GalagoGtkServiceListItemType" name="type" />
         </parameters>
       </method>
       <method name="SetService" cname="galago_gtk_service_list_set_service">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GalagoService*" name="service"/>
+          <parameter type="GalagoService*" name="service" />
         </parameters>
       </method>
       <method name="SetShowAllContacts" cname="galago_gtk_service_list_set_show_all_contacts">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="gboolean" name="show_all_contacts"/>
+          <parameter type="gboolean" name="show_all_contacts" />
         </parameters>
       </method>
       <method name="SetShowPeople" cname="galago_gtk_service_list_set_show_people">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="gboolean" name="show_people"/>
+          <parameter type="gboolean" name="show_people" />
         </parameters>
       </method>
       <method name="SetValidServices" cname="galago_gtk_service_list_set_valid_services">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GList*" name="services"/>
+          <parameter type="GList*" name="services" />
         </parameters>
       </method>
     </object>
     <object name="ServiceMenuItem" cname="GalagoGtkServiceMenuItem" parent="GtkImageMenuItem">
-      <field cname="priv" type="GalagoGtkServiceMenuItemPriv*"/>
+      <field name="Priv" cname="priv" type="GalagoGtkServiceMenuItemPriv*" />
       <callback cname="gtk_reserved1">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="void" name="arg1"/>
+          <parameter type="void" name="arg1" />
         </parameters>
       </callback>
       <callback cname="gtk_reserved2">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="void" name="arg1"/>
+          <parameter type="void" name="arg1" />
         </parameters>
       </callback>
       <callback cname="gtk_reserved3">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="void" name="arg1"/>
+          <parameter type="void" name="arg1" />
         </parameters>
       </callback>
       <callback cname="gtk_reserved4">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="void" name="arg1"/>
+          <parameter type="void" name="arg1" />
         </parameters>
       </callback>
       <method name="GetService" cname="galago_gtk_service_menu_item_get_service">
-        <return-type type="GalagoService*"/>
+        <return-type type="GalagoService*" />
       </method>
       <method name="GetType" cname="galago_gtk_service_menu_item_get_type" shared="true">
-        <return-type type="GType"/>
+        <return-type type="GType" />
       </method>
       <constructor cname="galago_gtk_service_menu_item_new">
         <parameters>
-          <parameter type="GalagoService*" name="service"/>
+          <parameter type="GalagoService*" name="service" />
         </parameters>
       </constructor>
       <method name="SetService" cname="galago_gtk_service_menu_item_set_service">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GalagoService*" name="service"/>
+          <parameter type="GalagoService*" name="service" />
         </parameters>
       </method>
     </object>
-    <object name="ServiceOptionMenu" cname="GalagoGtkServiceOptionMenu" parent="GtkOptionMenu">
-      <field cname="priv" type="GalagoGtkServiceOptionMenuPriv*"/>
-      <callback cname="gtk_reserved1">
-        <return-type type="void"/>
+    <struct name="AccountComboBoxPriv" cname="GalagoGtkAccountComboBoxPriv" opaque="true" />
+    <struct name="AccountLabelPriv" cname="GalagoGtkAccountLabelPriv" opaque="true" />
+    <struct name="AccountMenuItemPriv" cname="GalagoGtkAccountMenuItemPriv" opaque="true" />
+    <struct name="ContactChooserDialogPriv" cname="GalagoGtkContactChooserDialogPriv" opaque="true" />
+    <struct name="ContactChooserWidgetPriv" cname="GalagoGtkContactChooserWidgetPriv" opaque="true" />
+    <struct name="ContactListPriv" cname="GalagoGtkContactListPriv" opaque="true" />
+    <struct name="ContactPathBarPriv" cname="GalagoGtkContactPathBarPriv" opaque="true" />
+    <struct name="PersonListPriv" cname="GalagoGtkPersonListPriv" opaque="true" />
+    <struct name="PresenceIconPriv" cname="GalagoGtkPresenceIconPriv" opaque="true" />
+    <struct name="PresenceLabelPriv" cname="GalagoGtkPresenceLabelPriv" opaque="true" />
+    <struct name="PresenceMenuItemPriv" cname="GalagoGtkPresenceMenuItemPriv" opaque="true" />
+    <struct name="ServiceComboBoxPriv" cname="GalagoGtkServiceComboBoxPriv" opaque="true" />
+    <struct name="ServiceListPriv" cname="GalagoGtkServiceListPriv" opaque="true" />
+    <struct name="ServiceMenuItemPriv" cname="GalagoGtkServiceMenuItemPriv" opaque="true" />
+    <class name="Entry" cname="GalagoGtkEntry_">
+      <method name="CompletionNewWithAccounts" cname="galago_gtk_entry_completion_new_with_accounts" shared="true">
+        <return-type type="GtkEntryCompletion*" />
         <parameters>
-          <parameter type="void" name="arg1"/>
+          <parameter type="const-GalagoService*" name="service" />
+          <parameter type="gboolean" name="query" />
         </parameters>
-      </callback>
-      <callback cname="gtk_reserved2">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="void" name="arg1"/>
-        </parameters>
-      </callback>
-      <callback cname="gtk_reserved3">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="void" name="arg1"/>
-        </parameters>
-      </callback>
-      <callback cname="gtk_reserved4">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="void" name="arg1"/>
-        </parameters>
-      </callback>
-      <signal name="ServiceChanged" cname="service_changed" when="LAST">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GalagoGtkServiceOptionMenu*" name="list"/>
-          <parameter type="GalagoService*" name="service"/>
-        </parameters>
-      </signal>
-      <method name="GetActive" cname="galago_gtk_service_option_menu_get_active">
-        <return-type type="GalagoService*"/>
       </method>
-      <method name="GetType" cname="galago_gtk_service_option_menu_get_type" shared="true">
-        <return-type type="GType"/>
-      </method>
-      <constructor cname="galago_gtk_service_option_menu_new"/>
-      <method name="SetActive" cname="galago_gtk_service_option_menu_set_active">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="const-GalagoService*" name="service"/>
-        </parameters>
-      </method>
-    </object>
-    <object name="Tooltips" cname="GalagoGtkTooltips" parent="GtkObject">
-      <field cname="tip_window" type="GtkWidget*"/>
-      <field cname="tip_label" type="GtkWidget*"/>
-      <field cname="active_tips_data" type="GalagoGtkTooltipsData*"/>
-      <field cname="tips_data_list" type="GList*"/>
-      <field cname="delay" bits="30" type="guint"/>
-      <field cname="enabled" bits="1" type="guint"/>
-      <field cname="have_grab" bits="1" type="guint"/>
-      <field cname="use_sticky_delay" bits="1" type="guint"/>
-      <field cname="timer_tag" type="gint"/>
-      <field cname="last_popdown" type="GTimeVal"/>
-      <method name="Disable" cname="galago_gtk_tooltips_disable">
-        <return-type type="void"/>
-      </method>
-      <method name="Enable" cname="galago_gtk_tooltips_enable">
-        <return-type type="void"/>
-      </method>
-      <method name="ForceWindow" cname="galago_gtk_tooltips_force_window">
-        <return-type type="void"/>
-      </method>
-      <method name="GetType" cname="galago_gtk_tooltips_get_type" shared="true">
-        <return-type type="GType"/>
-      </method>
-      <constructor cname="galago_gtk_tooltips_new"/>
-      <method name="SetTip" cname="galago_gtk_tooltips_set_tip">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GtkWidget*" name="widget"/>
-          <parameter type="const-gchar*" name="tip_text"/>
-          <parameter type="const-gchar*" name="tip_private"/>
-        </parameters>
-      </method>
-      <method name="SetTipFunc" cname="galago_gtk_tooltips_set_tip_func">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GtkWidget*" name="widget"/>
-          <parameter type="GalagoGtkTooltipFunc" name="func"/>
-          <parameter type="GtkWidget*" name="func_widget"/>
-        </parameters>
-      </method>
-    </object>
-    <struct name="AccountComboBoxPriv" cname="GalagoGtkAccountComboBoxPriv" opaque="true"/>
-    <struct name="AccountLabelPriv" cname="GalagoGtkAccountLabelPriv" opaque="true"/>
-    <struct name="AccountMenuItemPriv" cname="GalagoGtkAccountMenuItemPriv" opaque="true"/>
-    <struct name="AccountOptionMenuPriv" cname="GalagoGtkAccountOptionMenuPriv" opaque="true"/>
-    <struct name="ContactChooserDialogPriv" cname="GalagoGtkContactChooserDialogPriv" opaque="true"/>
-    <struct name="ContactChooserWidgetPriv" cname="GalagoGtkContactChooserWidgetPriv" opaque="true"/>
-    <struct name="ContactListPriv" cname="GalagoGtkContactListPriv" opaque="true"/>
-    <struct name="IconEntryPriv" cname="GalagoGtkIconEntryPriv" opaque="true"/>
-    <struct name="PersonListPriv" cname="GalagoGtkPersonListPriv" opaque="true"/>
-    <struct name="PresenceIconPriv" cname="GalagoGtkPresenceIconPriv" opaque="true"/>
-    <struct name="PresenceLabelPriv" cname="GalagoGtkPresenceLabelPriv" opaque="true"/>
-    <struct name="PresenceMenuItemPriv" cname="GalagoGtkPresenceMenuItemPriv" opaque="true"/>
-    <struct name="ServiceComboBoxPriv" cname="GalagoGtkServiceComboBoxPriv" opaque="true"/>
-    <struct name="ServiceListPriv" cname="GalagoGtkServiceListPriv" opaque="true"/>
-    <struct name="ServiceMenuItemPriv" cname="GalagoGtkServiceMenuItemPriv" opaque="true"/>
-    <struct name="ServiceOptionMenuPriv" cname="GalagoGtkServiceOptionMenuPriv" opaque="true"/>
-    <struct name="TooltipsData" cname="GalagoGtkTooltipsData">
-      <field cname="tooltips" type="GalagoGtkTooltips*"/>
-      <field cname="widget" type="GtkWidget*"/>
-      <field cname="tip_text" type="gchar*"/>
-      <field cname="tip_private" type="gchar*"/>
-      <field cname="tip_func" type="GalagoGtkTooltipFunc"/>
-      <field cname="tip_func_widget" type="GtkWidget*"/>
-      <method name="Get" cname="galago_gtk_tooltips_data_get" shared="true">
-        <return-type type="GalagoGtkTooltipsData*"/>
-        <parameters>
-          <parameter type="GtkWidget*" name="widget"/>
-        </parameters>
-      </method>
-    </struct>
-    <class name="Entry" cname="GalagoGtkEntry_">
       <method name="CompletionNewWithContacts" cname="galago_gtk_entry_completion_new_with_contacts" shared="true">
-        <return-type type="GtkEntryCompletion*"/>
+        <return-type type="GtkEntryCompletion*" />
         <parameters>
-          <parameter type="const-GalagoAccount*" name="account"/>
-          <parameter type="gboolean" name="query"/>
+          <parameter type="const-GalagoAccount*" name="account" />
+          <parameter type="gboolean" name="query" />
         </parameters>
       </method>
       <method name="CompletionNewWithServices" cname="galago_gtk_entry_completion_new_with_services" shared="true">
-        <return-type type="GtkEntryCompletion*"/>
+        <return-type type="GtkEntryCompletion*" />
         <parameters>
-          <parameter type="gboolean" name="query"/>
+          <parameter type="gboolean" name="query" />
         </parameters>
       </method>
     </class>
     <class name="Global" cname="GalagoGtkGlobal">
       <method name="StockInit" cname="galago_gtk_stock_init" shared="true">
-        <return-type type="void"/>
+        <return-type type="void" />
       </method>
     </class>
     <object name="Stock" cname="GalagoGtkStock">
-      <static-string cname="GALAGO_GTK_STOCK_PERSON" name="Person" value="galago-gtk-stock-person"/>
+      <static-string cname="GALAGO_GTK_STOCK_PERSON" name="Person" value="galago-gtk-stock-person" />
     </object>
   </namespace>
-</api>
+</api>
\ No newline at end of file

Modified: trunk/galago-gtk-sharp/galago-gtk/galago-gtk-sharp.metadata
===================================================================
--- trunk/galago-gtk-sharp/galago-gtk/galago-gtk-sharp.metadata	2006-03-24 10:00:13 UTC (rev 2627)
+++ trunk/galago-gtk-sharp/galago-gtk/galago-gtk-sharp.metadata	2006-03-24 10:05:40 UTC (rev 2628)
@@ -1,7 +1,6 @@
 <?xml version="1.0"?>
 
 <metadata>
- <attr path="/api/namespace/object[@cname='GalagoGtkAccountComboBox']" name="hidden">1</attr>
  <attr path="/api/namespace/struct[@cname='GalagoGtkAccountComboBoxPriv']" name="hidden">1</attr>
 
  <attr path="/api/namespace/object[@cname='GalagoGtkAccountLabel']/method[@name='SetAccount']/*/*[@type='GalagoAccount*']" name="null_ok">1</attr>
@@ -11,11 +10,11 @@
  <attr path="/api/namespace/object[@cname='GalagoGtkAccountMenuItem']/method[@name='SetAccount']/*/*[@type='GalagoAccount*']" name="null_ok">1</attr>
  <attr path="/api/namespace/struct[@cname='GalagoGtkAccountMenuItemPriv']" name="hidden">1</attr>
 
- <attr path="/api/namespace/object[@cname='GalagoGtkAccountOptionMenu']/method[@name='SetActive']/*/*[@type='const-GalagoAccount*']" name="null_ok">1</attr>
- <attr path="/api/namespace/object[@cname='GalagoGtkAccountOptionMenu']/method[@name='SetPerson']/*/*[@type='GalagoPerson*']" name="null_ok">1</attr>
- <attr path="/api/namespace/object[@cname='GalagoGtkAccountOptionMenu']/method[@name='SetService']/*/*[@type='GalagoService*']" name="null_ok">1</attr>
- <attr path="/api/namespace/object[@cname='GalagoGtkAccountOptionMenu']/method[@name='SetServicesOptionMenu']/*/*[@type='GtkWidget*']" name="null_ok">1</attr>
- <attr path="/api/namespace/struct[@cname='GalagoGtkAccountOptionMenuPriv']" name="hidden">1</attr>
+ <attr path="/api/namespace/object[@cname='GalagoGtkAccountComboBox']/method[@name='SetActive']/*/*[@type='const-GalagoAccount*']" name="null_ok">1</attr>
+ <attr path="/api/namespace/object[@cname='GalagoGtkAccountComboBox']/method[@name='SetPerson']/*/*[@type='GalagoPerson*']" name="null_ok">1</attr>
+ <attr path="/api/namespace/object[@cname='GalagoGtkAccountComboBox']/method[@name='SetService']/*/*[@type='GalagoService*']" name="null_ok">1</attr>
+ <attr path="/api/namespace/object[@cname='GalagoGtkAccountComboBox']/method[@name='SetServicesComboBox']/*/*[@type='GtkWidget*']" name="null_ok">1</attr>
+ <attr path="/api/namespace/struct[@cname='GalagoGtkAccountComboBoxPriv']" name="hidden">1</attr>
 
  <attr path="/api/namespace/struct[@cname='GalagoGtkContactChooserDialogPriv']" name="hidden">1</attr>
 
@@ -47,7 +46,6 @@
  <attr path="/api/namespace/object[@cname='GalagoGtkPresenceMenuItem']/method[@name='SetPerson']/*/*[@type='GalagoPerson*']" name="null_ok">1</attr>
  <attr path="/api/namespace/struct[@cname='GalagoGtkPresenceMenuItemPriv']" name="hidden">1</attr>
 
- <attr path="/api/namespace/object[@cname='GalagoGtkServiceComboBox']" name="hidden">1</attr>
  <attr path="/api/namespace/struct[@cname='GalagoGtkServiceComboBoxPriv']" name="hidden">1</attr>
 
  <attr path="/api/namespace/struct[@cname='GalagoGtkServiceListPriv']" name="hidden">1</attr>
@@ -55,8 +53,8 @@
  <attr path="/api/namespace/object[@cname='GalagoGtkServiceMenuItem']/method[@name='SetService']/*/*[@type='GalagoService*']" name="null_ok">1</attr>
  <attr path="/api/namespace/struct[@cname='GalagoGtkServiceMenuItemPriv']" name="hidden">1</attr>
 
- <attr path="/api/namespace/object[@cname='GalagoGtkServiceOptionMenu']/method[@name='SetActive']/*/*[@type='const-GalagoService*']" name="null_ok">1</attr>
- <attr path="/api/namespace/struct[@cname='GalagoGtkServiceOptionMenuPriv']" name="hidden">1</attr>
+ <attr path="/api/namespace/object[@cname='GalagoGtkServiceComboBox']/method[@name='SetActive']/*/*[@type='const-GalagoService*']" name="null_ok">1</attr>
+ <attr path="/api/namespace/struct[@cname='GalagoGtkServiceComboBoxPriv']" name="hidden">1</attr>
 
  <attr path="/api/namespace/class[@name='Global']" name="hidden">1</attr>
 </metadata>

Modified: trunk/galago-gtk-sharp/sources/Makefile.am
===================================================================
--- trunk/galago-gtk-sharp/sources/Makefile.am	2006-03-24 10:00:13 UTC (rev 2627)
+++ trunk/galago-gtk-sharp/sources/Makefile.am	2006-03-24 10:05:40 UTC (rev 2628)
@@ -2,7 +2,7 @@
 
 SVN_URL = http://svn.galago-project.org/trunk/libgalago-gtk
 
-LIBGALAGO_GTK_VERSION=0.3.2
+LIBGALAGO_GTK_VERSION=0.5.0
 TARBALL_URL=http://www.galago-project.org/files/releases/source
 TARBALL_DIR=libgalago-gtk-$(LIBGALAGO_GTK_VERSION)
 TARBALL_NAME=$(TARBALL_DIR).tar.gz
@@ -14,7 +14,7 @@
 endif
 
 all: $(GET_METHOD)
-	gapi-parser $(srcdir)/$(source)
+	gapi2-parser $(srcdir)/$(source)
 
 get-from-tarball:
 	if test ! -d libgalago-gtk; then \

Modified: trunk/galago-gtk-sharp/tests/test-presence-icon.cs
===================================================================
--- trunk/galago-gtk-sharp/tests/test-presence-icon.cs	2006-03-24 10:00:13 UTC (rev 2627)
+++ trunk/galago-gtk-sharp/tests/test-presence-icon.cs	2006-03-24 10:05:40 UTC (rev 2628)
@@ -9,9 +9,9 @@
 	public class TestPresenceIcon
 	{
 		private Button presenceButton;
-		private IconEntry userEntry;
-		private AccountOptionMenu accountList;
-		private ServiceOptionMenu serviceList;
+		private Entry userEntry;
+		private AccountComboBox accountList;
+		private ServiceComboBox serviceList;
 		private PresenceIcon presenceIconLarge;
 		private PresenceIcon presenceIconSmall;
 
@@ -58,27 +58,24 @@
 
 			/* Add the Service box */
 			hbox = AddBox(vbox, sg, "_Service:");
-			serviceList = new ServiceOptionMenu();
+			serviceList = new ServiceComboBox();
 			hbox.PackStart(serviceList, true, true, 0);
 
 			/* Add the Account box */
 			hbox = AddBox(vbox, sg, "_Account:");
-			accountList = new AccountOptionMenu(true);
-			accountList.ServicesOptionMenu = serviceList;
+			accountList = new AccountComboBox(true);
+			accountList.ServicesComboBox = serviceList;
 			hbox.PackStart(accountList, true, true, 0);
 
 			/* Add the user entry */
 			hbox = AddBox(vbox, sg, "_User:");
-			userEntry = new IconEntry();
+			userEntry = new Entry();
 			hbox.PackStart(userEntry, true, true, 0);
 
 			presenceIconSmall = new PresenceIcon();
 			presenceIconSmall.Size = Gtk.IconSize.Menu;
 			presenceIconLarge.Precedence = IconPrecedence.Generic;
 
-			userEntry.Icon = presenceIconSmall;
-			userEntry.IconHighlight = true;
-
 			userEntry.Changed += new EventHandler(User_Changed);
 
 			/* "Show Protocol Icon" checkbox */



More information about the galago-commits mailing list