gtk+ r19524 - in trunk: . gtk

[matthiasc svn gnome org]

Author: matthiasc
Date: Tue Feb 12 15:07:38 2008
New Revision: 19524
URL: http://svn.gnome.org/viewvc/gtk+?rev=19524&view=rev

Log:
2008-02-12  Matthias Clasen  <mclasen redhat com>

        * gtk/gtkfilechooserdefault.c (recent_model_sort_drag_data_get):
        (recent_model_sort_drag_data_get):
        (search_model_sort_drag_data_get):
        * gtk/gtkfilesystemmodel.c (drag_source_drag_data_get):
        * gtk/gtkpathbar.c (button_drag_data_get_cb):
        Use gtk_selection_data_set_uris() instead of doing it
        by hand.  (#514890, Christian Persch)



Modified:
   trunk/ChangeLog
   trunk/gtk/gtkfilechooserdefault.c
   trunk/gtk/gtkfilesystemmodel.c
   trunk/gtk/gtkpathbar.c

Modified: trunk/gtk/gtkfilechooserdefault.c
==============================================================================
--- trunk/gtk/gtkfilechooserdefault.c	(original)
+++ trunk/gtk/gtkfilechooserdefault.c	Tue Feb 12 15:07:38 2008
@@ -11426,7 +11426,7 @@
   RecentModelSort *model;
   GtkTreeIter iter, child_iter;
   GtkFilePath *file_path;
-  gchar **uris;
+  gchar *uris[2];
 
   model = RECENT_MODEL_SORT (drag_source);
   if (!gtk_tree_model_get_iter (GTK_TREE_MODEL (model), &iter, path))
@@ -11438,13 +11438,12 @@
                       -1);
   g_assert (file_path != NULL);
 
-  uris = g_new (gchar *, 2);
   uris[0] = gtk_file_system_path_to_uri (model->impl->file_system, file_path);
   uris[1] = NULL;
 
   gtk_selection_data_set_uris (selection_data, uris);
 
-  g_strfreev (uris);
+  g_free (uris[0]);
 
   return TRUE;
 }
@@ -11512,7 +11511,7 @@
   SearchModelSort *model;
   GtkTreeIter iter, child_iter;
   GtkFilePath *file_path;
-  gchar **uris;
+  gchar *uris[2];
 
   model = SEARCH_MODEL_SORT (drag_source);
   if (!gtk_tree_model_get_iter (GTK_TREE_MODEL (model), &iter, path))
@@ -11524,13 +11523,12 @@
                       -1);
   g_assert (file_path != NULL);
 
-  uris = g_new (gchar *, 2);
   uris[0] = gtk_file_system_path_to_uri (model->impl->file_system, file_path);
   uris[1] = NULL;
 
   gtk_selection_data_set_uris (selection_data, uris);
 
-  g_strfreev (uris);
+  g_free (uris[0]);
 
   return TRUE;
 }

Modified: trunk/gtk/gtkfilesystemmodel.c
==============================================================================
--- trunk/gtk/gtkfilesystemmodel.c	(original)
+++ trunk/gtk/gtkfilesystemmodel.c	Tue Feb 12 15:07:38 2008
@@ -566,8 +566,7 @@
   GtkFileSystemModel *model;
   GtkTreeIter iter;
   const GtkFilePath *file_path;
-  char *uri;
-  char *uris;
+  char *uris[2]; 
 
   model = GTK_FILE_SYSTEM_MODEL (drag_source);
 
@@ -577,17 +576,12 @@
   file_path = _gtk_file_system_model_get_path (model, &iter);
   g_assert (file_path != NULL);
 
-  uri = gtk_file_system_path_to_uri (model->file_system, file_path);
-  uris = g_strconcat (uri, "\r\n", NULL);
+  uris[0] = gtk_file_system_path_to_uri (model->file_system, file_path);
+  uris[1] = NULL;
 
-  gtk_selection_data_set (selection_data,
-			  gdk_atom_intern_static_string ("text/uri-list"),
-			  8,
-			  (guchar *) uris,
-			  strlen (uris) + 1);
+  gtk_selection_data_set_uris (selection_data, uris);
 
-  g_free (uri);
-  g_free (uris);
+  g_free (uris[0]);
 
   return TRUE;
 }

Modified: trunk/gtk/gtkpathbar.c
==============================================================================
--- trunk/gtk/gtkpathbar.c	(original)
+++ trunk/gtk/gtkpathbar.c	Tue Feb 12 15:07:38 2008
@@ -1325,22 +1325,16 @@
 {
   ButtonData *button_data;
   GtkPathBar *path_bar;
-  char *uri;
-  char *uri_list;
+  char *uris[2];
 
   button_data = data;
   path_bar = GTK_PATH_BAR (widget->parent); /* the button's parent *is* the path bar */
 
-  uri = gtk_file_system_path_to_uri (path_bar->file_system, button_data->path);
-  uri_list = g_strconcat (uri, "\r\n", NULL);
-  g_free (uri);
-
-  gtk_selection_data_set (selection_data,
-			  selection_data->target,
-			  8,
-			  (guchar *)uri_list,
-			  strlen (uri_list));
-  g_free (uri_list);
+  uris[0] = gtk_file_system_path_to_uri (path_bar->file_system, button_data->path);
+  uris[1] = NULL;
+
+  gtk_selection_data_set_uris (selection_data, uris);
+  g_free (uris[0]);
 }
 
 static ButtonData *