GNOME.org
 

[totem-pl-parser/wip/hadess/add-ignored-extensions: 2/4] plparser: Fix "Unknown namespace for symbol" warnings

commit ae9afb427255d69d3af2eceadf9ef3fdbe061168
Author: Bastien Nocera <hadess hadess net>
Date:   Tue Nov 12 11:49:55 2019 +0100

    plparser: Fix "Unknown namespace for symbol" warnings
    
    The _IS_ was in the wrong location for the symbol.
    totem-pl-parser/plparse/totem-pl-parser.h:38: Warning: TotemPlParser: symbol='TOTEM_IS_PL_PARSER': 
Unknown namespace for symbol 'TOTEM_IS_PL_PARSER'
    totem-pl-parser/plparse/totem-pl-parser.h:39: Warning: TotemPlParser: symbol='TOTEM_IS_PL_PARSER_CLASS': 
Unknown namespace for symbol 'TOTEM_IS_PL_PARSER_CLASS'
    totem-pl-parser/plparse/totem-pl-playlist.h:32: Warning: TotemPlParser: symbol='TOTEM_IS_PL_PLAYLIST': 
Unknown namespace for symbol 'TOTEM_IS_PL_PLAYLIST'
    totem-pl-parser/plparse/totem-pl-playlist.h:33: Warning: TotemPlParser: 
symbol='TOTEM_IS_PL_PLAYLIST_CLASS': Unknown namespace for symbol 'TOTEM_IS_PL_PLAYLIST_CLASS'

 plparse/totem-pl-parser.c   | 16 ++++++++--------
 plparse/totem-pl-parser.h   |  4 ++--
 plparse/totem-pl-playlist.c | 26 +++++++++++++-------------
 plparse/totem-pl-playlist.h |  4 ++--
 4 files changed, 25 insertions(+), 25 deletions(-)
---
diff --git a/plparse/totem-pl-parser.c b/plparse/totem-pl-parser.c
index f4ad288..7e116f2 100644
--- a/plparse/totem-pl-parser.c
+++ b/plparse/totem-pl-parser.c
@@ -1136,8 +1136,8 @@ totem_pl_parser_save (TotemPlParser      *parser,
                       TotemPlParserType   type,
                       GError            **error)
 {
-        g_return_val_if_fail (TOTEM_IS_PL_PARSER (parser), FALSE);
-        g_return_val_if_fail (TOTEM_IS_PL_PLAYLIST (playlist), FALSE);
+        g_return_val_if_fail (TOTEM_PL_IS_PARSER (parser), FALSE);
+        g_return_val_if_fail (TOTEM_PL_IS_PLAYLIST (playlist), FALSE);
         g_return_val_if_fail (G_IS_FILE (dest), FALSE);
 
         if (totem_pl_playlist_size (playlist) == 0) {
@@ -2072,7 +2072,7 @@ totem_pl_parser_parse_with_base_async (TotemPlParser *parser, const char *uri, c
        GTask *task;
        ParseAsyncData *data;
 
-       g_return_if_fail (TOTEM_IS_PL_PARSER (parser));
+       g_return_if_fail (TOTEM_PL_IS_PARSER (parser));
        g_return_if_fail (uri != NULL);
        g_return_if_fail (strstr (uri, "://") != NULL);
 
@@ -2108,7 +2108,7 @@ totem_pl_parser_parse_with_base (TotemPlParser *parser, const char *uri,
        TotemPlParserResult retval;
        TotemPlParseData data;
 
-       g_return_val_if_fail (TOTEM_IS_PL_PARSER (parser), TOTEM_PL_PARSER_RESULT_UNHANDLED);
+       g_return_val_if_fail (TOTEM_PL_IS_PARSER (parser), TOTEM_PL_PARSER_RESULT_UNHANDLED);
        g_return_val_if_fail (uri != NULL, TOTEM_PL_PARSER_RESULT_UNHANDLED);
        g_return_val_if_fail (strstr (uri, "://") != NULL,
                        TOTEM_PL_PARSER_RESULT_ERROR);
@@ -2183,7 +2183,7 @@ totem_pl_parser_parse_finish (TotemPlParser *parser, GAsyncResult *async_result,
 {
        GTask *task = G_TASK (async_result);
 
-       g_return_val_if_fail (TOTEM_IS_PL_PARSER (parser), FALSE);
+       g_return_val_if_fail (TOTEM_PL_IS_PARSER (parser), FALSE);
        g_return_val_if_fail (g_task_is_valid (async_result, parser), FALSE);
 
        /* Propagate any errors which were caught and return the result; otherwise just return the result */
@@ -2226,7 +2226,7 @@ totem_pl_parser_add_ignored_scheme (TotemPlParser *parser,
 {
        char *s;
 
-       g_return_if_fail (TOTEM_IS_PL_PARSER (parser));
+       g_return_if_fail (TOTEM_PL_IS_PARSER (parser));
 
        g_mutex_lock (&parser->priv->ignore_mutex);
 
@@ -2250,7 +2250,7 @@ void
 totem_pl_parser_add_ignored_mimetype (TotemPlParser *parser,
                const char *mimetype)
 {
-       g_return_if_fail (TOTEM_IS_PL_PARSER (parser));
+       g_return_if_fail (TOTEM_PL_IS_PARSER (parser));
 
        g_mutex_lock (&parser->priv->ignore_mutex);
        g_hash_table_insert (parser->priv->ignore_mimetypes, g_strdup (mimetype), GINT_TO_POINTER (1));
@@ -2271,7 +2271,7 @@ void
 totem_pl_parser_add_ignored_glob (TotemPlParser *parser,
                                  const char    *glob)
 {
-       g_return_if_fail (TOTEM_IS_PL_PARSER (parser));
+       g_return_if_fail (TOTEM_PL_IS_PARSER (parser));
 
        g_mutex_lock (&parser->priv->ignore_mutex);
        g_hash_table_insert (parser->priv->ignore_globs, g_strdup (glob), GINT_TO_POINTER (1));
diff --git a/plparse/totem-pl-parser.h b/plparse/totem-pl-parser.h
index 7e83401..b36d8f0 100644
--- a/plparse/totem-pl-parser.h
+++ b/plparse/totem-pl-parser.h
@@ -35,8 +35,8 @@ G_BEGIN_DECLS
 #define TOTEM_TYPE_PL_PARSER            (totem_pl_parser_get_type ())
 #define TOTEM_PL_PARSER(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), TOTEM_TYPE_PL_PARSER, 
TotemPlParser))
 #define TOTEM_PL_PARSER_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), TOTEM_TYPE_PL_PARSER, 
TotemPlParserClass))
-#define TOTEM_IS_PL_PARSER(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TOTEM_TYPE_PL_PARSER))
-#define TOTEM_IS_PL_PARSER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TOTEM_TYPE_PL_PARSER))
+#define TOTEM_PL_IS_PARSER(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TOTEM_TYPE_PL_PARSER))
+#define TOTEM_PL_IS_PARSER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TOTEM_TYPE_PL_PARSER))
 
 /**
  * TotemPlParserResult:
diff --git a/plparse/totem-pl-playlist.c b/plparse/totem-pl-playlist.c
index a81ff85..596653a 100644
--- a/plparse/totem-pl-playlist.c
+++ b/plparse/totem-pl-playlist.c
@@ -108,7 +108,7 @@ totem_pl_playlist_size (TotemPlPlaylist *playlist)
 {
         TotemPlPlaylistPrivate *priv;
 
-        g_return_val_if_fail (TOTEM_IS_PL_PLAYLIST (playlist), 0);
+        g_return_val_if_fail (TOTEM_PL_IS_PLAYLIST (playlist), 0);
 
         priv = totem_pl_playlist_get_instance_private (playlist);
 
@@ -140,7 +140,7 @@ totem_pl_playlist_prepend (TotemPlPlaylist     *playlist,
         TotemPlPlaylistPrivate *priv;
         GHashTable *item;
 
-        g_return_if_fail (TOTEM_IS_PL_PLAYLIST (playlist));
+        g_return_if_fail (TOTEM_PL_IS_PLAYLIST (playlist));
         g_return_if_fail (iter != NULL);
 
         priv = totem_pl_playlist_get_instance_private (playlist);
@@ -169,7 +169,7 @@ totem_pl_playlist_append (TotemPlPlaylist     *playlist,
         GHashTable *item;
         GList *list_item;
 
-        g_return_if_fail (TOTEM_IS_PL_PLAYLIST (playlist));
+        g_return_if_fail (TOTEM_PL_IS_PLAYLIST (playlist));
         g_return_if_fail (iter != NULL);
 
         priv = totem_pl_playlist_get_instance_private (playlist);
@@ -206,7 +206,7 @@ totem_pl_playlist_insert (TotemPlPlaylist     *playlist,
         TotemPlPlaylistPrivate *priv;
         GHashTable *item;
 
-        g_return_if_fail (TOTEM_IS_PL_PLAYLIST (playlist));
+        g_return_if_fail (TOTEM_PL_IS_PLAYLIST (playlist));
         g_return_if_fail (iter != NULL);
 
         priv = totem_pl_playlist_get_instance_private (playlist);
@@ -256,7 +256,7 @@ totem_pl_playlist_iter_first (TotemPlPlaylist     *playlist,
 {
         TotemPlPlaylistPrivate *priv;
 
-        g_return_val_if_fail (TOTEM_IS_PL_PLAYLIST (playlist), FALSE);
+        g_return_val_if_fail (TOTEM_PL_IS_PLAYLIST (playlist), FALSE);
         g_return_val_if_fail (iter != NULL, FALSE);
 
         priv = totem_pl_playlist_get_instance_private (playlist);
@@ -288,7 +288,7 @@ gboolean
 totem_pl_playlist_iter_next (TotemPlPlaylist     *playlist,
                              TotemPlPlaylistIter *iter)
 {
-        g_return_val_if_fail (TOTEM_IS_PL_PLAYLIST (playlist), FALSE);
+        g_return_val_if_fail (TOTEM_PL_IS_PLAYLIST (playlist), FALSE);
         g_return_val_if_fail (check_iter (playlist, iter), FALSE);
 
         iter->data2 = ((GList *) iter->data2)->next;
@@ -312,7 +312,7 @@ gboolean
 totem_pl_playlist_iter_prev (TotemPlPlaylist     *playlist,
                              TotemPlPlaylistIter *iter)
 {
-        g_return_val_if_fail (TOTEM_IS_PL_PLAYLIST (playlist), FALSE);
+        g_return_val_if_fail (TOTEM_PL_IS_PLAYLIST (playlist), FALSE);
         g_return_val_if_fail (check_iter (playlist, iter), FALSE);
 
         iter->data2 = ((GList *) iter->data2)->prev;
@@ -341,7 +341,7 @@ totem_pl_playlist_get_value (TotemPlPlaylist     *playlist,
         GHashTable *item_data;
         gchar *str;
 
-        g_return_val_if_fail (TOTEM_IS_PL_PLAYLIST (playlist), FALSE);
+        g_return_val_if_fail (TOTEM_PL_IS_PLAYLIST (playlist), FALSE);
         g_return_val_if_fail (check_iter (playlist, iter), FALSE);
         g_return_val_if_fail (key != NULL, FALSE);
         g_return_val_if_fail (value != NULL, FALSE);
@@ -376,7 +376,7 @@ totem_pl_playlist_get_valist (TotemPlPlaylist     *playlist,
         GHashTable *item_data;
         gchar *key, **value;
 
-        g_return_if_fail (TOTEM_IS_PL_PLAYLIST (playlist));
+        g_return_if_fail (TOTEM_PL_IS_PLAYLIST (playlist));
         g_return_if_fail (check_iter (playlist, iter));
 
         item_data = ((GList *) iter->data2)->data;
@@ -413,7 +413,7 @@ totem_pl_playlist_get (TotemPlPlaylist     *playlist,
 {
         va_list args;
 
-        g_return_if_fail (TOTEM_IS_PL_PLAYLIST (playlist));
+        g_return_if_fail (TOTEM_PL_IS_PLAYLIST (playlist));
         g_return_if_fail (check_iter (playlist, iter));
 
         va_start (args, iter);
@@ -441,7 +441,7 @@ totem_pl_playlist_set_value (TotemPlPlaylist     *playlist,
         GHashTable *item_data;
         gchar *str;
 
-        g_return_val_if_fail (TOTEM_IS_PL_PLAYLIST (playlist), FALSE);
+        g_return_val_if_fail (TOTEM_PL_IS_PLAYLIST (playlist), FALSE);
         g_return_val_if_fail (check_iter (playlist, iter), FALSE);
         g_return_val_if_fail (key != NULL, FALSE);
         g_return_val_if_fail (value != NULL, FALSE);
@@ -490,7 +490,7 @@ totem_pl_playlist_set_valist (TotemPlPlaylist     *playlist,
         GHashTable *item_data;
         gchar *key, *value;
 
-        g_return_if_fail (TOTEM_IS_PL_PLAYLIST (playlist));
+        g_return_if_fail (TOTEM_PL_IS_PLAYLIST (playlist));
         g_return_if_fail (check_iter (playlist, iter));
 
         item_data = ((GList *) iter->data2)->data;
@@ -524,7 +524,7 @@ totem_pl_playlist_set (TotemPlPlaylist     *playlist,
 {
         va_list args;
 
-        g_return_if_fail (TOTEM_IS_PL_PLAYLIST (playlist));
+        g_return_if_fail (TOTEM_PL_IS_PLAYLIST (playlist));
         g_return_if_fail (check_iter (playlist, iter));
 
         va_start (args, iter);
diff --git a/plparse/totem-pl-playlist.h b/plparse/totem-pl-playlist.h
index ee7b206..b266ea6 100644
--- a/plparse/totem-pl-playlist.h
+++ b/plparse/totem-pl-playlist.h
@@ -29,8 +29,8 @@ G_BEGIN_DECLS
 #define TOTEM_TYPE_PL_PLAYLIST            (totem_pl_playlist_get_type ())
 #define TOTEM_PL_PLAYLIST(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), TOTEM_TYPE_PL_PLAYLIST, 
TotemPlPlaylist))
 #define TOTEM_PL_PLAYLIST_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), TOTEM_TYPE_PL_PLAYLIST, 
TotemPlPlaylistClass))
-#define TOTEM_IS_PL_PLAYLIST(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TOTEM_TYPE_PL_PLAYLIST))
-#define TOTEM_IS_PL_PLAYLIST_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TOTEM_TYPE_PL_PLAYLIST))
+#define TOTEM_PL_IS_PLAYLIST(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TOTEM_TYPE_PL_PLAYLIST))
+#define TOTEM_PL_IS_PLAYLIST_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TOTEM_TYPE_PL_PLAYLIST))
 
 /**
  * TotemPlPlaylist:
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]