[Galago-commits] r2631 - in trunk/galago-gtk-sharp: . galago-gtk
tests
galago-commits at freedesktop.org
galago-commits at freedesktop.org
Sat Mar 25 15:51:06 PST 2006
Author: chipx86
Date: 2006-03-25 15:51:02 -0800 (Sat, 25 Mar 2006)
New Revision: 2631
Removed:
trunk/galago-gtk-sharp/galago-gtk/AccountComboBox.custom
trunk/galago-gtk-sharp/galago-gtk/ServiceComboBox.custom
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/galago-gtk/galago-gtk-sharp.metadata
trunk/galago-gtk-sharp/tests/test-chooser.cs
Log:
- Install the bindings in the right place.
- Update for the latest libgalago-gtk ComboBox API changes.
- Refer to the proper versions of the gtk/glib/galago defs.
Modified: trunk/galago-gtk-sharp/ChangeLog
===================================================================
--- trunk/galago-gtk-sharp/ChangeLog 2006-03-24 22:06:09 UTC (rev 2630)
+++ trunk/galago-gtk-sharp/ChangeLog 2006-03-25 23:51:02 UTC (rev 2631)
@@ -1,3 +1,14 @@
+Sat Mar 25 14:57:20 PST 2006 Christian Hammond <chipx86 at chipx86.com>
+
+ D galago-gtk/AccountComboBox.custom:
+ D galago-gtk/ServiceComboBox.custom:
+ * galago-gtk/galago-gtk-api.raw:
+ * galago-gtk/galago-gtk-sharp.metadata:
+ * galago-gtk/Makefile.am:
+ - Install the bindings in the right place.
+ - Update for the latest libgalago-gtk ComboBox API changes.
+ - Refer to the proper versions of the gtk/glib/galago defs.
+
Fri Mar 24 02:05:20 PST 2006 Christian Hammond <chipx86 at chipx86.com>
A galago-gtk/AccountComboBox.custom:
Deleted: trunk/galago-gtk-sharp/galago-gtk/AccountComboBox.custom
===================================================================
--- trunk/galago-gtk-sharp/galago-gtk/AccountComboBox.custom 2006-03-24 22:06:09 UTC (rev 2630)
+++ trunk/galago-gtk-sharp/galago-gtk/AccountComboBox.custom 2006-03-25 23:51:02 UTC (rev 2631)
@@ -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 22:06:09 UTC (rev 2630)
+++ trunk/galago-gtk-sharp/galago-gtk/Makefile.am 2006-03-25 23:51:02 UTC (rev 2631)
@@ -3,13 +3,12 @@
ADDITIONAL_API =
INCLUDE_API = \
- $(GTK_SHARP_PREFIX)/share/gapi/art-api.xml \
- $(GTK_SHARP_PREFIX)/share/gapi/pango-api.xml \
- $(GTK_SHARP_PREFIX)/share/gapi/atk-api.xml \
- $(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-api.xml
+ $(GTK_SHARP_PREFIX)/share/gapi-2.0/art-api.xml \
+ $(GTK_SHARP_PREFIX)/share/gapi-2.0/pango-api.xml \
+ $(GTK_SHARP_PREFIX)/share/gapi-2.0/atk-api.xml \
+ $(GTK_SHARP_PREFIX)/share/gapi-2.0/gtk-api.xml \
+ $(GTK_SHARP_PREFIX)/share/gapi-2.0/gdk-api.xml \
+ $(GALAGO_SHARP_PREFIX)/share/gapi-2.0/galago-api.xml
METADATA = galago-gtk-sharp.metadata
ASSEMBLY_NAME = galago-gtk-sharp
@@ -17,7 +16,7 @@
TARGET = $(ASSEMBLY)
ASSEMBLY = $(ASSEMBLY_NAME).dll
-gapidir = $(datadir)/gapi
+gapidir = $(datadir)/gapi-2.0
noinst_DATA = $(ASSEMBLY)
gapi_DATA = $(API) $(ADDITIONAL_API)
@@ -33,9 +32,7 @@
build_sources = $(addprefix $(srcdir)/, $(sources)) AssemblyInfo.cs
customs = \
- AccountComboBox.custom \
- ContactChooserDialog.custom \
- ServiceComboBox.custom
+ ContactChooserDialog.custom
build_customs = $(addprefix $(srcdir)/, $(customs))
Deleted: trunk/galago-gtk-sharp/galago-gtk/ServiceComboBox.custom
===================================================================
--- trunk/galago-gtk-sharp/galago-gtk/ServiceComboBox.custom 2006-03-24 22:06:09 UTC (rev 2630)
+++ trunk/galago-gtk-sharp/galago-gtk/ServiceComboBox.custom 2006-03-25 23:51:02 UTC (rev 2631)
@@ -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 22:06:09 UTC (rev 2630)
+++ trunk/galago-gtk-sharp/galago-gtk/galago-gtk-api.raw 2006-03-25 23:51:02 UTC (rev 2631)
@@ -149,7 +149,7 @@
<parameter type="GalagoAccount*" name="account" />
</parameters>
</signal>
- <method name="GetActive" cname="galago_gtk_account_combo_box_get_active">
+ <method name="GetAccount" cname="galago_gtk_account_combo_box_get_account">
<return-type type="GalagoAccount*" />
</method>
<method name="GetPerson" cname="galago_gtk_account_combo_box_get_person">
@@ -169,7 +169,7 @@
<parameter type="gboolean" name="me_accounts" />
</parameters>
</constructor>
- <method name="SetActive" cname="galago_gtk_account_combo_box_set_active">
+ <method name="SetAccount" cname="galago_gtk_account_combo_box_set_account">
<return-type type="void" />
<parameters>
<parameter type="const-GalagoAccount*" name="account" />
@@ -223,9 +223,6 @@
<method name="GetAccount" cname="galago_gtk_account_label_get_account">
<return-type type="GalagoAccount*" />
</method>
- <method name="GetPerson" cname="galago_gtk_account_label_get_person">
- <return-type type="GalagoPerson*" />
- </method>
<method name="GetType" cname="galago_gtk_account_label_get_type" shared="true">
<return-type type="GType" />
</method>
@@ -236,12 +233,6 @@
<parameter type="GalagoAccount*" name="account" />
</parameters>
</method>
- <method name="SetPerson" cname="galago_gtk_account_label_set_person">
- <return-type type="void" />
- <parameters>
- <parameter type="GalagoPerson*" name="person" />
- </parameters>
- </method>
</object>
<object name="AccountMenuItem" cname="GalagoGtkAccountMenuItem" parent="GtkImageMenuItem">
<field name="Priv" cname="priv" type="GalagoGtkAccountMenuItemPriv*" />
@@ -853,14 +844,14 @@
<parameter type="GalagoService*" name="service" />
</parameters>
</signal>
- <method name="GetActive" cname="galago_gtk_service_combo_box_get_active">
+ <method name="GetService" cname="galago_gtk_service_combo_box_get_service">
<return-type type="GalagoService*" />
</method>
<method name="GetType" cname="galago_gtk_service_combo_box_get_type" shared="true">
<return-type type="GType" />
</method>
<constructor cname="galago_gtk_service_combo_box_new" />
- <method name="SetActive" cname="galago_gtk_service_combo_box_set_active">
+ <method name="SetService" cname="galago_gtk_service_combo_box_set_service">
<return-type type="void" />
<parameters>
<parameter type="const-GalagoService*" name="service" />
Modified: trunk/galago-gtk-sharp/galago-gtk/galago-gtk-sharp.metadata
===================================================================
--- trunk/galago-gtk-sharp/galago-gtk/galago-gtk-sharp.metadata 2006-03-24 22:06:09 UTC (rev 2630)
+++ trunk/galago-gtk-sharp/galago-gtk/galago-gtk-sharp.metadata 2006-03-25 23:51:02 UTC (rev 2631)
@@ -1,60 +1,67 @@
<?xml version="1.0"?>
<metadata>
+ <!-- GalagoGtkAccountComboBox -->
<attr path="/api/namespace/struct[@cname='GalagoGtkAccountComboBoxPriv']" name="hidden">1</attr>
+ <!-- GalagoGtkAccountLabel -->
<attr path="/api/namespace/object[@cname='GalagoGtkAccountLabel']/method[@name='SetAccount']/*/*[@type='GalagoAccount*']" name="null_ok">1</attr>
<attr path="/api/namespace/object[@cname='GalagoGtkAccountLabel']/method[@name='SetPerson']/*/*[@type='GalagoPerson*']" name="null_ok">1</attr>
<attr path="/api/namespace/struct[@cname='GalagoGtkAccountLabelPriv']" name="hidden">1</attr>
+ <!-- GalagoGtkAccountMenuItem -->
<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>
+ <!-- GalagoGtkAccountComboBox -->
<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>
+ <!-- GalagoGtkContactChooserDialog -->
<attr path="/api/namespace/struct[@cname='GalagoGtkContactChooserDialogPriv']" name="hidden">1</attr>
+ <!-- GalagoGtkContactChooserWidget -->
<attr path="/api/namespace/struct[@cname='GalagoGtkContactChooserWidgetPriv']" name="hidden">1</attr>
+ <!-- GalagoGtkContactList -->
<attr path="/api/namespace/struct[@cname='GalagoGtkContactListPriv']" name="hidden">1</attr>
- <!--
- This thing shouldn't be named this, but we're just going to hide it
- and take care of it ourselves.
- -->
- <attr path="/api/namespace/class[@cname='GalagoGtkEntry_']" name="hidden">1</attr>
-
- <attr path="/api/namespace/object[@cname='GalagoGtkIconEntry']/method[@name='SetIcon']/*/*[@type='GtkWidget*']" name="null_ok">1</attr>
- <attr path="/api/namespace/struct[@cname='GalagoGtkIconEntryPriv']" name="hidden">1</attr>
-
+ <!-- GalagoGtkPersonList -->
<attr path="/api/namespace/struct[@cname='GalagoGtkPersonListPriv']" name="hidden">1</attr>
+ <!-- GalagoGtkPresenceIcon -->
<attr path="/api/namespace/object[@cname='GalagoGtkPresenceIcon']/method[@name='GetTooltipText']" name="hidden">1</attr>
<attr path="/api/namespace/object[@cname='GalagoGtkPresenceIcon']/method[@name='SetAccount']/*/*[@type='GalagoAccount*']" name="null_ok">1</attr>
<attr path="/api/namespace/object[@cname='GalagoGtkPresenceIcon']/method[@name='SetPerson']/*/*[@type='GalagoPerson*']" name="null_ok">1</attr>
<attr path="/api/namespace/struct[@cname='GalagoGtkPresenceIconPriv']" name="hidden">1</attr>
+ <!-- GalagoGtkPresenceLabel -->
<attr path="/api/namespace/object[@cname='GalagoGtkPresenceLabel']/method[@name='SetAccount']/*/*[@type='GalagoAccount*']" name="null_ok">1</attr>
<attr path="/api/namespace/object[@cname='GalagoGtkPresenceLabel']/method[@name='SetPerson']/*/*[@type='GalagoPerson*']" name="null_ok">1</attr>
<attr path="/api/namespace/struct[@cname='GalagoGtkPresenceLabelPriv']" name="hidden">1</attr>
+ <!-- GalagoGtkPresenceMenuItem -->
<attr path="/api/namespace/object[@cname='GalagoGtkPresenceMenuItem']/method[@name='SetAccount']/*/*[@type='GalagoAccount*']" name="null_ok">1</attr>
<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>
+ <!-- GalagoGtkServiceComboBox -->
<attr path="/api/namespace/struct[@cname='GalagoGtkServiceComboBoxPriv']" name="hidden">1</attr>
+ <!-- GalagoGtkServiceList -->
<attr path="/api/namespace/struct[@cname='GalagoGtkServiceListPriv']" name="hidden">1</attr>
+ <!-- GalagoGtkServiceMenuItem -->
<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>
+ <!-- GalagoGtkServiceMenuItem -->
<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>
+ <!-- Global -->
<attr path="/api/namespace/class[@name='Global']" name="hidden">1</attr>
</metadata>
Modified: trunk/galago-gtk-sharp/tests/test-chooser.cs
===================================================================
--- trunk/galago-gtk-sharp/tests/test-chooser.cs 2006-03-24 22:06:09 UTC (rev 2630)
+++ trunk/galago-gtk-sharp/tests/test-chooser.cs 2006-03-25 23:51:02 UTC (rev 2631)
@@ -16,7 +16,7 @@
DBus.Bus.GetSessionBus();
- if (!Galago.Core.Init("test-chooser"))
+ if (!Galago.Global.Init("test-chooser"))
{
Application.Quit();
return;
More information about the galago-commits
mailing list