[grilo] core: Avoid pedantic compiler warnings with C++.



commit b5382e28d6765301cc64271e974cc1af35c8ceac
Author: Murray Cumming <murrayc murrayc com>
Date:   Tue Jul 10 12:38:03 2012 +0200

    core: Avoid pedantic compiler warnings with C++.
    
    g++ complains about trailing commas in enums when using
    -Wpedantic.
    
    This fixes https://bugzilla.gnome.org/show_bug.cgi?id=679674
    
    Signed-off-by: Juan A. Suarez Romero <jasuarez igalia com>

 autogen.sh                  |    2 +-
 libs/net/grl-net-wc.c       |    2 +-
 libs/net/grl-net-wc.h       |    2 +-
 src/grl-caps.h              |    2 +-
 src/grl-media-source.c      |    4 ++--
 src/grl-media-source.h      |    2 +-
 src/grl-metadata-source.c   |    2 +-
 src/grl-metadata-source.h   |    4 ++--
 src/grl-operation-options.h |    2 +-
 src/grl-plugin-registry.c   |    2 +-
 src/grl-plugin-registry.h   |    2 +-
 tools/grilo-test-ui/main.c  |   10 +++++-----
 12 files changed, 18 insertions(+), 18 deletions(-)
---
diff --git a/autogen.sh b/autogen.sh
index 1bdfde4..1569f7b 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -20,4 +20,4 @@ which gnome-autogen.sh || {
 REQUIRED_AUTOMAKE_VERSION=1.10 \
 USE_GNOME2_MACROS=1 \
 USE_COMMON_DOC_BUILD=yes \
-. gnome-autogen.sh $*
+bash gnome-autogen.sh $*
diff --git a/libs/net/grl-net-wc.c b/libs/net/grl-net-wc.c
index 68c9971..ebb15cf 100644
--- a/libs/net/grl-net-wc.c
+++ b/libs/net/grl-net-wc.c
@@ -52,7 +52,7 @@ enum {
   PROP_THROTTLING,
   PROP_CACHE,
   PROP_CACHE_SIZE,
-  PROP_USER_AGENT,
+  PROP_USER_AGENT
 };
 
 #define GRL_NET_WC_GET_PRIVATE(object)			\
diff --git a/libs/net/grl-net-wc.h b/libs/net/grl-net-wc.h
index fc472e0..58509bd 100644
--- a/libs/net/grl-net-wc.h
+++ b/libs/net/grl-net-wc.h
@@ -54,7 +54,7 @@ typedef enum {
 	GRL_NET_WC_ERROR_FORBIDDEN,
 	GRL_NET_WC_ERROR_NETWORK_ERROR,
 	GRL_NET_WC_ERROR_PROXY_ERROR,
-	GRL_NET_WC_ERROR_CANCELLED,
+	GRL_NET_WC_ERROR_CANCELLED
 } GrlNetWcError;
 
 #define GRL_TYPE_NET_WC				\
diff --git a/src/grl-caps.h b/src/grl-caps.h
index b53de9f..93a0c13 100644
--- a/src/grl-caps.h
+++ b/src/grl-caps.h
@@ -72,7 +72,7 @@ typedef enum {
   GRL_TYPE_FILTER_AUDIO = (1 << 0),
   GRL_TYPE_FILTER_VIDEO = (1 << 1),
   GRL_TYPE_FILTER_IMAGE = (1 << 2),
-  GRL_TYPE_FILTER_ALL = (GRL_TYPE_FILTER_AUDIO | GRL_TYPE_FILTER_VIDEO | GRL_TYPE_FILTER_IMAGE),
+  GRL_TYPE_FILTER_ALL = (GRL_TYPE_FILTER_AUDIO | GRL_TYPE_FILTER_VIDEO | GRL_TYPE_FILTER_IMAGE)
 } GrlTypeFilter;
 
 
diff --git a/src/grl-media-source.c b/src/grl-media-source.c
index 3778534..1bfba42 100644
--- a/src/grl-media-source.c
+++ b/src/grl-media-source.c
@@ -64,7 +64,7 @@ GRL_LOG_DOMAIN(media_source_log_domain);
 
 enum {
   PROP_0,
-  PROP_AUTO_SPLIT_THRESHOLD,
+  PROP_AUTO_SPLIT_THRESHOLD
 };
 
 struct _GrlMediaSourcePrivate {
@@ -172,7 +172,7 @@ grl_media_source_supported_operations (GrlMetadataSource *metadata_source);
 
 enum {
   SIG_CONTENT_CHANGED,
-  SIG_LAST,
+  SIG_LAST
 };
 static gint registry_signals[SIG_LAST];
 
diff --git a/src/grl-media-source.h b/src/grl-media-source.h
index 6a69754..ce1b85f 100644
--- a/src/grl-media-source.h
+++ b/src/grl-media-source.h
@@ -77,7 +77,7 @@
 typedef enum {
   GRL_CONTENT_CHANGED,
   GRL_CONTENT_ADDED,
-  GRL_CONTENT_REMOVED,
+  GRL_CONTENT_REMOVED
 } GrlMediaSourceChangeType;
 
 /* GrlMediaSource object */
diff --git a/src/grl-metadata-source.c b/src/grl-metadata-source.c
index 9ed6686..e88f8d6 100644
--- a/src/grl-metadata-source.c
+++ b/src/grl-metadata-source.c
@@ -67,7 +67,7 @@ enum {
   PROP_0,
   PROP_ID,
   PROP_NAME,
-  PROP_DESC,
+  PROP_DESC
 };
 
 struct _GrlMetadataSourcePrivate {
diff --git a/src/grl-metadata-source.h b/src/grl-metadata-source.h
index ac14a3d..2702c0d 100644
--- a/src/grl-metadata-source.h
+++ b/src/grl-metadata-source.h
@@ -74,7 +74,7 @@
  */
 typedef enum {
   GRL_WRITE_NORMAL     = 0,        /* Normal mode */
-  GRL_WRITE_FULL       = (1 << 0), /* Try other plugins if necessary */
+  GRL_WRITE_FULL       = (1 << 0)  /* Try other plugins if necessary */
 } GrlMetadataWritingFlags;
 
 /* GrlMetadataSource object */
@@ -212,7 +212,7 @@ typedef enum {
   GRL_OP_REMOVE          = 1 << 7,
   GRL_OP_SET_METADATA    = 1 << 8,
   GRL_OP_MEDIA_FROM_URI  = 1 << 9,
-  GRL_OP_NOTIFY_CHANGE   = 1 << 10,
+  GRL_OP_NOTIFY_CHANGE   = 1 << 10
 } GrlSupportedOps;
 
 /* GrlMetadataSource class */
diff --git a/src/grl-operation-options.h b/src/grl-operation-options.h
index ef4bf85..02af168 100644
--- a/src/grl-operation-options.h
+++ b/src/grl-operation-options.h
@@ -70,7 +70,7 @@ typedef enum {
   GRL_RESOLVE_NORMAL     = 0,        /* Normal mode */
   GRL_RESOLVE_FULL       = (1 << 0), /* Try other plugins if necessary */
   GRL_RESOLVE_IDLE_RELAY = (1 << 1), /* Use idle loop to relay results */
-  GRL_RESOLVE_FAST_ONLY  = (1 << 2), /* Only resolve fast metadata keys */
+  GRL_RESOLVE_FAST_ONLY  = (1 << 2)  /* Only resolve fast metadata keys */
 } GrlMetadataResolutionFlags;
 
 #define GRL_COUNT_INFINITY (-1)
diff --git a/src/grl-plugin-registry.c b/src/grl-plugin-registry.c
index a4ef7b0..564fc34 100644
--- a/src/grl-plugin-registry.c
+++ b/src/grl-plugin-registry.c
@@ -111,7 +111,7 @@ static GrlKeyID key_id_handler_add (struct KeyIDHandler *handler,
 enum {
   SIG_SOURCE_ADDED,
   SIG_SOURCE_REMOVED,
-  SIG_LAST,
+  SIG_LAST
 };
 static gint registry_signals[SIG_LAST];
 
diff --git a/src/grl-plugin-registry.h b/src/grl-plugin-registry.h
index 76eca2b..8695495 100644
--- a/src/grl-plugin-registry.h
+++ b/src/grl-plugin-registry.h
@@ -162,7 +162,7 @@ typedef enum {
   GRL_PLUGIN_RANK_LOW     = -32,
   GRL_PLUGIN_RANK_DEFAULT =   0,
   GRL_PLUGIN_RANK_HIGH    =  32,
-  GRL_PLUGIN_RANK_HIGHEST =  64,
+  GRL_PLUGIN_RANK_HIGHEST =  64
 } GrlPluginRank;
 
 /* GrlPluginRegistry object */
diff --git a/tools/grilo-test-ui/main.c b/tools/grilo-test-ui/main.c
index f31caf6..402ba77 100644
--- a/tools/grilo-test-ui/main.c
+++ b/tools/grilo-test-ui/main.c
@@ -89,22 +89,22 @@ enum {
   BROWSER_MODEL_CONTENT,
   BROWSER_MODEL_TYPE,
   BROWSER_MODEL_NAME,
-  BROWSER_MODEL_ICON,
+  BROWSER_MODEL_ICON
 };
 
 enum {
   METADATA_MODEL_NAME = 0,
-  METADATA_MODEL_VALUE,
+  METADATA_MODEL_VALUE
 };
 
 enum {
   SEARCH_MODEL_NAME = 0,
-  SEARCH_MODEL_SOURCE,
+  SEARCH_MODEL_SOURCE
 };
 
 enum {
   QUERY_MODEL_NAME = 0,
-  QUERY_MODEL_SOURCE,
+  QUERY_MODEL_SOURCE
 };
 
 typedef struct {
@@ -162,7 +162,7 @@ typedef struct {
     OP_TYPE_BROWSE,
     OP_TYPE_SEARCH,
     OP_TYPE_QUERY,
-    OP_TYPE_MULTI_SEARCH,
+    OP_TYPE_MULTI_SEARCH
   } type;
   guint offset;
   guint count;



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]