[gnac/devel] Ensured filters have been initialised before returning default_file_filter
- From: Benoît Dupasquier <bdupasqu src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnac/devel] Ensured filters have been initialised before returning default_file_filter
- Date: Sun, 7 Nov 2010 12:10:29 +0000 (UTC)
commit 4a90d763bcfb1066e44f290eeb8f0167414f7d98
Author: Benoît Dupasquier <bdupasqu src gnome org>
Date: Sun Nov 7 12:10:16 2010 +0000
Ensured filters have been initialised before returning default_file_filter
libgnac/libgnac-converter.c | 11 ++++-------
src/gnac-ui.c | 3 +++
2 files changed, 7 insertions(+), 7 deletions(-)
---
diff --git a/libgnac/libgnac-converter.c b/libgnac/libgnac-converter.c
index acb67e2..90ce4d3 100644
--- a/libgnac/libgnac-converter.c
+++ b/libgnac/libgnac-converter.c
@@ -568,9 +568,9 @@ libgnac_converter_class_init(LibgnacConverterClass *klass)
static gboolean
libgnac_converter_start_next(LibgnacConverter *self)
{
- LibgnacConverterPrivate *priv;
GError *err = NULL;
- LibgnacMediaItem *item = NULL;
+ LibgnacConverterPrivate *priv;
+ LibgnacMediaItem *item = NULL;
gchar *key = NULL;
gchar *uri = NULL;
@@ -584,11 +584,8 @@ libgnac_converter_start_next(LibgnacConverter *self)
key = g_queue_pop_head(priv->queue_copy);
if (key) item = g_hash_table_lookup(priv->file_table, key);
else item = NULL;
-
- if (!item)
- {
- return FALSE;
- }
+
+ if (!item) return FALSE;
if (err) {
g_clear_error(&err);
diff --git a/src/gnac-ui.c b/src/gnac-ui.c
index b2664aa..a58754a 100644
--- a/src/gnac-ui.c
+++ b/src/gnac-ui.c
@@ -517,6 +517,9 @@ gnac_ui_get_current_filter(void)
GtkFileFilter *
gnac_ui_get_default_filter(void)
{
+ /* make sure the filters have been created */
+ gnac_ui_get_file_chooser();
+
return default_file_filter;
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]