[Galago-commits] r2634 - in trunk/galago-gtk-sharp: . galago-gtk
sources tests
galago-commits at freedesktop.org
galago-commits at freedesktop.org
Mon Mar 27 12:06:03 PST 2006
Author: chipx86
Date: 2006-03-27 12:05:37 -0800 (Mon, 27 Mar 2006)
New Revision: 2634
Modified:
trunk/galago-gtk-sharp/ChangeLog
trunk/galago-gtk-sharp/galago-gtk/Makefile.am
trunk/galago-gtk-sharp/galago-gtk/galago-gtk-api.raw
trunk/galago-gtk-sharp/sources/galago-gtk-sharp-sources.xml.in
trunk/galago-gtk-sharp/tests/Makefile.am
trunk/galago-gtk-sharp/tests/test-chooser.cs
trunk/galago-gtk-sharp/tests/test-presence-icon.cs
Log:
- Change the namespace to Galago.Gtk.
- Fix up the test programs to compile.
Modified: trunk/galago-gtk-sharp/ChangeLog
===================================================================
--- trunk/galago-gtk-sharp/ChangeLog 2006-03-27 20:04:55 UTC (rev 2633)
+++ trunk/galago-gtk-sharp/ChangeLog 2006-03-27 20:05:37 UTC (rev 2634)
@@ -1,3 +1,14 @@
+Mon Mar 27 12:05:01 PST 2006 Christian Hammond <chipx86 at chipx86.com>
+
+ * galago-gtk/galago-gtk-api.raw:
+ * galago-gtk/Makefile.am:
+ * sources/galago-gtk-sharp-sources.xml.in:
+ * tests/Makefile.am:
+ * tests/test-chooser.cs:
+ * tests/test-presence-icon.cs:
+ - Change the namespace to Galago.Gtk.
+ - Fix up the test programs to compile.
+
Sat Mar 25 17:26:10 PST 2006 Christian Hammond <chipx86 at chipx86.com>
* galago-gtk/galago-gtk-sharp.metadata:
Modified: trunk/galago-gtk-sharp/galago-gtk/Makefile.am
===================================================================
--- trunk/galago-gtk-sharp/galago-gtk/Makefile.am 2006-03-27 20:04:55 UTC (rev 2633)
+++ trunk/galago-gtk-sharp/galago-gtk/Makefile.am 2006-03-27 20:05:37 UTC (rev 2634)
@@ -45,7 +45,7 @@
$(sources)
$(API): $(srcdir)/$(RAW_API) $(srcdir)/$(METADATA)
- cp $(srcdir)/$(RAW_API) $(API)
+ sed -e 's/ name="GalagoGtk/ name="/g' $(srcdir)/$(RAW_API) > $(API)
chmod u+w $(API)
$(GAPI_FIXUP) --api=$(API) --metadata=$(srcdir)/$(METADATA)
@@ -53,6 +53,7 @@
rm -f generated/* && \
$(GAPI_CODEGEN) --generate $(API) \
--include $(INCLUDE_API) --outdir=generated --customdir=$(srcdir) --assembly-name=$(ASSEMBLY_NAME) \
+ && sed -e 's/\(namespace Galago.Gtk\)/using gtk = Gtk;\n\n\1/' -e 's/\(\t\| \|(\)Gtk\./\1gtk./g' -i generated/*.cs \
&& touch generated-stamp
$(ASSEMBLY): $(build_sources) generated-stamp galago-gtk-sharp.snk
Modified: trunk/galago-gtk-sharp/galago-gtk/galago-gtk-api.raw
===================================================================
--- trunk/galago-gtk-sharp/galago-gtk/galago-gtk-api.raw 2006-03-27 20:04:55 UTC (rev 2633)
+++ trunk/galago-gtk-sharp/galago-gtk/galago-gtk-api.raw 2006-03-27 20:05:37 UTC (rev 2634)
@@ -6,30 +6,30 @@
Please DO NOT MODIFY THIS FILE, modify .metadata files instead.
-->
- <namespace name="GalagoGtk" library="libgalago-gtk">
- <enum name="ContactChooserFlags" cname="GalagoGtkContactChooserFlags" type="enum">
+ <namespace name="Galago.Gtk" library="libgalago-gtk">
+ <enum name="GalagoGtkContactChooserFlags" 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" />
</enum>
- <enum name="ContactPathBarRootType" cname="GalagoGtkContactPathBarRootType" type="enum">
+ <enum name="GalagoGtkContactPathBarRootType" 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">
+ <enum name="GalagoGtkIconPrecedence" 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" />
</enum>
- <enum name="ServiceListItemType" cname="GalagoGtkServiceListItemType" type="enum">
+ <enum name="GalagoGtkServiceListItemType" 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" />
</enum>
- <interface name="ContactChooser" cname="GalagoGtkContactChooser">
+ <interface name="GalagoGtkContactChooser" cname="GalagoGtkContactChooser">
<signal name="SelectionChanged" cname="selection-changed" when="LAST">
<return-type type="void" />
<parameters>
@@ -116,7 +116,7 @@
</parameters>
</method>
</interface>
- <object name="AccountComboBox" cname="GalagoGtkAccountComboBox" parent="GtkComboBox">
+ <object name="GalagoGtkAccountComboBox" cname="GalagoGtkAccountComboBox" parent="GtkComboBox">
<field name="Priv" cname="priv" type="GalagoGtkAccountComboBoxPriv*" />
<callback cname="gtk_reserved1">
<return-type type="void" />
@@ -194,7 +194,7 @@
</parameters>
</method>
</object>
- <object name="AccountLabel" cname="GalagoGtkAccountLabel" parent="GtkLabel">
+ <object name="GalagoGtkAccountLabel" cname="GalagoGtkAccountLabel" parent="GtkLabel">
<field name="Priv" cname="priv" type="GalagoGtkAccountLabelPriv*" />
<callback cname="gtk_reserved1">
<return-type type="void" />
@@ -234,7 +234,7 @@
</parameters>
</method>
</object>
- <object name="AccountMenuItem" cname="GalagoGtkAccountMenuItem" parent="GtkImageMenuItem">
+ <object name="GalagoGtkAccountMenuItem" cname="GalagoGtkAccountMenuItem" parent="GtkImageMenuItem">
<field name="Priv" cname="priv" type="GalagoGtkAccountMenuItemPriv*" />
<callback cname="gtk_reserved1">
<return-type type="void" />
@@ -278,7 +278,7 @@
</parameters>
</method>
</object>
- <object name="ContactChooserDialog" cname="GalagoGtkContactChooserDialog" parent="GtkDialog">
+ <object name="GalagoGtkContactChooserDialog" cname="GalagoGtkContactChooserDialog" parent="GtkDialog">
<field name="Priv" cname="priv" type="GalagoGtkContactChooserDialogPriv*" />
<callback cname="gtk_reserved1">
<return-type type="void" />
@@ -320,7 +320,7 @@
</parameters>
</constructor>
</object>
- <object name="ContactChooserWidget" cname="GalagoGtkContactChooserWidget" parent="GtkVBox">
+ <object name="GalagoGtkContactChooserWidget" cname="GalagoGtkContactChooserWidget" parent="GtkVBox">
<field name="Priv" cname="priv" type="GalagoGtkContactChooserWidgetPriv*" />
<callback cname="gtk_reserved1">
<return-type type="void" />
@@ -354,7 +354,7 @@
</method>
<constructor cname="galago_gtk_contact_chooser_widget_new" />
</object>
- <object name="ContactList" cname="GalagoGtkContactList" parent="GtkTreeView">
+ <object name="GalagoGtkContactList" cname="GalagoGtkContactList" parent="GtkTreeView">
<field name="Priv" cname="priv" type="GalagoGtkContactListPriv*" />
<callback cname="gtk_reserved1">
<return-type type="void" />
@@ -462,7 +462,7 @@
</parameters>
</method>
</object>
- <object name="ContactPathBar" cname="GalagoGtkContactPathBar" parent="GtkHBox">
+ <object name="GalagoGtkContactPathBar" cname="GalagoGtkContactPathBar" parent="GtkHBox">
<field name="Priv" cname="priv" type="GalagoGtkContactPathBarPriv*" />
<callback cname="gtk_reserved1">
<return-type type="void" />
@@ -535,7 +535,7 @@
</parameters>
</method>
</object>
- <object name="PersonList" cname="GalagoGtkPersonList" parent="GtkTreeView">
+ <object name="GalagoGtkPersonList" cname="GalagoGtkPersonList" parent="GtkTreeView">
<field name="Priv" cname="priv" type="GalagoGtkPersonListPriv*" />
<callback cname="gtk_reserved1">
<return-type type="void" />
@@ -597,7 +597,7 @@
</parameters>
</method>
</object>
- <object name="PresenceIcon" cname="GalagoGtkPresenceIcon" parent="GtkImage">
+ <object name="GalagoGtkPresenceIcon" cname="GalagoGtkPresenceIcon" parent="GtkImage">
<field name="Priv" cname="priv" type="GalagoGtkPresenceIconPriv*" />
<callback cname="gtk_reserved1">
<return-type type="void" />
@@ -670,7 +670,7 @@
<return-type type="void" />
</method>
</object>
- <object name="PresenceLabel" cname="GalagoGtkPresenceLabel" parent="GtkLabel">
+ <object name="GalagoGtkPresenceLabel" cname="GalagoGtkPresenceLabel" parent="GtkLabel">
<field name="Priv" cname="priv" type="GalagoGtkPresenceLabelPriv*" />
<callback cname="gtk_reserved1">
<return-type type="void" />
@@ -740,7 +740,7 @@
<return-type type="void" />
</method>
</object>
- <object name="PresenceMenuItem" cname="GalagoGtkPresenceMenuItem" parent="GtkImageMenuItem">
+ <object name="GalagoGtkPresenceMenuItem" cname="GalagoGtkPresenceMenuItem" parent="GtkImageMenuItem">
<field name="Priv" cname="priv" type="GalagoGtkPresenceMenuItemPriv*" />
<callback cname="gtk_reserved1">
<return-type type="void" />
@@ -811,7 +811,7 @@
</parameters>
</method>
</object>
- <object name="ServiceComboBox" cname="GalagoGtkServiceComboBox" parent="GtkComboBox">
+ <object name="GalagoGtkServiceComboBox" cname="GalagoGtkServiceComboBox" parent="GtkComboBox">
<field name="Priv" cname="priv" type="GalagoGtkServiceComboBoxPriv*" />
<callback cname="gtk_reserved1">
<return-type type="void" />
@@ -858,7 +858,7 @@
</parameters>
</method>
</object>
- <object name="ServiceList" cname="GalagoGtkServiceList" parent="GtkTreeView">
+ <object name="GalagoGtkServiceList" cname="GalagoGtkServiceList" parent="GtkTreeView">
<field name="Priv" cname="priv" type="GalagoGtkServiceListPriv*" />
<callback cname="gtk_reserved1">
<return-type type="void" />
@@ -939,7 +939,7 @@
</parameters>
</method>
</object>
- <object name="ServiceMenuItem" cname="GalagoGtkServiceMenuItem" parent="GtkImageMenuItem">
+ <object name="GalagoGtkServiceMenuItem" cname="GalagoGtkServiceMenuItem" parent="GtkImageMenuItem">
<field name="Priv" cname="priv" type="GalagoGtkServiceMenuItemPriv*" />
<callback cname="gtk_reserved1">
<return-type type="void" />
@@ -983,48 +983,21 @@
</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="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="const-GalagoService*" name="service" />
- <parameter type="gboolean" name="query" />
- </parameters>
- </method>
- <method name="CompletionNewWithContacts" cname="galago_gtk_entry_completion_new_with_contacts" shared="true">
- <return-type type="GtkEntryCompletion*" />
- <parameters>
- <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*" />
- <parameters>
- <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" />
- </method>
- </class>
- <object name="Stock" cname="GalagoGtkStock">
+ <struct name="GalagoGtkAccountComboBoxPriv" cname="GalagoGtkAccountComboBoxPriv" opaque="true" />
+ <struct name="GalagoGtkAccountLabelPriv" cname="GalagoGtkAccountLabelPriv" opaque="true" />
+ <struct name="GalagoGtkAccountMenuItemPriv" cname="GalagoGtkAccountMenuItemPriv" opaque="true" />
+ <struct name="GalagoGtkContactChooserDialogPriv" cname="GalagoGtkContactChooserDialogPriv" opaque="true" />
+ <struct name="GalagoGtkContactChooserWidgetPriv" cname="GalagoGtkContactChooserWidgetPriv" opaque="true" />
+ <struct name="GalagoGtkContactListPriv" cname="GalagoGtkContactListPriv" opaque="true" />
+ <struct name="GalagoGtkContactPathBarPriv" cname="GalagoGtkContactPathBarPriv" opaque="true" />
+ <struct name="GalagoGtkPersonListPriv" cname="GalagoGtkPersonListPriv" opaque="true" />
+ <struct name="GalagoGtkPresenceIconPriv" cname="GalagoGtkPresenceIconPriv" opaque="true" />
+ <struct name="GalagoGtkPresenceLabelPriv" cname="GalagoGtkPresenceLabelPriv" opaque="true" />
+ <struct name="GalagoGtkPresenceMenuItemPriv" cname="GalagoGtkPresenceMenuItemPriv" opaque="true" />
+ <struct name="GalagoGtkServiceComboBoxPriv" cname="GalagoGtkServiceComboBoxPriv" opaque="true" />
+ <struct name="GalagoGtkServiceListPriv" cname="GalagoGtkServiceListPriv" opaque="true" />
+ <struct name="GalagoGtkServiceMenuItemPriv" cname="GalagoGtkServiceMenuItemPriv" opaque="true" />
+ <object name="Stock" cname="Galago.GtkStock">
<static-string cname="GALAGO_GTK_STOCK_PERSON" name="Person" value="galago-gtk-stock-person" />
</object>
</namespace>
Modified: trunk/galago-gtk-sharp/sources/galago-gtk-sharp-sources.xml.in
===================================================================
--- trunk/galago-gtk-sharp/sources/galago-gtk-sharp-sources.xml.in 2006-03-27 20:04:55 UTC (rev 2633)
+++ trunk/galago-gtk-sharp/sources/galago-gtk-sharp-sources.xml.in 2006-03-27 20:05:37 UTC (rev 2634)
@@ -1,7 +1,7 @@
<gapi-parser-input>
<api filename="../galago-gtk/galago-gtk-api.raw">
<library name="libgalago-gtk">
- <namespace name="GalagoGtk">
+ <namespace name="Galago.Gtk">
<dir>@srcdir@/libgalago-gtk/libgalago-gtk</dir>
</namespace>
</library>
Modified: trunk/galago-gtk-sharp/tests/Makefile.am
===================================================================
--- trunk/galago-gtk-sharp/tests/Makefile.am 2006-03-27 20:04:55 UTC (rev 2633)
+++ trunk/galago-gtk-sharp/tests/Makefile.am 2006-03-27 20:05:37 UTC (rev 2634)
@@ -3,7 +3,7 @@
$(addprefix /r:, $(ASSEMBLIES)) \
-pkg:dbus-sharp \
-pkg:galago-sharp \
- -pkg:gtk-sharp
+ -pkg:gtk-sharp-2.0
TARGETS = \
test-chooser.exe \
Modified: trunk/galago-gtk-sharp/tests/test-chooser.cs
===================================================================
--- trunk/galago-gtk-sharp/tests/test-chooser.cs 2006-03-27 20:04:55 UTC (rev 2633)
+++ trunk/galago-gtk-sharp/tests/test-chooser.cs 2006-03-27 20:05:37 UTC (rev 2634)
@@ -4,7 +4,7 @@
using GtkSharp;
using System;
using Galago;
- using GalagoGtk;
+ using Galago.Gtk;
public class TestChooser
{
Modified: trunk/galago-gtk-sharp/tests/test-presence-icon.cs
===================================================================
--- trunk/galago-gtk-sharp/tests/test-presence-icon.cs 2006-03-27 20:04:55 UTC (rev 2633)
+++ trunk/galago-gtk-sharp/tests/test-presence-icon.cs 2006-03-27 20:05:37 UTC (rev 2634)
@@ -4,7 +4,7 @@
using GtkSharp;
using System;
using Galago;
- using GalagoGtk;
+ using Galago.Gtk;
public class TestPresenceIcon
{
@@ -21,7 +21,7 @@
DBus.Bus.GetSessionBus();
- if (!Galago.Core.Init("test-presence-icon"))
+ if (!Galago.Global.Init("test-presence-icon"))
{
Application.Quit();
return;
More information about the galago-commits
mailing list