GNOME.org
 

[gnome-builder] build: fix introspection warnings for libide

commit b42f2e43c6b60b5d0ea5424100b868b19756e57e
Author: Christian Hergert <christian hergert me>
Date:   Sun Feb 21 14:47:36 2016 -0800

    build: fix introspection warnings for libide

 libide/Makefile.am                         |   38 ++++++++++++++--------------
 libide/ide-debug.h.in                      |    3 ++
 libide/ide-log.c                           |    8 +++---
 libide/ide.h                               |    1 -
 libide/preferences/ide-preferences-entry.c |    5 +++
 libide/search/ide-omni-search-display.c    |    5 +++
 libide/search/ide-omni-search-group.c      |   10 +++++++
 libide/search/ide-omni-search-row.c        |    5 +++
 libide/util/ide-gtk.c                      |   16 +++++++++++
 9 files changed, 67 insertions(+), 24 deletions(-)
---
diff --git a/libide/Makefile.am b/libide/Makefile.am
index b2a071b..1fd140f 100644
--- a/libide/Makefile.am
+++ b/libide/Makefile.am
@@ -154,7 +154,6 @@ libide_1_0_la_public_headers = \
        util/ide-cairo.h \
        util/ide-dnd.h \
        util/ide-file-manager.h \
-       util/ide-gdk.h \
        util/ide-gtk.h \
        util/ide-line-reader.h \
        util/ide-list-inline.h \
@@ -288,10 +287,28 @@ libide_1_0_la_public_sources = \
        ide-worker.c \
        ide.c \
        local/ide-local-device.c \
+       preferences/ide-preferences-entry.c \
+       preferences/ide-preferences-flow-box.c \
+       preferences/ide-preferences-font-button.c \
+       preferences/ide-preferences-group.c \
+       preferences/ide-preferences-page.c \
+       preferences/ide-preferences-spin-button.c \
+       preferences/ide-preferences-switch.c \
+       search/ide-omni-search-display.c \
+       search/ide-omni-search-entry.c \
+       search/ide-omni-search-group.c \
+       search/ide-omni-search-row.c \
        template/ide-project-template.c \
        template/ide-template-base.c \
        template/ide-template-provider.c \
+       util/ide-cairo.c \
+       util/ide-dnd.c \
        util/ide-file-manager.c \
+       util/ide-gtk.c \
+       util/ide-line-reader.c \
+       util/ide-pango.c \
+       util/ide-posix.c \
+       util/ide-rgba.c \
        $(NULL)
 
 libide_1_0_la_SOURCES = \
@@ -393,35 +410,18 @@ libide_1_0_la_SOURCES = \
        preferences/ide-preferences-builtin.h \
        preferences/ide-preferences-bin.c \
        preferences/ide-preferences-bin-private.h \
-       preferences/ide-preferences-entry.c \
-       preferences/ide-preferences-flow-box.c \
-       preferences/ide-preferences-font-button.c \
-       preferences/ide-preferences-group.c \
        preferences/ide-preferences-group-private.h \
        preferences/ide-preferences-language-row.c \
        preferences/ide-preferences-language-row.h \
-       preferences/ide-preferences-page.c \
        preferences/ide-preferences-page-private.h \
        preferences/ide-preferences-perspective.c \
        preferences/ide-preferences-perspective.h \
-       preferences/ide-preferences-spin-button.c \
-       preferences/ide-preferences-switch.c \
-       search/ide-omni-search-display.c \
-       search/ide-omni-search-entry.c \
-       search/ide-omni-search-group.c \
-       search/ide-omni-search-row.c \
        theatrics/ide-box-theatric.c \
        theatrics/ide-box-theatric.h \
-       util/ide-cairo.c \
-       util/ide-dnd.c \
        util/ide-doc-seq.c \
        util/ide-doc-seq.h \
        util/ide-gdk.c \
-       util/ide-gtk.c \
-       util/ide-line-reader.c \
-       util/ide-pango.c \
-       util/ide-posix.c \
-       util/ide-rgba.c \
+       util/ide-gdk.h \
        util/ide-text-util.c \
        util/ide-text-util.h \
        util/ide-window-settings.c \
diff --git a/libide/ide-debug.h.in b/libide/ide-debug.h.in
index e506904..3c75483 100644
--- a/libide/ide-debug.h.in
+++ b/libide/ide-debug.h.in
@@ -30,6 +30,9 @@ G_BEGIN_DECLS
 # undef IDE_ENABLE_TRACE
 #endif
 
+/**
+ * G_LOG_LEVEL_TRACE: (skip)
+ */
 #ifndef G_LOG_LEVEL_TRACE
 # define G_LOG_LEVEL_TRACE (1 << G_LOG_LEVEL_USER_SHIFT)
 #endif
diff --git a/libide/ide-log.c b/libide/ide-log.c
index a7419ba..28cfbd8 100644
--- a/libide/ide-log.c
+++ b/libide/ide-log.c
@@ -80,7 +80,7 @@ ide_log_level_str (GLogLevelFlags log_level)
     case G_LOG_LEVEL_MESSAGE:  return " MESSAGE";
     case G_LOG_LEVEL_INFO:     return "    INFO";
     case G_LOG_LEVEL_DEBUG:    return "   DEBUG";
-    case G_LOG_LEVEL_TRACE:    return "   TRACE";
+    case IDE_LOG_LEVEL_TRACE:  return "   TRACE";
 
     default:
       return " UNKNOWN";
@@ -98,7 +98,7 @@ ide_log_level_str_with_color (GLogLevelFlags log_level)
     case G_LOG_LEVEL_MESSAGE:  return " \033[1;32mMESSAGE\033[0m";
     case G_LOG_LEVEL_INFO:     return "    \033[1;32mINFO\033[0m";
     case G_LOG_LEVEL_DEBUG:    return "   \033[1;32mDEBUG\033[0m";
-    case G_LOG_LEVEL_TRACE:    return "   \033[1;36mTRACE\033[0m";
+    case IDE_LOG_LEVEL_TRACE:  return "   \033[1;36mTRACE\033[0m";
 
     default:
       return " UNKNOWN";
@@ -164,7 +164,7 @@ ide_log_handler (const gchar    *log_domain,
             return;
           break;
 
-        case G_LOG_LEVEL_TRACE:
+        case IDE_LOG_LEVEL_TRACE:
           if (log_verbosity < 4)
             return;
           break;
@@ -252,7 +252,7 @@ ide_log_shutdown (void)
  * Calling this once will cause G_LOG_LEVEL_MESSAGE to be displayed.
  * Calling this twice will cause G_LOG_LEVEL_INFO to be displayed.
  * Calling this thrice will cause G_LOG_LEVEL_DEBUG to be displayed.
- * Calling this four times will cause G_LOG_LEVEL_TRACE to be displayed.
+ * Calling this four times will cause IDE_LOG_LEVEL_TRACE to be displayed.
  *
  * Note that many DEBUG and TRACE level log messages are only compiled into
  * debug builds, and therefore will not be available in release builds.
diff --git a/libide/ide.h b/libide/ide.h
index cfb7ffc..14a35b0 100644
--- a/libide/ide.h
+++ b/libide/ide.h
@@ -140,7 +140,6 @@ G_BEGIN_DECLS
 #include "template/ide-project-template.h"
 #include "template/ide-template-provider.h"
 #include "util/ide-file-manager.h"
-#include "util/ide-gdk.h"
 #include "util/ide-gtk.h"
 #include "util/ide-line-reader.h"
 #include "util/ide-list-inline.h"
diff --git a/libide/preferences/ide-preferences-entry.c b/libide/preferences/ide-preferences-entry.c
index ba1d1ca..d69199a 100644
--- a/libide/preferences/ide-preferences-entry.c
+++ b/libide/preferences/ide-preferences-entry.c
@@ -200,6 +200,11 @@ ide_preferences_entry_init (IdePreferencesEntry *self)
                            G_CONNECT_SWAPPED);
 }
 
+/**
+ * ide_preferences_entry_get_title_widget:
+ *
+ * Returns: (transfer none): A #GtkWidget
+ */
 GtkWidget *
 ide_preferences_entry_get_title_widget (IdePreferencesEntry *self)
 {
diff --git a/libide/search/ide-omni-search-display.c b/libide/search/ide-omni-search-display.c
index 853ad5e..dd92619 100644
--- a/libide/search/ide-omni-search-display.c
+++ b/libide/search/ide-omni-search-display.c
@@ -490,6 +490,11 @@ ide_omni_search_display_disconnect_context (IdeOmniSearchDisplay *self,
     }
 }
 
+/**
+ * ide_omni_search_display_get_context:
+ *
+ * Returns: (transfer none): An IdeSearchContext.
+ */
 IdeSearchContext *
 ide_omni_search_display_get_context (IdeOmniSearchDisplay *self)
 {
diff --git a/libide/search/ide-omni-search-group.c b/libide/search/ide-omni-search-group.c
index 9bea3c2..659e35d 100644
--- a/libide/search/ide-omni-search-group.c
+++ b/libide/search/ide-omni-search-group.c
@@ -62,6 +62,11 @@ ide_omni_search_group_foreach_cb (GtkWidget *widget,
     *row = widget;
 }
 
+/**
+ * ide_omni_search_group_get_first:
+ *
+ * Returns: (transfer none) (nullable): An #IdeSearchResult or %NULL.
+ */
 IdeSearchResult *
 ide_omni_search_group_get_first (IdeOmniSearchGroup *self)
 {
@@ -80,6 +85,11 @@ ide_omni_search_group_get_first (IdeOmniSearchGroup *self)
   return ret;
 }
 
+/**
+ * ide_omni_search_group_get_provider:
+ *
+ * Returns: (transfer none): An #IdeSearchProvider
+ */
 IdeSearchProvider *
 ide_omni_search_group_get_provider (IdeOmniSearchGroup *self)
 {
diff --git a/libide/search/ide-omni-search-row.c b/libide/search/ide-omni-search-row.c
index 4a50a1f..0ec7f6d 100644
--- a/libide/search/ide-omni-search-row.c
+++ b/libide/search/ide-omni-search-row.c
@@ -64,6 +64,11 @@ ide_omni_search_row_connect (IdeOmniSearchRow *row,
   gtk_label_set_markup (row->title, title);
 }
 
+/**
+ * ide_omni_search_row_get_result:
+ *
+ * Returns: (transfer none): An #IdeSearchResult.
+ */
 IdeSearchResult *
 ide_omni_search_row_get_result (IdeOmniSearchRow *row)
 {
diff --git a/libide/util/ide-gtk.c b/libide/util/ide-gtk.c
index 7195666..104e554 100644
--- a/libide/util/ide-gtk.c
+++ b/libide/util/ide-gtk.c
@@ -150,6 +150,13 @@ ide_widget_hierarchy_changed (GtkWidget *widget,
     }
 }
 
+/**
+ * ide_widget_set_context_handler:
+ * @widget: (type Gtk.Widget): A #GtkWidget
+ * @handler: (scope async): A callback to handle the context
+ *
+ * Calls @handler when the #IdeContext has been set for @widget.
+ */
 void
 ide_widget_set_context_handler (gpointer                widget,
                                 IdeWidgetContextHandler handler)
@@ -245,6 +252,15 @@ ide_widget_show_with_fade (GtkWidget *widget)
     }
 }
 
+/**
+ * ide_widget_get_workbench:
+ *
+ * Gets the workbench @widget is associated with, if any.
+ *
+ * If no workbench is associated, NULL is returned.
+ *
+ * Returns: (transfer none) (nullable): An #IdeWorkbench
+ */
 IdeWorkbench *
 ide_widget_get_workbench (GtkWidget *widget)
 {
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]