Commit 9cde6b74 authored by Manish Singh's avatar Manish Singh Committed by Manish Singh

preserve ordering from gtk_tree_selection_foreach when returning filenames

Tue Sep 24 23:33:48 2002  Manish Singh  <yosh@gimp.org>

        * gtk/gtkfilesel.c: preserve ordering from gtk_tree_selection_foreach
        when returning filenames for gtk_file_selection_get_selections
        (#86567)

        * gtk/gtkclipboard.c: GtkClipboard struct should have a GObject
        in it, not a GObjectClass
parent 273f9911
Tue Sep 24 23:33:48 2002 Manish Singh <yosh@gimp.org>
* gtk/gtkfilesel.c: preserve ordering from gtk_tree_selection_foreach
when returning filenames for gtk_file_selection_get_selections
(#86567)
* gtk/gtkclipboard.c: GtkClipboard struct should have a GObject
in it, not a GObjectClass
Tue Sep 24 18:18:36 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtkclipboard.[ch]: Make a GObject (#75970, James
......
Tue Sep 24 23:33:48 2002 Manish Singh <yosh@gimp.org>
* gtk/gtkfilesel.c: preserve ordering from gtk_tree_selection_foreach
when returning filenames for gtk_file_selection_get_selections
(#86567)
* gtk/gtkclipboard.c: GtkClipboard struct should have a GObject
in it, not a GObjectClass
Tue Sep 24 18:18:36 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtkclipboard.[ch]: Make a GObject (#75970, James
......
Tue Sep 24 23:33:48 2002 Manish Singh <yosh@gimp.org>
* gtk/gtkfilesel.c: preserve ordering from gtk_tree_selection_foreach
when returning filenames for gtk_file_selection_get_selections
(#86567)
* gtk/gtkclipboard.c: GtkClipboard struct should have a GObject
in it, not a GObjectClass
Tue Sep 24 18:18:36 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtkclipboard.[ch]: Make a GObject (#75970, James
......
Tue Sep 24 23:33:48 2002 Manish Singh <yosh@gimp.org>
* gtk/gtkfilesel.c: preserve ordering from gtk_tree_selection_foreach
when returning filenames for gtk_file_selection_get_selections
(#86567)
* gtk/gtkclipboard.c: GtkClipboard struct should have a GObject
in it, not a GObjectClass
Tue Sep 24 18:18:36 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtkclipboard.[ch]: Make a GObject (#75970, James
......
Tue Sep 24 23:33:48 2002 Manish Singh <yosh@gimp.org>
* gtk/gtkfilesel.c: preserve ordering from gtk_tree_selection_foreach
when returning filenames for gtk_file_selection_get_selections
(#86567)
* gtk/gtkclipboard.c: GtkClipboard struct should have a GObject
in it, not a GObjectClass
Tue Sep 24 18:18:36 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtkclipboard.[ch]: Make a GObject (#75970, James
......
Tue Sep 24 23:33:48 2002 Manish Singh <yosh@gimp.org>
* gtk/gtkfilesel.c: preserve ordering from gtk_tree_selection_foreach
when returning filenames for gtk_file_selection_get_selections
(#86567)
* gtk/gtkclipboard.c: GtkClipboard struct should have a GObject
in it, not a GObjectClass
Tue Sep 24 18:18:36 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtkclipboard.[ch]: Make a GObject (#75970, James
......
......@@ -41,7 +41,7 @@ typedef struct _RequestTextInfo RequestTextInfo;
struct _GtkClipboard
{
GObjectClass parent_instance;
GObject parent_instance;
GdkAtom selection;
......
......@@ -2364,6 +2364,7 @@ gtk_file_selection_get_selections (GtkFileSelection *filesel)
gchar *filename, *dirname;
gchar *current, *buf;
gint i, count;
gboolean unselected_entry;
g_return_val_if_fail (GTK_IS_FILE_SELECTION (filesel), NULL);
......@@ -2383,7 +2384,7 @@ gtk_file_selection_get_selections (GtkFileSelection *filesel)
selections = g_new (gchar *, 2);
count = 0;
selections[count++] = filename;
unselected_entry = TRUE;
if (names != NULL)
{
......@@ -2396,15 +2397,20 @@ gtk_file_selection_get_selections (GtkFileSelection *filesel)
current = g_build_filename (dirname, buf, NULL);
g_free (buf);
if (compare_filenames (current, filename) != 0)
selections[count++] = current;
else
g_free (current);
selections[count++] = current;
if (unselected_entry && compare_filenames (current, filename) == 0)
unselected_entry = FALSE;
}
g_free (dirname);
}
if (unselected_entry)
selections[count++] = filename;
else
g_free (filename);
selections[count] = NULL;
return selections;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment