support interface signals change some signal declarations to fix parsing

2006-09-27  Jürg Billeter  <j@bitron.ch>

	* vapigen/valagidlparser.vala: support interface signals
	* packages/gtk+-2.0/gtk+-2.0.patch: change some signal declarations
	  to fix parsing
	* packages/gtk+-2.0/gtk+-2.0.gidl: regenerated
	* packages/gtk+-2.0/gtk+-2.0.metadata: add missing emitter methods

svn path=/trunk/; revision=130

diff --git a/vapigen/ChangeLog b/vapigen/ChangeLog
index 35b65147332ca99939bdb8f813bb84800c39cf73..a64d890b105c2e07fcc850bb84cba9d597c1b434 100644 (file)
--- a/vapigen/ChangeLog
+++ b/vapigen/ChangeLog
@@ -1,3 +1,11 @@
+2006-09-27  Jürg Billeter  <j@bitron.ch>
+
+       * vapigen/valagidlparser.vala: support interface signals
+       * packages/gtk+-2.0/gtk+-2.0.patch: change some signal declarations
+         to fix parsing
+       * packages/gtk+-2.0/gtk+-2.0.gidl: regenerated
+       * packages/gtk+-2.0/gtk+-2.0.metadata: add missing emitter methods
+
 2006-09-27  Jürg Billeter  <j@bitron.ch>
 
        * gidlgen/gapi2xml.pl: move global methods from Global struct to

diff --git a/vapigen/packages/gtk+-2.0/gtk+-2.0.gidl b/vapigen/packages/gtk+-2.0/gtk+-2.0.gidl
index ad88ebc6f4d008c50cecf73922adf5f083b1ddf9..bfd025c2e07c13e8c6a8eb3022f41fa516ec123b 100644 (file)
--- a/vapigen/packages/gtk+-2.0/gtk+-2.0.gidl
+++ b/vapigen/packages/gtk+-2.0/gtk+-2.0.gidl
@@ -2496,14 +2496,6 @@
         </parameters>
       </signal>
       <signal name="row_inserted" when="FIRST">
-        <return-type type="void"/>
-        <parameters>
-          <parameter name="inst" type="GtkTreeModel*"/>
-          <parameter name="p0" type="RowInsertedParams"/>
-          <parameter name="p1" type=""/>
-        </parameters>
-      </signal>
-      <signal name="row_has_child_toggled" when="LAST">
         <return-type type="void"/>
         <parameters>
           <parameter name="tree_model" type="GtkTreeModel*"/>
@@ -2511,38 +2503,22 @@
           <parameter name="iter" type="GtkTreeIter*"/>
         </parameters>
       </signal>
-      <signal name="row_deleted" when="FIRST">
-        <return-type type="void"/>
-        <parameters>
-          <parameter name="inst" type="GtkTreeModel*"/>
-          <parameter name="p0" type="RowDeletedParams"/>
-        </parameters>
-      </signal>
-      <signal name="rows_reordered" when="FIRST">
-        <return-type type="void"/>
-        <parameters>
-          <parameter name="inst" type="GtkTreeModel*"/>
-          <parameter name="p0" type="RowsReorderedParams"/>
-          <parameter name="p1" type=""/>
-          <parameter name="p2" type=""/>
-        </parameters>
-      </signal>
-      <vfunc name="row_inserted">
+      <signal name="row_has_child_toggled" when="LAST">
         <return-type type="void"/>
         <parameters>
           <parameter name="tree_model" type="GtkTreeModel*"/>
           <parameter name="path" type="GtkTreePath*"/>
           <parameter name="iter" type="GtkTreeIter*"/>
         </parameters>
-      </vfunc>
-      <vfunc name="row_deleted">
+      </signal>
+      <signal name="row_deleted" when="FIRST">
         <return-type type="void"/>
         <parameters>
           <parameter name="tree_model" type="GtkTreeModel*"/>
           <parameter name="path" type="GtkTreePath*"/>
         </parameters>
-      </vfunc>
-      <vfunc name="rows_reordered">
+      </signal>
+      <signal name="rows_reordered" when="FIRST">
         <return-type type="void"/>
         <parameters>
           <parameter name="tree_model" type="GtkTreeModel*"/>
@@ -2550,7 +2526,7 @@
           <parameter name="iter" type="GtkTreeIter*"/>
           <parameter name="new_order" type="gint*"/>
         </parameters>
-      </vfunc>
+      </signal>
       <vfunc name="get_flags">
         <return-type type="GtkTreeModelFlags"/>
         <parameters>

diff --git a/vapigen/packages/gtk+-2.0/gtk+-2.0.metadata b/vapigen/packages/gtk+-2.0/gtk+-2.0.metadata
index 5b5f9f07e8952694733c21d46e8f766b161c017b..57809855c2e850c1a1388196baa548d1b49f27f9 100644 (file)
--- a/vapigen/packages/gtk+-2.0/gtk+-2.0.metadata
+++ b/vapigen/packages/gtk+-2.0/gtk+-2.0.metadata
@@ -9,12 +9,17 @@ GtkButton::leave has_emitter="1"
 GtkButton::pressed has_emitter="1"
 GtkButton::released has_emitter="1"
 GtkCallbackMarshal hidden="1"
+GtkCellEditable::editing_done has_emitter="1"
+GtkCellEditable::remove_widget has_emitter="1"
+GtkCellEditable::start_editing has_emitter="1"
 GtkCheckMenuItem::toggled has_emitter="1"
 GtkContainer::add has_emitter="1"
 GtkContainer::check_resize has_emitter="1"
 GtkContainer::remove has_emitter="1"
 GtkContainer::set_focus_child has_emitter="1"
 GtkDialog::response has_emitter="1"
+GtkEditable::delete_text has_emitter="1"
+GtkEditable::insert_text has_emitter="1"
 GtkEntryCompletion::insert_prefix has_emitter="1"
 GtkIconView::item_activated has_emitter="1"
 gtk_icon_view_select_all hidden="1" experimental="1"
@@ -45,6 +50,12 @@ GtkToggleAction::toggled has_emitter="1"
 GtkToggleActionEntry is_value_type="1"
 GtkToggleButton::toggled has_emitter="1"
 GtkToolItem::set_tooltip has_emitter="1"
+GtkTreeModel::row_changed has_emitter="1"
+GtkTreeModel::row_deleted has_emitter="1"
+GtkTreeModel::row_has_child_toggled has_emitter="1"
+GtkTreeModel::row_inserted has_emitter="1"
+GtkTreeModel::rows_reordered has_emitter="1"
+GtkTreeSortable::sort_column_changed has_emitter="1"
 GtkTreeView::row_activated has_emitter="1"
 GtkTreeView::row_expanded has_emitter="1"
 GtkTreeViewColumn::clicked has_emitter="1"

diff --git a/vapigen/packages/gtk+-2.0/gtk+-2.0.patch b/vapigen/packages/gtk+-2.0/gtk+-2.0.patch
index 454418c914c6f9a1d77f988f1d4f3e70a491b31c..b38843ca3610c9f37cfeb96f013a4b5a1127aba7 100644 (file)
--- a/vapigen/packages/gtk+-2.0/gtk+-2.0.patch
+++ b/vapigen/packages/gtk+-2.0/gtk+-2.0.patch
@@ -1,6 +1,6 @@
-diff -puNr gtk+-2.10.1.orig/gtk/gtkclipboard.h gtk+-2.10.1/gtk/gtkclipboard.h
---- gtk+-2.10.1.orig/gtk/gtkclipboard.h        2006-04-24 07:42:12.000000000 +0200
-+++ gtk+-2.10.1/gtk/gtkclipboard.h     2006-08-07 16:32:29.000000000 +0200
+diff -puNr gtk+-2.10.4.orig/gtk/gtkclipboard.h gtk+-2.10.4/gtk/gtkclipboard.h
+--- gtk+-2.10.4.orig/gtk/gtkclipboard.h        2006-04-24 07:42:12.000000000 +0200
++++ gtk+-2.10.4/gtk/gtkclipboard.h     2006-09-27 12:45:36.000000000 +0200
 @@ -30,6 +30,9 @@ G_BEGIN_DECLS
  #define GTK_CLIPBOARD(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_CLIPBOARD, GtkClipboard))
  #define GTK_IS_CLIPBOARD(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_CLIPBOARD))
@@ -11,9 +11,9 @@ diff -puNr gtk+-2.10.1.orig/gtk/gtkclipboard.h gtk+-2.10.1/gtk/gtkclipboard.h
  typedef void (* GtkClipboardReceivedFunc)         (GtkClipboard     *clipboard,
                                                   GtkSelectionData *selection_data,
                                                   gpointer          data);
-diff -puNr gtk+-2.10.1.orig/gtk/gtkfilechooser.h gtk+-2.10.1/gtk/gtkfilechooser.h
---- gtk+-2.10.1.orig/gtk/gtkfilechooser.h      2005-10-10 16:29:03.000000000 +0200
-+++ gtk+-2.10.1/gtk/gtkfilechooser.h   2006-08-07 16:34:13.000000000 +0200
+diff -puNr gtk+-2.10.4.orig/gtk/gtkfilechooser.h gtk+-2.10.4/gtk/gtkfilechooser.h
+--- gtk+-2.10.4.orig/gtk/gtkfilechooser.h      2005-10-10 16:29:03.000000000 +0200
++++ gtk+-2.10.4/gtk/gtkfilechooser.h   2006-09-27 12:45:36.000000000 +0200
 @@ -29,6 +29,7 @@ G_BEGIN_DECLS
  #define GTK_TYPE_FILE_CHOOSER             (gtk_file_chooser_get_type ())
  #define GTK_FILE_CHOOSER(obj)             (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_FILE_CHOOSER, GtkFileChooser))
@@ -22,3 +22,78 @@ diff -puNr gtk+-2.10.1.orig/gtk/gtkfilechooser.h gtk+-2.10.1/gtk/gtkfilechooser.
  
  typedef struct _GtkFileChooser      GtkFileChooser;
  
+diff -puNr gtk+-2.10.4.orig/gtk/gtktreemodel.c gtk+-2.10.4/gtk/gtktreemodel.c
+--- gtk+-2.10.4.orig/gtk/gtktreemodel.c        2006-08-16 22:52:23.000000000 +0200
++++ gtk+-2.10.4/gtk/gtktreemodel.c     2006-09-27 13:06:17.000000000 +0200
+@@ -193,14 +193,15 @@ gtk_tree_model_base_init (gpointer g_cla
+       closure = g_closure_new_simple (sizeof (GClosure), NULL);
+       g_closure_set_marshal (closure, row_inserted_marshal);
+       tree_model_signals[ROW_INSERTED] =
+-        g_signal_newv (I_("row_inserted"),
+-                       GTK_TYPE_TREE_MODEL,
+-                       G_SIGNAL_RUN_FIRST,
+-                       closure,
+-                       NULL, NULL,
+-                       _gtk_marshal_VOID__BOXED_BOXED,
+-                       G_TYPE_NONE, 2,
+-                       row_inserted_params);
++        g_signal_new (I_("row_inserted"),
++                      GTK_TYPE_TREE_MODEL,
++                      G_SIGNAL_RUN_FIRST, 
++                      G_STRUCT_OFFSET (GtkTreeModelIface, row_inserted),
++                      NULL, NULL,
++                      _gtk_marshal_VOID__BOXED_BOXED,
++                      G_TYPE_NONE, 2,
++                      GTK_TYPE_TREE_PATH | G_SIGNAL_TYPE_STATIC_SCOPE,
++                      GTK_TYPE_TREE_ITER);
+ 
+       /**
+        * GtkTreeModel::row-has-child-toggled:
+@@ -242,14 +243,14 @@ gtk_tree_model_base_init (gpointer g_cla
+       closure = g_closure_new_simple (sizeof (GClosure), NULL);
+       g_closure_set_marshal (closure, row_deleted_marshal);
+       tree_model_signals[ROW_DELETED] =
+-        g_signal_newv (I_("row_deleted"),
+-                       GTK_TYPE_TREE_MODEL,
+-                       G_SIGNAL_RUN_FIRST,
+-                       closure,
+-                       NULL, NULL,
+-                       _gtk_marshal_VOID__BOXED,
+-                       G_TYPE_NONE, 1,
+-                       row_deleted_params);
++        g_signal_new (I_("row_deleted"),
++                      GTK_TYPE_TREE_MODEL,
++                      G_SIGNAL_RUN_FIRST, 
++                      G_STRUCT_OFFSET (GtkTreeModelIface, row_deleted),
++                      NULL, NULL,
++                      _gtk_marshal_VOID__BOXED,
++                      G_TYPE_NONE, 1,
++                      GTK_TYPE_TREE_PATH | G_SIGNAL_TYPE_STATIC_SCOPE);
+ 
+       /**
+        * GtkTreeModel::rows-reordered:
+@@ -268,14 +269,16 @@ gtk_tree_model_base_init (gpointer g_cla
+       closure = g_closure_new_simple (sizeof (GClosure), NULL);
+       g_closure_set_marshal (closure, rows_reordered_marshal);
+       tree_model_signals[ROWS_REORDERED] =
+-        g_signal_newv (I_("rows_reordered"),
+-                       GTK_TYPE_TREE_MODEL,
+-                       G_SIGNAL_RUN_FIRST,
+-                       closure,
+-                       NULL, NULL,
+-                       _gtk_marshal_VOID__BOXED_BOXED_POINTER,
+-                       G_TYPE_NONE, 3,
+-                       rows_reordered_params);
++        g_signal_new (I_("rows_reordered"),
++                      GTK_TYPE_TREE_MODEL,
++                      G_SIGNAL_RUN_FIRST, 
++                      G_STRUCT_OFFSET (GtkTreeModelIface, rows_reordered),
++                      NULL, NULL,
++                      _gtk_marshal_VOID__BOXED_BOXED_POINTER,
++                      G_TYPE_NONE, 3,
++                      GTK_TYPE_TREE_PATH | G_SIGNAL_TYPE_STATIC_SCOPE,
++                      GTK_TYPE_TREE_ITER,
++                      G_TYPE_POINTER);
+       initialized = TRUE;
+     }
+ }

diff --git a/vapigen/vapigen/valagidlparser.vala b/vapigen/vapigen/valagidlparser.vala
index b0f941ffa5fffd602aa4619737b48a41d75cec0f..e5c8129be04ad3880ef393c014fefc5d8e5698a4 100644 (file)
--- a/vapigen/vapigen/valagidlparser.vala
+++ b/vapigen/vapigen/valagidlparser.vala
@@ -388,6 +388,11 @@ public class Vala.GIdlParser : CodeVisitor {
                                if (m != null) {
                                        iface.add_method (m);
                                }
+                       } else if (member.type == IdlNodeTypeId.SIGNAL) {
+                               var sig = parse_signal ((IdlNodeSignal) member);
+                               if (sig != null) {
+                                       iface.add_signal (sig);
+                               }
                        }
                }