[Galago-commits] r2606 - in trunk/galago-gtk-python: . src
galago-commits at freedesktop.org
galago-commits at freedesktop.org
Thu Mar 16 23:35:57 PST 2006
Author: chipx86
Date: 2006-03-16 23:35:55 -0800 (Thu, 16 Mar 2006)
New Revision: 2606
Modified:
trunk/galago-gtk-python/ChangeLog
trunk/galago-gtk-python/src/Makefile.am
trunk/galago-gtk-python/src/galago-gtk.defs
trunk/galago-gtk-python/src/galago-gtk.override
Log:
Compile!
Modified: trunk/galago-gtk-python/ChangeLog
===================================================================
--- trunk/galago-gtk-python/ChangeLog 2006-03-17 07:29:25 UTC (rev 2605)
+++ trunk/galago-gtk-python/ChangeLog 2006-03-17 07:35:55 UTC (rev 2606)
@@ -1,3 +1,10 @@
+Thu Mar 16 23:35:42 PST 2006 Christian Hammond <chipx86 at chipx86.com>
+
+ * src/galago-gtk.defs:
+ * src/galago-gtk.override:
+ * src/Makefile.am:
+ - Compile!
+
Thu Mar 16 22:56:08 PST 2006 Christian Hammond <chipx86 at chipx86.com>
A src/galago-gtk.defs:
Modified: trunk/galago-gtk-python/src/Makefile.am
===================================================================
--- trunk/galago-gtk-python/src/Makefile.am 2006-03-17 07:29:25 UTC (rev 2605)
+++ trunk/galago-gtk-python/src/Makefile.am 2006-03-17 07:35:55 UTC (rev 2606)
@@ -27,7 +27,7 @@
--register $(PYGTK_DEFSDIR)/gtk-types.defs \
--register $(PYGTK_DEFSDIR)/galago.defs \
--override $*.override \
- --prefix py$* $*.defs) > gen-$*.c \
+ --prefix pygalago_gtk $*.defs) > gen-$*.c \
&& cp gen-$*.c $*.c \
&& rm -f gen-$*.c
Modified: trunk/galago-gtk-python/src/galago-gtk.defs
===================================================================
--- trunk/galago-gtk-python/src/galago-gtk.defs 2006-03-17 07:29:25 UTC (rev 2605)
+++ trunk/galago-gtk-python/src/galago-gtk.defs 2006-03-17 07:35:55 UTC (rev 2606)
@@ -21,13 +21,6 @@
(gtype-id "GALAGO_GTK_TYPE_ACCOUNT_MENU_ITEM")
)
-(define-object AccountOptionMenu
- (in-module "GalagoGtk")
- (parent "GtkOptionMenu")
- (c-name "GalagoGtkAccountOptionMenu")
- (gtype-id "GALAGO_GTK_TYPE_ACCOUNT_OPTION_MENU")
-)
-
(define-object ContactChooser
(in-module "GalagoGtk")
(c-name "GalagoGtkContactChooser")
@@ -111,20 +104,6 @@
(gtype-id "GALAGO_GTK_TYPE_SERVICE_MENU_ITEM")
)
-(define-object ServiceOptionMenu
- (in-module "GalagoGtk")
- (parent "GtkOptionMenu")
- (c-name "GalagoGtkServiceOptionMenu")
- (gtype-id "GALAGO_GTK_TYPE_SERVICE_OPTION_MENU")
-)
-
-(define-object Tooltips
- (in-module "GalagoGtk")
- (parent "GtkObject")
- (c-name "GalagoGtkTooltips")
- (gtype-id "GALAGO_GTK_TYPE_TOOLTIPS")
-)
-
;; Enumerations and flags ...
(define-enum ContactChooserFlags
@@ -448,84 +427,6 @@
-;; From /usr/include/libgalago-gtk/galago-gtk-account-option-menu.h
-
-(define-function galago_gtk_account_option_menu_get_type
- (c-name "galago_gtk_account_option_menu_get_type")
- (return-type "GType")
-)
-
-(define-function galago_gtk_account_option_menu_new
- (c-name "galago_gtk_account_option_menu_new")
- (is-constructor-of "GalagoGtkAccountOptionMenu")
- (return-type "GtkWidget*")
- (parameters
- '("gboolean" "me_accounts")
- )
-)
-
-(define-method set_person
- (of-object "GalagoGtkAccountOptionMenu")
- (c-name "galago_gtk_account_option_menu_set_person")
- (return-type "none")
- (parameters
- '("GalagoPerson*" "person")
- )
-)
-
-(define-method get_person
- (of-object "GalagoGtkAccountOptionMenu")
- (c-name "galago_gtk_account_option_menu_get_person")
- (return-type "GalagoPerson*")
-)
-
-(define-method set_service
- (of-object "GalagoGtkAccountOptionMenu")
- (c-name "galago_gtk_account_option_menu_set_service")
- (return-type "none")
- (parameters
- '("GalagoService*" "service")
- )
-)
-
-(define-method get_service
- (of-object "GalagoGtkAccountOptionMenu")
- (c-name "galago_gtk_account_option_menu_get_service")
- (return-type "GalagoService*")
-)
-
-(define-method set_active
- (of-object "GalagoGtkAccountOptionMenu")
- (c-name "galago_gtk_account_option_menu_set_active")
- (return-type "none")
- (parameters
- '("GalagoAccount*" "account")
- )
-)
-
-(define-method get_active
- (of-object "GalagoGtkAccountOptionMenu")
- (c-name "galago_gtk_account_option_menu_get_active")
- (return-type "GalagoAccount*")
-)
-
-(define-method set_services_option_menu
- (of-object "GalagoGtkAccountOptionMenu")
- (c-name "galago_gtk_account_option_menu_set_services_option_menu")
- (return-type "none")
- (parameters
- '("GtkWidget*" "service_optmenu")
- )
-)
-
-(define-method get_services_option_menu
- (of-object "GalagoGtkAccountOptionMenu")
- (c-name "galago_gtk_account_option_menu_get_services_option_menu")
- (return-type "GtkWidget*")
-)
-
-
-
;; From /usr/include/libgalago-gtk/galago-gtk-contact-chooser-dialog.h
(define-function galago_gtk_contact_chooser_dialog_get_type
@@ -842,6 +743,30 @@
+;; From /usr/include/libgalago-gtk/galago-gtk-enum-types.h
+
+(define-function galago_gtk_contact_chooser_flags_get_type
+ (c-name "galago_gtk_contact_chooser_flags_get_type")
+ (return-type "GType")
+)
+
+(define-function galago_gtk_contact_path_bar_root_type_get_type
+ (c-name "galago_gtk_contact_path_bar_root_type_get_type")
+ (return-type "GType")
+)
+
+(define-function galago_gtk_service_list_item_type_get_type
+ (c-name "galago_gtk_service_list_item_type_get_type")
+ (return-type "GType")
+)
+
+(define-function galago_gtk_icon_precedence_get_type
+ (c-name "galago_gtk_icon_precedence_get_type")
+ (return-type "GType")
+)
+
+
+
;; From /usr/include/libgalago-gtk/galago-gtk.h
@@ -1272,99 +1197,6 @@
-;; From /usr/include/libgalago-gtk/galago-gtk-service-option-menu.h
-
-(define-function galago_gtk_service_option_menu_get_type
- (c-name "galago_gtk_service_option_menu_get_type")
- (return-type "GType")
-)
-
-(define-function galago_gtk_service_option_menu_new
- (c-name "galago_gtk_service_option_menu_new")
- (is-constructor-of "GalagoGtkServiceOptionMenu")
- (return-type "GtkWidget*")
-)
-
-(define-method set_active
- (of-object "GalagoGtkServiceOptionMenu")
- (c-name "galago_gtk_service_option_menu_set_active")
- (return-type "none")
- (parameters
- '("GalagoService*" "service")
- )
-)
-
-(define-method get_active
- (of-object "GalagoGtkServiceOptionMenu")
- (c-name "galago_gtk_service_option_menu_get_active")
- (return-type "GalagoService*")
-)
-
-
-
-;; From /usr/include/libgalago-gtk/galago-gtk-tooltips.h
-
-(define-function galago_gtk_tooltips_get_type
- (c-name "galago_gtk_tooltips_get_type")
- (return-type "GType")
-)
-
-(define-function galago_gtk_tooltips_new
- (c-name "galago_gtk_tooltips_new")
- (is-constructor-of "GalagoGtkTooltips")
- (return-type "GalagoGtkTooltips*")
-)
-
-(define-method enable
- (of-object "GalagoGtkTooltips")
- (c-name "galago_gtk_tooltips_enable")
- (return-type "none")
-)
-
-(define-method disable
- (of-object "GalagoGtkTooltips")
- (c-name "galago_gtk_tooltips_disable")
- (return-type "none")
-)
-
-(define-method set_tip
- (of-object "GalagoGtkTooltips")
- (c-name "galago_gtk_tooltips_set_tip")
- (return-type "none")
- (parameters
- '("GtkWidget*" "widget")
- '("const-gchar*" "tip_text")
- '("const-gchar*" "tip_private")
- )
-)
-
-(define-method set_tip_func
- (of-object "GalagoGtkTooltips")
- (c-name "galago_gtk_tooltips_set_tip_func")
- (return-type "none")
- (parameters
- '("GtkWidget*" "widget")
- '("GalagoGtkTooltipFunc" "func")
- '("GtkWidget*" "func_widget")
- )
-)
-
-(define-function galago_gtk_tooltips_data_get
- (c-name "galago_gtk_tooltips_data_get")
- (return-type "GalagoGtkTooltipsData*")
- (parameters
- '("GtkWidget*" "widget")
- )
-)
-
-(define-method force_window
- (of-object "GalagoGtkTooltips")
- (c-name "galago_gtk_tooltips_force_window")
- (return-type "none")
-)
-
-
-
;; From /usr/include/libgalago-gtk/galago-gtk-types.h
Modified: trunk/galago-gtk-python/src/galago-gtk.override
===================================================================
--- trunk/galago-gtk-python/src/galago-gtk.override 2006-03-17 07:29:25 UTC (rev 2605)
+++ trunk/galago-gtk-python/src/galago-gtk.override 2006-03-17 07:35:55 UTC (rev 2606)
@@ -65,11 +65,21 @@
return items;
}
%%
-modulename galago
+modulename galago.gtk
%%
import galago.Account as PyGalagoAccount_Type
+import galago.Image as PyGalagoImage_Type
import galago.Person as PyGalagoPerson_Type
+import galago.Presence as PyGalagoPresence_Type
import galago.Service as PyGalagoService_Type
+import gtk.ComboBox as PyGtkComboBox_Type
+import gtk.Dialog as PyGtkDialog_Type
+import gtk.HBox as PyGtkHBox_Type
+import gtk.Image as PyGtkImage_Type
+import gtk.ImageMenuItem as PyGtkImageMenuItem_Type
+import gtk.Label as PyGtkLabel_Type
+import gtk.TreeView as PyGtkTreeView_Type
+import gtk.VBox as PyGtkVBox_Type
import gtk.Widget as PyGtkWidget_Type
%%
ignore-glob
More information about the galago-commits
mailing list