GNOME.org
 

[libgda/LIBGDA_5.0] Distribute Gda-5.0.metadata fixes Bug #701752. Avoid some warnings on Gdaui-5.0.gir generation.

commit 74ce622d26ce5b26a9bf6343bd07c31d8c7de01b
Author: Daniel Espinosa <esodan gmail com>
Date:   Wed Jun 19 23:33:44 2013 -0500

    Distribute Gda-5.0.metadata fixes Bug #701752. Avoid some warnings on Gdaui-5.0.gir generation.

 configure.ac                              |    2 +-
 libgda-ui/data-entries/gdaui-entry-time.c |    4 ++--
 libgda-ui/data-entries/gdaui-entry.h      |    6 +++---
 libgda-ui/gdaui-data-selector.c           |    2 +-
 libgda-ui/gdaui-plugin.h                  |   16 ++++++++--------
 libgda-ui/gdaui-raw-grid.c                |    2 +-
 libgda-ui/gdaui-rt-editor.c               |   10 +++++-----
 libgda-ui/gdaui-server-operation.c        |    4 ++--
 libgda-ui/gdaui-set.c                     |    4 ++--
 libgda/Makefile.am                        |    4 +++-
 10 files changed, 28 insertions(+), 26 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index c91c2eb..ddff161 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 m4_define(major, 5)
 m4_define(minor, 0)
-m4_define(micro, 4)
+m4_define(micro, 5)
 m4_define([gda_stable],
        m4_if(m4_eval(minor % 2), [0], [yes], [no]))
 AC_CONFIG_MACRO_DIR([m4])
diff --git a/libgda-ui/data-entries/gdaui-entry-time.c b/libgda-ui/data-entries/gdaui-entry-time.c
index f9f126c..4924b6b 100644
--- a/libgda-ui/data-entries/gdaui-entry-time.c
+++ b/libgda-ui/data-entries/gdaui-entry-time.c
@@ -66,9 +66,9 @@ static void
 gdaui_entry_time_init (G_GNUC_UNUSED GdauiEntryTime * gdaui_entry_time)
 {
 }
-
+                       
 /**
- * gdaui_entry_time_new
+ * gdaui_entry_time_new:
  * @dh: the data handler to be used by the new widget
  *
  * Creates a new widget which is mainly a GtkEntry
diff --git a/libgda-ui/data-entries/gdaui-entry.h b/libgda-ui/data-entries/gdaui-entry.h
index 60d464f..2fc3630 100644
--- a/libgda-ui/data-entries/gdaui-entry.h
+++ b/libgda-ui/data-entries/gdaui-entry.h
@@ -47,7 +47,7 @@ struct _GdauiEntryClass
 
        /* virtual methods */
        /**
-        * GdauiEntryClass::get_empty_text
+        * GdauiEntryClass::get_empty_text:
         *
         * If defined, sould return a text suitable to display EMPTY value, it will be called when
         * entry was set to NULL and is becomming not NULL
@@ -57,7 +57,7 @@ struct _GdauiEntryClass
        gchar                  *(*get_empty_text) (GdauiEntry *entry);
 
        /**
-        * GdauiEntryClass::assume_insert
+        * GdauiEntryClass::assume_insert:
         * @entry: a #GdauiEntry
         * @text: the text to be inserted
         * @text_length: @text's length in bytes (not characters)
@@ -69,7 +69,7 @@ struct _GdauiEntryClass
        void                    (*assume_insert) (GdauiEntry *entry, const gchar *text, gint text_length,
                                                  gint *virt_pos, gint offset);
        /**
-        * GdauiEntryClass::assume_delete
+        * GdauiEntryClass::assume_delete:
         * @entry: a #GdauiEntry
         * @virt_start_pos: the starting position.
         * @virt_end_pos: the end position (not included in deletion), always > @start_pos
diff --git a/libgda-ui/gdaui-data-selector.c b/libgda-ui/gdaui-data-selector.c
index ed1f172..0d0515e 100644
--- a/libgda-ui/gdaui-data-selector.c
+++ b/libgda-ui/gdaui-data-selector.c
@@ -133,7 +133,7 @@ gdaui_data_selector_set_model (GdauiDataSelector *iface, GdaDataModel *model)
  * uses a #GdaDataProxy (as is the case for example for the #GdauiRawForm, #GdauiForm, #GdauiRawGrid
  * and #GdauiGrid).
  *
- * Returns: (transfer full): an array of #gint values, one for each selected row. Use g_array_free() when 
finished (passing %TRUE as the last argument)
+ * Returns: (transfer full) (element-type int): an array of #gint values, one for each selected row. Use 
g_array_free() when finished (passing %TRUE as the last argument)
  *
  * Since: 4.2
  */
diff --git a/libgda-ui/gdaui-plugin.h b/libgda-ui/gdaui-plugin.h
index f9ad9e7..10ddd78 100644
--- a/libgda-ui/gdaui-plugin.h
+++ b/libgda-ui/gdaui-plugin.h
@@ -27,25 +27,25 @@
 
 /**
  * GdauiEntryCreateFunc:
- * @None: a #GdaDataHandler
- * @None: a #GType
- * @None: (allow-none): options, or %NULL
+ * @dh: a #GdaDataHandler
+ * @type: a #GType
+ * @options: (allow-none): options, or %NULL
  * @Returns: a new #GdauiDataEntry
  *
  * Defines a function which creates a #GdauiDataEntry widget
  */
-typedef GdauiDataEntry   *(*GdauiEntryCreateFunc)(GdaDataHandler *, GType, const gchar *);
+typedef GdauiDataEntry   *(*GdauiEntryCreateFunc)(GdaDataHandler *dh, GType type, const gchar *options);
 
 /**
  * GdauiCellCreateFunc:
- * @None: a #GdaDataHandler
- * @None: a #GType
- * @None: (allow-none): options, or %NULL
+ * @dh: a #GdaDataHandler
+ * @type: a #GType
+ * @options: (allow-none): options, or %NULL
  * @Returns:a new #GtkCellRenderer
  *
  * Defines a function which creates a #GtkCellRenderer object
  */
-typedef GtkCellRenderer  *(*GdauiCellCreateFunc) (GdaDataHandler *, GType, const gchar *);
+typedef GtkCellRenderer  *(*GdauiCellCreateFunc) (GdaDataHandler *dh, GType type, const gchar *options);
 
 
 /**
diff --git a/libgda-ui/gdaui-raw-grid.c b/libgda-ui/gdaui-raw-grid.c
index 47ec298..033ef32 100644
--- a/libgda-ui/gdaui-raw-grid.c
+++ b/libgda-ui/gdaui-raw-grid.c
@@ -2712,7 +2712,7 @@ gdaui_raw_grid_set_sample_start (GdauiRawGrid *grid, gint sample_start)
 }
 
 /**
- * gdaui_raw_grid_set_layout_from_file
+ * gdaui_raw_grid_set_layout_from_file:
  * @grid: a #GdauiRawGrid
  * @file_name: XML file name to use
  * @grid_name: the name of the grid to use, in @file_name
diff --git a/libgda-ui/gdaui-rt-editor.c b/libgda-ui/gdaui-rt-editor.c
index 71f625e..e9ed7d9 100644
--- a/libgda-ui/gdaui-rt-editor.c
+++ b/libgda-ui/gdaui-rt-editor.c
@@ -1271,7 +1271,7 @@ spaces_since_start_of_line (GtkTextIter *iter)
 }
 
 /**
- * get_markup_token
+ * get_markup_token:
  * @iter: starting position
  * @out_nb_spaces_before: a place to set the value returned by spaces_since_start_of_line() if called
  * @out_end: (allow-none): place to put the last used position, or %NULL
@@ -1479,7 +1479,7 @@ get_markup_token (GtkTextIter *iter, gint *out_nb_spaces_before, GtkTextIter *ou
 }
 
 /**
- * get_char_at_iter
+ * get_char_at_iter:
  * @iter: an iter
  * @move_forward_first: %TRUE if @iter should be moved forward first
  *
@@ -1548,7 +1548,7 @@ static guint8 *serialize_as_txt2tag (GtkTextBuffer     *register_buffer,
                                     GdauiRtEditor     *editor);
 
 /**
- * gdaui_rt_editor_get_contents
+ * gdaui_rt_editor_get_contents:
  * @editor: a #GdauiRtEditor
  *
  * Get the contents of @editor, using the markup syntax
@@ -1904,7 +1904,7 @@ serialize_as_txt2tag (G_GNUC_UNUSED  GtkTextBuffer *register_buffer,
 
 
 /**
- * gdaui_rt_editor_set_contents
+ * gdaui_rt_editor_set_contents:
  * @editor: a #GdauiRtEditor
  * @markup: the text to set in @editor, using the markup syntax (must be valid UTF-8)
  * @length: length of text in bytes.
@@ -1924,7 +1924,7 @@ gdaui_rt_editor_set_contents (GdauiRtEditor *editor, const gchar *markup, gint l
 }
 
 /**
- * gdaui_rt_editor_set_editable
+ * gdaui_rt_editor_set_editable:
  * @editor: a #GdauiRtEditor
  * @editable: whether it's editable
  *
diff --git a/libgda-ui/gdaui-server-operation.c b/libgda-ui/gdaui-server-operation.c
index 9f7f877..0e0f10f 100644
--- a/libgda-ui/gdaui-server-operation.c
+++ b/libgda-ui/gdaui-server-operation.c
@@ -221,7 +221,7 @@ gdaui_server_operation_init (GdauiServerOperation * wid)
 
 
 /**
- * gdaui_server_operation_new
+ * gdaui_server_operation_new:
  * @op: a #GdaServerOperation structure
  *
  * Creates a new #GdauiServerOperation widget using all the parameters provided in @paramlist.
@@ -1081,7 +1081,7 @@ sequence_item_remove_cb (GdaServerOperation *op, const gchar *seq_path, gint ite
 
 
 /**
- * gdaui_server_operation_new_in_dialog
+ * gdaui_server_operation_new_in_dialog:
  * @op: a #GdaServerOperation object
  * @parent: (allow-none): the parent window for the new dialog, or %NULL
  * @title: (allow-none): the title of the dialog window, or %NULL
diff --git a/libgda-ui/gdaui-set.c b/libgda-ui/gdaui-set.c
index 07a40a5..d0f99cc 100644
--- a/libgda-ui/gdaui-set.c
+++ b/libgda-ui/gdaui-set.c
@@ -102,7 +102,7 @@ gdaui_set_class_init (GdauiSetClass *class)
        object_class->dispose = gdaui_set_dispose;
 
        /**
-         * GdauiSet::public-data-changed
+         * GdauiSet::public-data-changed:
          * @set: the #GdauiSet
          * 
          * Gets emitted when @set's public data (#GdauiSetGroup or #GdauiSetSource values) have changed
@@ -117,7 +117,7 @@ gdaui_set_class_init (GdauiSetClass *class)
                               NULL, NULL,
                               _gdaui_marshal_VOID__VOID, G_TYPE_NONE, 0);
        /**
-         * GdauiSet::source-model-changed
+         * GdauiSet::source-model-changed:
          * @set: the #GdauiSet
          * 
          * Gets emitted when the data model used in @set's #GdauiSetSource has changed
diff --git a/libgda/Makefile.am b/libgda/Makefile.am
index 09c17da..baf7985 100644
--- a/libgda/Makefile.am
+++ b/libgda/Makefile.am
@@ -373,8 +373,10 @@ vapidir = $(VAPIDIR)
 vapi_DATA=libgda-5.0.vapi
 
 EXTRA_DIST += \
-       Gda-5.0.metadata \
         $(vapi_DATA)
 
 CLEANFILES += libgda-5.0.vapi
 endif
+
+EXTRA_DIST += \
+       Gda-5.0.metadata
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]