[totem] Updated files from libegg master
- From: Philip Withnall <pwithnall src gnome org>
- To: svn-commits-list gnome org
- Subject: [totem] Updated files from libegg master
- Date: Sun, 26 Jul 2009 19:26:48 +0000 (UTC)
commit d30b179e7e5a04fe5fe4d72b50df802f04cbafc2
Author: Philip Withnall <philip tecnocode co uk>
Date: Sun Jul 26 20:26:29 2009 +0100
Updated files from libegg master
src/eggdesktopfile.c | 4 +-
src/eggfileformatchooser.c | 572 ++++++++++++++++++++++++++++++++++++++++++--
src/eggfileformatchooser.h | 18 ++
3 files changed, 569 insertions(+), 25 deletions(-)
---
diff --git a/src/eggdesktopfile.c b/src/eggdesktopfile.c
index af8a98e..6f6b946 100644
--- a/src/eggdesktopfile.c
+++ b/src/eggdesktopfile.c
@@ -1274,8 +1274,8 @@ egg_desktop_file_launchv (EggDesktopFile *desktop_file,
out:
if (env)
{
- g_strfreev ((char **)env->pdata);
- g_ptr_array_free (env, FALSE);
+ g_ptr_array_foreach (env, (GFunc)g_free, NULL);
+ g_ptr_array_free (env, TRUE);
}
free_document_list (translated_documents);
diff --git a/src/eggfileformatchooser.c b/src/eggfileformatchooser.c
index 1b88489..5eeecdb 100644
--- a/src/eggfileformatchooser.c
+++ b/src/eggfileformatchooser.c
@@ -1,10 +1,30 @@
+/* EggFileFormatChooser
+ * Copyright (C) 2007 Mathias Hasselmann
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
#include "eggfileformatchooser.h"
+#include "egg-macros.h"
#include <glib/gi18n.h>
#include <gtk/gtk.h>
#include <string.h>
#include <ctype.h>
+typedef struct _EggFileFormatFilterInfo EggFileFormatFilterInfo;
typedef struct _EggFileFormatSearch EggFileFormatSearch;
enum
@@ -13,6 +33,7 @@ enum
MODEL_COLUMN_NAME,
MODEL_COLUMN_ICON,
MODEL_COLUMN_EXTENSIONS,
+ MODEL_COLUMN_FILTER,
MODEL_COLUMN_DATA,
MODEL_COLUMN_DESTROY
};
@@ -29,6 +50,18 @@ struct _EggFileFormatChooserPrivate
GtkTreeSelection *selection;
guint idle_hack;
guint last_id;
+
+ GtkFileChooser *chooser;
+ GtkFileFilter *all_files;
+ GtkFileFilter *supported_files;
+};
+
+struct _EggFileFormatFilterInfo
+{
+ GHashTable *extension_set;
+ GSList *extension_list;
+ gboolean show_extensions;
+ gchar *name;
};
struct _EggFileFormatSearch
@@ -45,27 +78,177 @@ static guint signals[SIGNAL_LAST];
G_DEFINE_TYPE (EggFileFormatChooser,
egg_file_format_chooser,
GTK_TYPE_EXPANDER);
+EGG_DEFINE_QUARK (EggFileFormatFilterInfo,
+ egg_file_format_filter_info);
+
+static EggFileFormatFilterInfo*
+egg_file_format_filter_info_new (const gchar *name,
+ gboolean show_extensions)
+{
+ EggFileFormatFilterInfo *self;
+
+ self = g_new0 (EggFileFormatFilterInfo, 1);
+ self->extension_set = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL);
+ self->show_extensions = show_extensions;
+ self->name = g_strdup (name);
+
+ return self;
+}
+
+static void
+egg_file_format_filter_info_free (gpointer boxed)
+{
+ EggFileFormatFilterInfo *self;
+
+ if (boxed)
+ {
+ self = boxed;
+
+ g_hash_table_unref (self->extension_set);
+ g_slist_foreach (self->extension_list, (GFunc) g_free, NULL);
+ g_slist_free (self->extension_list);
+ g_free (self->name);
+ g_free (self);
+ }
+}
+
+static gboolean
+egg_file_format_filter_find (gpointer key,
+ gpointer value G_GNUC_UNUSED,
+ gpointer data)
+{
+ const GtkFileFilterInfo *info = data;
+ const gchar *pattern = key;
+
+ return g_str_has_suffix (info->filename, pattern + 1);
+}
+
+static gboolean
+egg_file_format_filter_filter (const GtkFileFilterInfo *info,
+ gpointer data)
+{
+ EggFileFormatFilterInfo *self = data;
+
+ return NULL != g_hash_table_find (self->extension_set,
+ egg_file_format_filter_find,
+ (gpointer) info);
+}
+
+static GtkFileFilter*
+egg_file_format_filter_new (const gchar *name,
+ gboolean show_extensions)
+{
+ GtkFileFilter *filter;
+ EggFileFormatFilterInfo *info;
+
+ filter = gtk_file_filter_new ();
+ gtk_file_filter_set_name (filter, name);
+
+ info = egg_file_format_filter_info_new (name, show_extensions);
+
+ gtk_file_filter_add_custom (filter, GTK_FILE_FILTER_FILENAME,
+ egg_file_format_filter_filter,
+ info, NULL);
+ g_object_set_qdata_full (G_OBJECT (filter),
+ egg_file_format_filter_info_quark (),
+ info, egg_file_format_filter_info_free);
+
+ return filter;
+}
+
+static void
+egg_file_format_filter_add_extensions (GtkFileFilter *filter,
+ const gchar *extensions)
+{
+ EggFileFormatFilterInfo *info;
+ GString *filter_name;
+ const gchar *extptr;
+ gchar *pattern;
+ gsize length;
+
+ g_assert (NULL != extensions);
+
+ info = g_object_get_qdata (G_OBJECT (filter),
+ egg_file_format_filter_info_quark ());
+
+ info->extension_list = g_slist_prepend (info->extension_list,
+ g_strdup (extensions));
+
+ if (info->show_extensions)
+ {
+ filter_name = g_string_new (info->name);
+ g_string_append (filter_name, " (");
+ }
+ else
+ filter_name = NULL;
+
+ extptr = extensions;
+ while (*extptr)
+ {
+ length = strcspn (extptr, ",");
+ pattern = g_new (gchar, length + 3);
+
+ memcpy (pattern, "*.", 2);
+ memcpy (pattern + 2, extptr, length);
+ pattern[length + 2] = '\0';
+
+ if (filter_name)
+ {
+ if (extptr != extensions)
+ g_string_append (filter_name, ", ");
+
+ g_string_append (filter_name, pattern);
+ }
+
+ extptr += length;
+
+ if (*extptr)
+ extptr += 2;
+
+ g_hash_table_replace (info->extension_set, pattern, pattern);
+ }
+
+ if (filter_name)
+ {
+ g_string_append (filter_name, ")");
+ gtk_file_filter_set_name (filter, filter_name->str);
+ g_string_free (filter_name, TRUE);
+ }
+}
static void
-selection_changed (GtkTreeSelection *selection,
- EggFileFormatChooser *self)
+selection_changed_cb (GtkTreeSelection *selection,
+ EggFileFormatChooser *self)
{
gchar *label;
gchar *name;
+ GtkFileFilter *filter;
GtkTreeModel *model;
+ GtkTreeIter parent;
GtkTreeIter iter;
if (gtk_tree_selection_get_selected (selection, &model, &iter))
{
gtk_tree_model_get (model, &iter, MODEL_COLUMN_NAME, &name, -1);
- label = g_strdup_printf (_("File Format: %s"), name);
+ label = g_strdup_printf (_("File _Format: %s"), name);
+ gtk_expander_set_use_underline (GTK_EXPANDER (self), TRUE);
gtk_expander_set_label (GTK_EXPANDER (self), label);
g_free (name);
g_free (label);
+ if (self->priv->chooser)
+ {
+ while (gtk_tree_model_iter_parent (model, &parent, &iter))
+ iter = parent;
+
+ gtk_tree_model_get (model, &iter, MODEL_COLUMN_FILTER, &filter, -1);
+ gtk_file_chooser_set_filter (self->priv->chooser, filter);
+ g_object_unref (filter);
+ }
+
g_signal_emit (self, signals[SIGNAL_SELECTION_CHANGED], 0);
}
}
@@ -108,8 +291,8 @@ find_in_list (gchar *list,
gchar *saveptr;
gchar *token;
- for(token = strtok_r (list, ",", &saveptr); NULL != token;
- token = strtok_r (NULL, ",", &saveptr))
+ for (token = strtok_r (list, ",", &saveptr); NULL != token;
+ token = strtok_r (NULL, ",", &saveptr))
{
token = g_strstrip (token);
@@ -121,6 +304,31 @@ find_in_list (gchar *list,
}
static gboolean
+accept_filename (gchar *extensions,
+ const gchar *filename)
+{
+ const gchar *extptr;
+ gchar *saveptr;
+ gchar *token;
+ gsize length;
+
+ length = strlen (filename);
+
+ for (token = strtok_r (extensions, ",", &saveptr); NULL != token;
+ token = strtok_r (NULL, ",", &saveptr))
+ {
+ token = g_strstrip (token);
+ extptr = filename + length - strlen (token) - 1;
+
+ if (extptr > filename && '.' == *extptr &&
+ !strcmp (extptr + 1, token))
+ return TRUE;
+ }
+
+ return FALSE;
+}
+
+static gboolean
find_by_extension (GtkTreeModel *model,
GtkTreePath *path G_GNUC_UNUSED,
GtkTreeIter *iter,
@@ -160,15 +368,21 @@ egg_file_format_chooser_init (EggFileFormatChooser *self)
self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, EGG_TYPE_FILE_FORMAT_CHOOSER,
EggFileFormatChooserPrivate);
+/* file filters */
+
+ self->priv->all_files = g_object_ref_sink (gtk_file_filter_new ());
+ gtk_file_filter_set_name (self->priv->all_files, _("All Files"));
+ self->priv->supported_files = egg_file_format_filter_new (_("All Supported Files"), FALSE);
+
/* tree model */
- self->priv->model = gtk_tree_store_new (6, G_TYPE_UINT, G_TYPE_STRING,
- G_TYPE_STRING, G_TYPE_STRING,
- G_TYPE_POINTER, G_TYPE_POINTER);
+ self->priv->model = gtk_tree_store_new (7, G_TYPE_UINT, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING,
+ GTK_TYPE_FILE_FILTER, G_TYPE_POINTER, G_TYPE_POINTER);
gtk_tree_store_append (self->priv->model, &iter, NULL);
gtk_tree_store_set (self->priv->model, &iter,
MODEL_COLUMN_NAME, _("By Extension"),
+ MODEL_COLUMN_FILTER, self->priv->supported_files,
MODEL_COLUMN_ID, 0,
-1);
@@ -208,7 +422,8 @@ egg_file_format_chooser_init (EggFileFormatChooser *self)
/* selection */
gtk_tree_selection_set_mode (self->priv->selection, GTK_SELECTION_BROWSE);
- g_signal_connect (self->priv->selection, "changed", G_CALLBACK (selection_changed), self);
+ g_signal_connect (self->priv->selection, "changed",
+ G_CALLBACK (selection_changed_cb), self);
self->priv->idle_hack = g_idle_add (select_default_file_format, self);
/* scroller */
@@ -279,8 +494,12 @@ egg_file_format_chooser_finalize (GObject *obj)
if (self->priv->model)
{
reset_model (self);
+
g_object_unref (self->priv->model);
self->priv->model = NULL;
+
+ g_object_unref (self->priv->all_files);
+ self->priv->all_files = NULL;
}
}
@@ -288,12 +507,277 @@ egg_file_format_chooser_finalize (GObject *obj)
}
static void
+filter_changed_cb (GObject *object,
+ GParamSpec *spec,
+ gpointer data)
+{
+ EggFileFormatChooser *self;
+
+ GtkFileFilter *current_filter;
+ GtkFileFilter *format_filter;
+
+ GtkTreeModel *model;
+ GtkTreeIter iter;
+ GtkTreeIter parent;
+
+ self = EGG_FILE_FORMAT_CHOOSER (data);
+
+ format_filter = NULL;
+ current_filter = gtk_file_chooser_get_filter (GTK_FILE_CHOOSER (object));
+ model = GTK_TREE_MODEL (self->priv->model);
+
+ if (gtk_tree_selection_get_selected (self->priv->selection, &model, &iter))
+ {
+ while (gtk_tree_model_iter_parent (model, &parent, &iter))
+ iter = parent;
+
+ gtk_tree_model_get (model, &iter,
+ MODEL_COLUMN_FILTER,
+ &format_filter, -1);
+ g_object_unref (format_filter);
+ }
+
+ if (current_filter && current_filter != format_filter &&
+ gtk_tree_model_get_iter_first (model, &iter))
+ {
+ if (current_filter == self->priv->all_files)
+ format_filter = current_filter;
+ else
+ {
+ format_filter = NULL;
+
+ do
+ {
+ gtk_tree_model_get (model, &iter,
+ MODEL_COLUMN_FILTER,
+ &format_filter, -1);
+ g_object_unref (format_filter);
+
+ if (format_filter == current_filter)
+ break;
+ }
+ while (gtk_tree_model_iter_next (model, &iter));
+ }
+
+ if (format_filter)
+ gtk_tree_selection_select_iter (self->priv->selection, &iter);
+ }
+}
+
+/* Shows an error dialog set as transient for the specified window */
+static void
+error_message_with_parent (GtkWindow *parent,
+ const char *msg,
+ const char *detail)
+{
+ gboolean first_call = TRUE;
+ GtkWidget *dialog;
+
+ if (first_call)
+ {
+ g_warning ("%s: Merge with the code in Gtk{File,Recent}ChooserDefault.", G_STRLOC);
+ first_call = FALSE;
+ }
+
+ dialog = gtk_message_dialog_new (parent,
+ GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
+ GTK_MESSAGE_ERROR,
+ GTK_BUTTONS_OK,
+ "%s",
+ msg);
+ gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
+ "%s", detail);
+
+ if (parent->group)
+ gtk_window_group_add_window (parent->group, GTK_WINDOW (dialog));
+
+ gtk_dialog_run (GTK_DIALOG (dialog));
+ gtk_widget_destroy (dialog);
+}
+
+/* Returns a toplevel GtkWindow, or NULL if none */
+static GtkWindow *
+get_toplevel (GtkWidget *widget)
+{
+ GtkWidget *toplevel;
+
+ toplevel = gtk_widget_get_toplevel (widget);
+ if (!GTK_WIDGET_TOPLEVEL (toplevel))
+ return NULL;
+ else
+ return GTK_WINDOW (toplevel);
+}
+
+/* Shows an error dialog for the file chooser */
+static void
+error_message (EggFileFormatChooser *impl,
+ const char *msg,
+ const char *detail)
+{
+ error_message_with_parent (get_toplevel (GTK_WIDGET (impl)), msg, detail);
+}
+
+static void
+chooser_response_cb (GtkDialog *dialog,
+ gint response_id,
+ gpointer data)
+{
+ EggFileFormatChooser *self;
+ gchar *filename, *basename;
+ gchar *message;
+ guint format;
+
+ self = EGG_FILE_FORMAT_CHOOSER (data);
+
+ if (EGG_IS_POSITIVE_RESPONSE (response_id))
+ {
+ filename = gtk_file_chooser_get_filename (self->priv->chooser);
+ basename = g_filename_display_basename (filename);
+ g_free (filename);
+
+ format = egg_file_format_chooser_get_format (self, basename);
+ g_print ("%s: %s - %d\n", G_STRFUNC, basename, format);
+
+ if (0 == format)
+ {
+
+ message = g_strdup_printf (
+ _("The program was not able to find out the file format "
+ "you want to use for `%s'. Please make sure to use a "
+ "known extension for that file or manually choose a "
+ "file format from the list below."),
+ basename);
+
+ error_message (self,
+ _("File format not recognized"),
+ message);
+
+ g_free (message);
+
+ g_signal_stop_emission_by_name (dialog, "response");
+ }
+ else
+ {
+ filename = egg_file_format_chooser_append_extension (self, basename, format);
+
+ if (strcmp (filename, basename))
+ {
+ gtk_file_chooser_set_current_name (self->priv->chooser, filename);
+ g_signal_stop_emission_by_name (dialog, "response");
+ }
+
+ g_free (filename);
+ }
+
+ g_free (basename);
+ }
+
+}
+
+static void
+egg_file_format_chooser_realize (GtkWidget *widget)
+{
+ EggFileFormatChooser *self;
+ GtkWidget *parent;
+
+ GtkFileFilter *filter;
+ GtkTreeModel *model;
+ GtkTreeIter iter;
+
+ GTK_WIDGET_CLASS (egg_file_format_chooser_parent_class)->realize (widget);
+
+ self = EGG_FILE_FORMAT_CHOOSER (widget);
+
+ g_return_if_fail (NULL == self->priv->chooser);
+
+ parent = gtk_widget_get_toplevel (widget);
+
+ if (!GTK_IS_FILE_CHOOSER (parent))
+ parent = gtk_widget_get_parent (widget);
+
+ while (parent && !GTK_IS_FILE_CHOOSER (parent))
+ parent = gtk_widget_get_parent (parent);
+
+ self->priv->chooser = GTK_FILE_CHOOSER (parent);
+
+ g_return_if_fail (GTK_IS_FILE_CHOOSER (self->priv->chooser));
+ g_return_if_fail (gtk_file_chooser_get_action (self->priv->chooser) ==
+ GTK_FILE_CHOOSER_ACTION_SAVE);
+
+ g_object_ref (self->priv->chooser);
+
+ g_signal_connect (self->priv->chooser, "notify::filter",
+ G_CALLBACK (filter_changed_cb), self);
+ gtk_file_chooser_add_filter (self->priv->chooser, self->priv->all_files);
+
+ model = GTK_TREE_MODEL (self->priv->model);
+
+ if (gtk_tree_model_get_iter_first (model, &iter))
+ {
+ do
+ {
+ gtk_tree_model_get (model, &iter, MODEL_COLUMN_FILTER, &filter, -1);
+ gtk_file_chooser_add_filter (self->priv->chooser, filter);
+ g_object_unref (filter);
+ }
+ while (gtk_tree_model_iter_next (model, &iter));
+ }
+
+ gtk_file_chooser_set_filter (self->priv->chooser,
+ self->priv->supported_files);
+
+ if (GTK_IS_DIALOG (self->priv->chooser))
+ g_signal_connect (self->priv->chooser, "response",
+ G_CALLBACK (chooser_response_cb), self);
+}
+
+static void
+egg_file_format_chooser_unrealize (GtkWidget *widget)
+{
+ EggFileFormatChooser *self;
+
+ GtkFileFilter *filter;
+ GtkTreeModel *model;
+ GtkTreeIter iter;
+
+ GTK_WIDGET_CLASS (egg_file_format_chooser_parent_class)->unrealize (widget);
+
+ self = EGG_FILE_FORMAT_CHOOSER (widget);
+ model = GTK_TREE_MODEL (self->priv->model);
+
+ g_signal_handlers_disconnect_by_func (self->priv->chooser,
+ filter_changed_cb, self);
+ g_signal_handlers_disconnect_by_func (self->priv->chooser,
+ chooser_response_cb, self);
+
+ if (gtk_tree_model_get_iter_first (model, &iter))
+ {
+ do
+ {
+ gtk_tree_model_get (model, &iter, MODEL_COLUMN_FILTER, &filter, -1);
+ gtk_file_chooser_remove_filter (self->priv->chooser, filter);
+ g_object_unref (filter);
+ }
+ while (gtk_tree_model_iter_next (model, &iter));
+ }
+
+ gtk_file_chooser_remove_filter (self->priv->chooser, self->priv->all_files);
+ g_object_unref (self->priv->chooser);
+}
+
+static void
egg_file_format_chooser_class_init (EggFileFormatChooserClass *cls)
{
+ GObjectClass *object_class = G_OBJECT_CLASS (cls);
+ GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (cls);
+
g_type_class_add_private (cls, sizeof (EggFileFormatChooserPrivate));
- G_OBJECT_CLASS (cls)->dispose = egg_file_format_chooser_dispose;
- G_OBJECT_CLASS (cls)->finalize = egg_file_format_chooser_finalize;
+ object_class->dispose = egg_file_format_chooser_dispose;
+ object_class->finalize = egg_file_format_chooser_finalize;
+
+ widget_class->realize = egg_file_format_chooser_realize;
+ widget_class->unrealize = egg_file_format_chooser_unrealize;
signals[SIGNAL_SELECTION_CHANGED] = g_signal_new (
"selection-changed", EGG_TYPE_FILE_FORMAT_CHOOSER, G_SIGNAL_RUN_FIRST,
@@ -315,25 +799,46 @@ egg_file_format_chooser_add_format_impl (EggFileFormatChooser *self,
const gchar *extensions)
{
EggFileFormatSearch search;
+ GtkFileFilter *filter;
GtkTreeIter iter;
search.success = FALSE;
search.format = parent;
+ filter = NULL;
if (parent > 0)
- gtk_tree_model_foreach (GTK_TREE_MODEL (self->priv->model),
- find_by_format, &search);
+ {
+ gtk_tree_model_foreach (GTK_TREE_MODEL (self->priv->model),
+ find_by_format, &search);
+ g_return_val_if_fail (search.success, -1);
+ }
+ else
+ filter = egg_file_format_filter_new (name, TRUE);
gtk_tree_store_append (self->priv->model, &iter,
- search.success ? &search.iter : NULL);
+ parent > 0 ? &search.iter : NULL);
gtk_tree_store_set (self->priv->model, &iter,
MODEL_COLUMN_ID, ++self->priv->last_id,
MODEL_COLUMN_EXTENSIONS, extensions,
+ MODEL_COLUMN_FILTER, filter,
MODEL_COLUMN_NAME, name,
MODEL_COLUMN_ICON, icon,
-1);
+ if (extensions)
+ {
+ if (parent > 0)
+ gtk_tree_model_get (GTK_TREE_MODEL (self->priv->model), &search.iter,
+ MODEL_COLUMN_FILTER, &filter, -1);
+
+ egg_file_format_filter_add_extensions (self->priv->supported_files, extensions);
+ egg_file_format_filter_add_extensions (filter, extensions);
+
+ if (parent > 0)
+ g_object_unref (filter);
+ }
+
return self->priv->last_id;
}
@@ -378,9 +883,17 @@ egg_file_format_chooser_add_format (EggFileFormatChooser *self,
static gchar*
get_icon_name (const gchar *mime_type)
{
+ static gboolean first_call = TRUE;
gchar *name = NULL;
gchar *s;
+ if (first_call)
+ {
+ g_warning ("%s: Replace by g_content_type_get_icon "
+ "when GVFS is merged into GLib.", G_STRLOC);
+ first_call = FALSE;
+ }
+
if (mime_type)
{
name = g_strconcat ("gnome-mime-", mime_type, NULL);
@@ -465,6 +978,7 @@ egg_file_format_chooser_remove_format (EggFileFormatChooser *self,
gpointer data = NULL;
EggFileFormatSearch search;
+ GtkFileFilter *filter;
GtkTreeModel *model;
g_return_if_fail (EGG_IS_FILE_FORMAT_CHOOSER (self));
@@ -478,6 +992,7 @@ egg_file_format_chooser_remove_format (EggFileFormatChooser *self,
g_return_if_fail (search.success);
gtk_tree_model_get (model, &search.iter,
+ MODEL_COLUMN_FILTER, &filter,
MODEL_COLUMN_DESTROY, &destroy,
MODEL_COLUMN_DATA, &data,
-1);
@@ -485,6 +1000,16 @@ egg_file_format_chooser_remove_format (EggFileFormatChooser *self,
if (destroy)
destroy (data);
+ if (filter)
+ {
+ if (self->priv->chooser)
+ gtk_file_chooser_remove_filter (self->priv->chooser, filter);
+
+ g_object_unref (filter);
+ }
+ else
+ g_warning ("TODO: Remove extensions from parent filter");
+
gtk_tree_store_remove (self->priv->model, &search.iter);
}
@@ -611,17 +1136,17 @@ egg_file_format_chooser_append_extension (EggFileFormatChooser *self,
GtkTreeIter child;
gchar *extensions;
- gchar *tmpstr;
+ gchar *result;
g_return_val_if_fail (EGG_IS_FILE_FORMAT_CHOOSER (self), NULL);
g_return_val_if_fail (NULL != filename, NULL);
if (0 == format)
- format = egg_file_format_chooser_get_format (self, filename);
+ format = egg_file_format_chooser_get_format (self, NULL);
if (0 == format)
{
- g_warning ("%s: No file format selected. Cannot append extension.", G_STRFUNC);
+ g_warning ("%s: No file format selected. Cannot append extension.", __FUNCTION__);
return NULL;
}
@@ -648,17 +1173,18 @@ egg_file_format_chooser_append_extension (EggFileFormatChooser *self,
if (NULL == extensions)
{
g_warning ("%s: File format %d doesn't provide file extensions. "
- "Cannot append extension.", G_STRFUNC, format);
+ "Cannot append extension.", __FUNCTION__, format);
return NULL;
}
- if (NULL != (tmpstr = strchr(extensions, ',')))
- *tmpstr = '\0';
+ if (accept_filename (extensions, filename))
+ result = g_strdup (filename);
+ else
+ result = g_strconcat (filename, ".", extensions, NULL);
- tmpstr = g_strconcat (filename, ".", extensions, NULL);
+ g_assert (NULL == strchr(extensions, ','));
g_free (extensions);
-
- return tmpstr;
+ return result;
}
/* vim: set sw=2 sta et: */
diff --git a/src/eggfileformatchooser.h b/src/eggfileformatchooser.h
index 137b984..7ef0aa3 100644
--- a/src/eggfileformatchooser.h
+++ b/src/eggfileformatchooser.h
@@ -1,3 +1,21 @@
+/* EggFileFormatChooser
+ * Copyright (C) 2007 Mathias Hasselmann
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
#ifndef __EGG_FILE_FORMAT_CHOOSER_H__
#define __EGG_FILE_FORMAT_CHOOSER_H__
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
