From 2068b4a0c6cd4b2053952b2ec6f6216b193a354f Mon Sep 17 00:00:00 2001 From: Wolfgang Ulbrich Date: Sun, 6 Dec 2015 22:53:42 +0100 Subject: reduce introspection build warnings * Cleans up a bunch of warnings, and gets g-ir-scanner to actually recognize the annotations. taken from: https://git.gnome.org/browse/libgnomekbd/commit/?id=54c7e95 --- libmatekbd/matekbd-desktop-config.c | 6 +++--- libmatekbd/matekbd-desktop-config.h | 2 +- libmatekbd/matekbd-indicator-config.c | 4 ++-- libmatekbd/matekbd-indicator-config.h | 2 +- libmatekbd/matekbd-indicator.c | 6 ++++++ libmatekbd/matekbd-keyboard-config.c | 13 +++++++------ libmatekbd/matekbd-keyboard-config.h | 2 +- libmatekbd/matekbd-keyboard-drawing.c | 6 +++--- libmatekbd/matekbd-status.c | 6 ++++++ libmatekbd/matekbd-util.c | 1 + 10 files changed, 31 insertions(+), 17 deletions(-) diff --git a/libmatekbd/matekbd-desktop-config.c b/libmatekbd/matekbd-desktop-config.c index 0038a9b..1d854ff 100644 --- a/libmatekbd/matekbd-desktop-config.c +++ b/libmatekbd/matekbd-desktop-config.c @@ -30,7 +30,7 @@ #include /** - * MatekbdDesktopConfig + * MatekbdDesktopConfig: */ #define MATEKBD_DESKTOP_CONFIG_SCHEMA MATEKBD_CONFIG_SCHEMA ".general" @@ -40,7 +40,7 @@ const gchar MATEKBD_DESKTOP_CONFIG_KEY_HANDLE_INDICATORS[] = "handle-indicators" const gchar MATEKBD_DESKTOP_CONFIG_KEY_LAYOUT_NAMES_AS_GROUP_NAMES[] = "layout-names-as-group-names"; const gchar MATEKBD_DESKTOP_CONFIG_KEY_LOAD_EXTRA_ITEMS[] = "load-extra-items"; -/** +/* * static common functions */ @@ -123,7 +123,7 @@ static gboolean return TRUE; } -/** +/* * extern MatekbdDesktopConfig config functions */ void diff --git a/libmatekbd/matekbd-desktop-config.h b/libmatekbd/matekbd-desktop-config.h index ce890ae..d592d63 100644 --- a/libmatekbd/matekbd-desktop-config.h +++ b/libmatekbd/matekbd-desktop-config.h @@ -47,7 +47,7 @@ struct _MatekbdDesktopConfig { XklEngine *engine; }; -/** +/* * MatekbdDesktopConfig functions */ extern void matekbd_desktop_config_init (MatekbdDesktopConfig * config, diff --git a/libmatekbd/matekbd-indicator-config.c b/libmatekbd/matekbd-indicator-config.c index cf35223..287189e 100644 --- a/libmatekbd/matekbd-indicator-config.c +++ b/libmatekbd/matekbd-indicator-config.c @@ -35,7 +35,7 @@ #include /** - * MatekbdIndicatorConfig + * MatekbdIndicatorConfig: */ #define MATEKBD_INDICATOR_CONFIG_SCHEMA MATEKBD_CONFIG_SCHEMA ".indicator" #define GTK_STYLE_PATH "*PanelWidget*" @@ -49,7 +49,7 @@ const gchar MATEKBD_INDICATOR_CONFIG_KEY_BACKGROUND_COLOR[] = "background-color" #define SYSTEM_FONT_SCHEMA "org.mate.interface" #define SYSTEM_FONT_KEY "font-name" -/** +/* * static applet config functions */ static void diff --git a/libmatekbd/matekbd-indicator-config.h b/libmatekbd/matekbd-indicator-config.h index c989f2a..f942ec9 100644 --- a/libmatekbd/matekbd-indicator-config.h +++ b/libmatekbd/matekbd-indicator-config.h @@ -44,7 +44,7 @@ struct _MatekbdIndicatorConfig { XklEngine *engine; }; -/** +/* * MatekbdIndicatorConfig functions - * some of them require MatekbdKeyboardConfig as well - * for loading approptiate images diff --git a/libmatekbd/matekbd-indicator.c b/libmatekbd/matekbd-indicator.c index bd7bf31..d142908 100644 --- a/libmatekbd/matekbd-indicator.c +++ b/libmatekbd/matekbd-indicator.c @@ -865,6 +865,11 @@ matekbd_indicator_set_tooltips_format (const gchar format[]) NextIndicator () } +/** + * matekbd_indicator_get_xkl_engine: + * + * Returns: (transfer none): The engine shared by all MatekbdIndicator objects + */ XklEngine * matekbd_indicator_get_xkl_engine () { @@ -873,6 +878,7 @@ matekbd_indicator_get_xkl_engine () /** * matekbd_indicator_get_group_names: + * * Returns: (transfer none) (array zero-terminated=1): List of group names */ gchar ** diff --git a/libmatekbd/matekbd-keyboard-config.c b/libmatekbd/matekbd-keyboard-config.c index 9a7abc2..2c08f3b 100644 --- a/libmatekbd/matekbd-keyboard-config.c +++ b/libmatekbd/matekbd-keyboard-config.c @@ -30,7 +30,7 @@ #include #include -/** +/* * MatekbdKeyboardConfig */ #define MATEKBD_KEYBOARD_CONFIG_SCHEMA MATEKBD_CONFIG_SCHEMA ".kbd" @@ -48,7 +48,7 @@ const gchar *MATEKBD_KEYBOARD_CONFIG_ACTIVE[] = { MATEKBD_KEYBOARD_CONFIG_KEY_OPTIONS }; -/** +/* * static common functions */ @@ -124,7 +124,7 @@ matekbd_keyboard_config_get_lv_descriptions (XklConfigRegistry * return *layout_descr != NULL; } -/** +/* * extern common functions */ const gchar * @@ -178,7 +178,7 @@ matekbd_keyboard_config_split_items (const gchar * merged, gchar ** parent, return TRUE; } -/** +/* * static MatekbdKeyboardConfig functions */ static void @@ -403,7 +403,7 @@ matekbd_keyboard_config_save_params (MatekbdKeyboardConfig * kbd_config, } } -/** +/* * extern MatekbdKeyboardConfig config functions */ void @@ -637,7 +637,8 @@ matekbd_keyboard_config_activate (MatekbdKeyboardConfig * kbd_config) /** * matekbd_keyboard_config_start_listen: - * @func: (scope notified): a function to call when settings are changed + * + * Func: (scope notified): a function to call when settings are changed */ void matekbd_keyboard_config_start_listen (MatekbdKeyboardConfig * kbd_config, diff --git a/libmatekbd/matekbd-keyboard-config.h b/libmatekbd/matekbd-keyboard-config.h index 5864f3d..7de3d5a 100644 --- a/libmatekbd/matekbd-keyboard-config.h +++ b/libmatekbd/matekbd-keyboard-config.h @@ -44,7 +44,7 @@ struct _MatekbdKeyboardConfig { XklEngine *engine; }; -/** +/* * MatekbdKeyboardConfig functions */ extern void matekbd_keyboard_config_init (MatekbdKeyboardConfig * kbd_config, diff --git a/libmatekbd/matekbd-keyboard-drawing.c b/libmatekbd/matekbd-keyboard-drawing.c index bd1a35e..f284428 100644 --- a/libmatekbd/matekbd-keyboard-drawing.c +++ b/libmatekbd/matekbd-keyboard-drawing.c @@ -1002,8 +1002,8 @@ draw_key_label (MatekbdKeyboardDrawingRenderContext * context, } } -/** - The x offset is calculated for complex shapes. It is the rightmost of the vertical lines in the outline +/* + * The x offset is calculated for complex shapes. It is the rightmost of the vertical lines in the outline */ static gint calc_origin_offset_x (XkbOutlineRec * outline) @@ -2225,7 +2225,7 @@ matekbd_keyboard_drawing_set_mods (MatekbdKeyboardDrawing * drawing, guint mods) * from e.g. a GtkWidget or a GtkPrintContext. @cr and @layout may be modified * by the function but will not be unreffed. * - * @returns: %TRUE on success, %FALSE on failure + * Returns: %TRUE on success, %FALSE on failure */ gboolean matekbd_keyboard_drawing_render (MatekbdKeyboardDrawing * kbdrawing, diff --git a/libmatekbd/matekbd-status.c b/libmatekbd/matekbd-status.c index 4beaecb..437e090 100644 --- a/libmatekbd/matekbd-status.c +++ b/libmatekbd/matekbd-status.c @@ -821,6 +821,11 @@ matekbd_status_new (void) GTK_STATUS_ICON (g_object_new (matekbd_status_get_type (), NULL)); } +/** + * matekbd_status_get_xkl_engine: + * + * Returns: (transfer none): The engine shared by all MatekbdStatus objects + */ XklEngine * matekbd_status_get_xkl_engine () { @@ -829,6 +834,7 @@ matekbd_status_get_xkl_engine () /** * matekbd_status_get_group_names: + * * Returns: (transfer none) (array zero-terminated=1): List of group names */ gchar ** diff --git a/libmatekbd/matekbd-util.c b/libmatekbd/matekbd-util.c index f311bd4..91d1a37 100644 --- a/libmatekbd/matekbd-util.c +++ b/libmatekbd/matekbd-util.c @@ -56,6 +56,7 @@ const gchar MATEKBD_PREVIEW_CONFIG_KEY_HEIGHT[] = "height"; /** * matekbd_preview_load_position: + * * Returns: (transfer full): A rectangle to use */ GdkRectangle * -- cgit v1.2.1