[gnac/devel] Added 'Shockwave Flash file' filter

[Benoît Dupasquier <bdupasqu src gnome org>]

commit 97227524f7ee698efae2bef097e0f66dc2abf5c5
Author: Benoît Dupasquier <bdupasqu src gnome org>
Date:   Tue Oct 26 00:48:08 2010 +0100

    Added 'Shockwave Flash file' filter

 data/gnac.desktop.in.in                 |    2 +-
 libgnac/libgnac-metadata.c              |    8 ++++----
 src/gnac-ui.c                           |   23 ++++++++++++-----------
 src/profiles/gnac-profiles-default.c    |    4 ++--
 src/profiles/gnac-profiles-manager.c    |    2 +-
 src/profiles/gnac-profiles-properties.c |    2 +-
 6 files changed, 21 insertions(+), 20 deletions(-)
---
diff --git a/data/gnac.desktop.in.in b/data/gnac.desktop.in.in
index 5b9c987..2f89738 100644
--- a/data/gnac.desktop.in.in
+++ b/data/gnac.desktop.in.in
@@ -4,7 +4,7 @@ GenericName=Gnac
 _Comment=Audio converter for GNOME
 Exec=gnac %F
 Icon=gnac
-MimeType=audio/mpeg;audio/mp4;audio/x-musepack;audio/ogg;audio/vnd.rn-realaudio;audio/x-speex;audio/x-ms-wma;audio/x-flac;audio/x-wav;audio/x-wavpack;audio/x-mpegurl;audio/x-scpls;application/xspf+xml;video/3gpp;video/x-ms-asf;video/x-msvideo;video/x-flv;video/x-matroska;video/mpeg;video/mp4;video/ogg;video/quicktime;application/vnd.rn-realmedia;video/x-ms-wmv;
+MimeType=audio/mpeg;audio/mp4;audio/x-musepack;audio/ogg;audio/vnd.rn-realaudio;audio/x-speex;audio/x-ms-wma;audio/x-flac;audio/x-wav;audio/x-wavpack;audio/x-mpegurl;audio/x-scpls;application/xspf+xml;video/3gpp;video/x-ms-asf;video/x-msvideo;video/x-flv;video/x-matroska;video/mpeg;video/mp4;video/ogg;video/quicktime;application/vnd.rn-realmedia;application/x-shockwave-flash;video/x-ms-wmv;
 StartupNotify=true
 Terminal=false
 Type=Application
diff --git a/libgnac/libgnac-metadata.c b/libgnac/libgnac-metadata.c
index 66bc822..00013d7 100644
--- a/libgnac/libgnac-metadata.c
+++ b/libgnac/libgnac-metadata.c
@@ -230,7 +230,7 @@ libgnac_metadata_process_tag_image(const GstTagList *taglist,
 
       if (!gdk_pixbuf_loader_write(loader, data, size, &error)) 
       {
-        libgnac_debug("Error writing data to pixbuf: %s\n", error->message);
+        libgnac_debug("Error writing data to pixbuf: %s", error->message);
         gdk_pixbuf_loader_close(loader, NULL);
         g_error_free(error);
         return;
@@ -238,7 +238,7 @@ libgnac_metadata_process_tag_image(const GstTagList *taglist,
 
       if (!gdk_pixbuf_loader_close(loader, &error))
       {
-        libgnac_debug("Error closing pixbuf loader: %s\n", error->message);
+        libgnac_debug("Error closing pixbuf loader: %s", error->message);
         g_error_free(error);
         return;
       }
@@ -340,7 +340,7 @@ libgnac_metadata_process_tag(const GstTagList *taglist,
     str = g_value_dup_string(newval);
     if (!g_utf8_validate(str, -1, NULL)) 
     {
-      libgnac_info("%s: %s\n", _("Invalid UTF-8 tag"), tag_name);
+      libgnac_info("%s: %s", _("Invalid UTF-8 tag"), tag_name);
       g_free(str);
       libgnac_metadata_free_gvalue(newval);
       return;
@@ -415,7 +415,7 @@ libgnac_metadata_on_message_error(GstBus          *bus,
   GError *error;
   gchar *debug;
   gst_message_parse_error(message, &error, &debug);
-  libgnac_debug("Error on metadata reading: %s\n", error->message);
+  libgnac_debug("Error on metadata reading: %s", error->message);
 
   md->priv->eos = TRUE; 
 }
diff --git a/src/gnac-ui.c b/src/gnac-ui.c
index 2c85eec..5bdfbe6 100644
--- a/src/gnac-ui.c
+++ b/src/gnac-ui.c
@@ -188,17 +188,18 @@ gnac_ui_file_chooser_get_filters_model(void)
   };
 
   const gchar *video_mime[][2] = {
-    { "video/3gpp"                  , _("3GPP multimedia file") },
-    { "video/x-ms-asf"              , _("ASF video")            },
-    { "video/x-msvideo"             , _("AVI video")            },
-    { "video/x-flv"                 , _("Flash video")          },
-    { "video/x-matroska"            , _("Matroska video")       },
-    { "video/mpeg"                  , _("MPEG video")           },
-    { "video/mp4"                   , _("MPEG-4 video")         },
-    { "video/ogg"                   , _("Ogg video")            },
-    { "video/quicktime"             , _("QuickTime video")      },
-    { "application/vnd.rn-realmedia", _("RealMedia document")   },
-    { "video/x-ms-wmv"              , _("Windows Media video")  },
+    { "video/3gpp"                   , _("3GPP multimedia file") },
+    { "video/x-ms-asf"               , _("ASF video")            },
+    { "video/x-msvideo"              , _("AVI video")            },
+    { "video/x-flv"                  , _("Flash video")          },
+    { "video/x-matroska"             , _("Matroska video")       },
+    { "video/mpeg"                   , _("MPEG video")           },
+    { "video/mp4"                    , _("MPEG-4 video")         },
+    { "video/ogg"                    , _("Ogg video")            },
+    { "video/quicktime"              , _("QuickTime video")      },
+    { "application/vnd.rn-realmedia" , _("RealMedia document")   },
+    { "application/x-shockwave-flash", _("Shockwave Flash file") },
+    { "video/x-ms-wmv"               , _("Windows Media video")  },
     { NULL, NULL }
   };
 
diff --git a/src/profiles/gnac-profiles-default.c b/src/profiles/gnac-profiles-default.c
index 5475247..03c26a8 100755
--- a/src/profiles/gnac-profiles-default.c
+++ b/src/profiles/gnac-profiles-default.c
@@ -45,7 +45,7 @@ gnac_profiles_default_init(BasicFormatInfo *bfi,
   if (!gtk_builder_add_from_file(bfi->builder, bfi->gtkbuilder_xml_file,
           &error))
   {
-    libgnac_critical("%s\n", error->message);
+    libgnac_critical("%s", error->message);
     g_clear_error(&error);
     gnac_exit(EXIT_FAILURE);
   }
@@ -56,7 +56,7 @@ gnac_profiles_default_init(BasicFormatInfo *bfi,
   if (!gtk_builder_add_from_file(bfi->builder, 
       PKGDATADIR "/profiles/gnac-profiles-base-advanced.xml", &error))
   {
-    libgnac_critical("%s\n", error->message);
+    libgnac_critical("%s", error->message);
     g_error_free(error);
     gnac_exit(EXIT_FAILURE);
   }
diff --git a/src/profiles/gnac-profiles-manager.c b/src/profiles/gnac-profiles-manager.c
index 980f2d6..1f1b113 100644
--- a/src/profiles/gnac-profiles-manager.c
+++ b/src/profiles/gnac-profiles-manager.c
@@ -164,7 +164,7 @@ gnac_profiles_mgr_init(StandardCallBack call_back)
   gtk_builder_add_from_file(profiles_mgr_builder, 
       PKGDATADIR "/profiles/gnac-profiles-manager.xml", &error);
   if (error) {
-    libgnac_critical("%s\n", error->message);
+    libgnac_critical("%s", error->message);
     g_error_free(error);
     gnac_exit(EXIT_FAILURE);
   }
diff --git a/src/profiles/gnac-profiles-properties.c b/src/profiles/gnac-profiles-properties.c
index 9e81c28..e14ebee 100644
--- a/src/profiles/gnac-profiles-properties.c
+++ b/src/profiles/gnac-profiles-properties.c
@@ -144,7 +144,7 @@ gnac_profiles_properties_init(void)
   if (!gtk_builder_add_from_file(profiles_properties_builder, 
           PKGDATADIR "/profiles/gnac-profiles-properties.xml", &error))
   {
-    libgnac_critical("%s\n",error->message);
+    libgnac_critical("%s", error->message);
     g_error_free(error);
     gnac_exit(EXIT_FAILURE);
   }