[maemo-commits] [maemo-commits] r15457 - in projects/haf/trunk/hildon-fm: . debian hildon-fm

[From: subversion at stage.maemo.org]

Author: marivoll
Date: 2008-04-17 18:59:46 +0300 (Thu, 17 Apr 2008)
New Revision: 15457

Modified:
   projects/haf/trunk/hildon-fm/ChangeLog
   projects/haf/trunk/hildon-fm/debian/changelog
   projects/haf/trunk/hildon-fm/hildon-fm/hildon-file-selection.c
Log:
	(drag_data_get): Don't pass NULL to
	gtk_selection_data_set_uris (N83955).


Modified: projects/haf/trunk/hildon-fm/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-fm/ChangeLog	2008-04-17 15:56:43 UTC (rev 15456)
+++ projects/haf/trunk/hildon-fm/ChangeLog	2008-04-17 15:59:46 UTC (rev 15457)
@@ -3,6 +3,8 @@
 	* hildon-fm/hildon-file-selection.c
 	(_hildon_file_selection_get_current_folder_path): Return the goal
 	uri if we have one (N83593).
+	(drag_data_get): Don't pass NULL to
+	gtk_selection_data_set_uris (N83955).
 
 2008-04-17  Kimmo Hämäläinen  <kimmo.hamalainen at nokia.com>
 

Modified: projects/haf/trunk/hildon-fm/debian/changelog
===================================================================
--- projects/haf/trunk/hildon-fm/debian/changelog	2008-04-17 15:56:43 UTC (rev 15456)
+++ projects/haf/trunk/hildon-fm/debian/changelog	2008-04-17 15:59:46 UTC (rev 15457)
@@ -1,6 +1,6 @@
 libhildonfm (1:2.0.3~unreleased) unstable; urgency=low
 
-  * Fixes: NB#79697, NB#77225, NB#83593.
+  * Fixes: NB#79697, NB#77225, NB#83593, NB#83955.
   * Add "currently-dragging" property to HildonFileSelection. Related to
     NB#83827
 

Modified: projects/haf/trunk/hildon-fm/hildon-fm/hildon-file-selection.c
===================================================================
--- projects/haf/trunk/hildon-fm/hildon-fm/hildon-file-selection.c	2008-04-17 15:56:43 UTC (rev 15456)
+++ projects/haf/trunk/hildon-fm/hildon-fm/hildon-file-selection.c	2008-04-17 15:59:46 UTC (rev 15457)
@@ -2752,7 +2752,9 @@
 
   /* We use only uri-list internally, but somebody else
      can use text format as well. */
-  if (!gtk_selection_data_set_uris(selection_data, self->priv->drag_data_uris))
+  if (!self->priv->drag_data_uris
+      || !gtk_selection_data_set_uris(selection_data,
+				      self->priv->drag_data_uris))
   {
     gchar *plain = g_strjoinv("\n", self->priv->drag_data_uris);
     gtk_selection_data_set_text(selection_data, plain, -1);