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

[From: subversion at stage.maemo.org]

Author: kihamala
Date: 2007-07-27 14:09:19 +0300 (Fri, 27 Jul 2007)
New Revision: 12872

Modified:
   projects/haf/trunk/hildon-fm/ChangeLog
   projects/haf/trunk/hildon-fm/debian/changelog
   projects/haf/trunk/hildon-fm/hildon-fm/hildon-file-chooser-dialog.c
   projects/haf/trunk/hildon-fm/hildon-fm/hildon-file-common-private.h
Log:
fixed NB#36630


Modified: projects/haf/trunk/hildon-fm/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-fm/ChangeLog	2007-07-27 10:49:28 UTC (rev 12871)
+++ projects/haf/trunk/hildon-fm/ChangeLog	2007-07-27 11:09:19 UTC (rev 12872)
@@ -1,3 +1,12 @@
+2007-07-27  Kimmo Hämäläinen <kimmo.hamalainen at nokia.com>
+
+	* hildon-file-chooser-dialog.c (response_handler): Show
+	information note sfil_ni_target_foldername_long instead of
+	information banner file_ib_name_too_long. Fixes: NB#36630
+
+	* hildon-file-common-private.h: Add 'FM' macro for strings from
+	File manager's localisation domain.
+
 2007-07-26  Marius Vollmer  <marius.vollmer at nokia.com>
 
 	* hildon-fm/hildon-file-selection.c

Modified: projects/haf/trunk/hildon-fm/debian/changelog
===================================================================
--- projects/haf/trunk/hildon-fm/debian/changelog	2007-07-27 10:49:28 UTC (rev 12871)
+++ projects/haf/trunk/hildon-fm/debian/changelog	2007-07-27 11:09:19 UTC (rev 12872)
@@ -8,8 +8,10 @@
   * Add two logical IDs that were added to the UI spec ("Common", "Data")
   * Add two instances of missing GDK_THREADS_ENTER/GDK_THREADS_LEAVE pairs.
   * Fixes: NB#63995.
+  * Show information note sfil_ni_target_foldername_long instead of
+    information banner file_ib_name_too_long. Fixes: NB#36630
   
- -- Marius Vollmer <marius.vollmer at nokia.com>  Wed, 25 Jul 2007 11:33:08 +0300
+ -- Marius Vollmer <marius.vollmer at nokia.com>  Fri, 27 Jul 2007 14:09:28 +0300
 
 libhildonfm (1:1.9.34) unstable; urgency=low
 

Modified: projects/haf/trunk/hildon-fm/hildon-fm/hildon-file-chooser-dialog.c
===================================================================
--- projects/haf/trunk/hildon-fm/hildon-fm/hildon-file-chooser-dialog.c	2007-07-27 10:49:28 UTC (rev 12871)
+++ projects/haf/trunk/hildon-fm/hildon-fm/hildon-file-chooser-dialog.c	2007-07-27 11:09:19 UTC (rev 12872)
@@ -55,6 +55,7 @@
 #include <hildon/hildon-defines.h>
 #include <hildon/hildon-banner.h>
 #include <hildon/hildon-helper.h>
+#include <hildon/hildon-note.h>
 #include <libintl.h>
 #include <gdk/gdkx.h>
 #include <stdlib.h>
@@ -1310,10 +1311,13 @@
 
                     if (path_length > self->priv->max_full_path_length)
                     {
+                        GtkWidget *w;
                         g_signal_stop_emission_by_name(widget, "response");
                         hildon_file_chooser_dialog_select_text(priv);
-                        hildon_banner_show_information
-                          (widget, NULL, HCS("file_ib_name_too_long"));
+                        w = hildon_note_new_information(GTK_WINDOW(widget),
+                                FM("sfil_ni_target_foldername_long"));
+                        gtk_dialog_run(GTK_DIALOG(w));
+                        gtk_widget_destroy(w);
                     }
                     g_free(uri);
                 }

Modified: projects/haf/trunk/hildon-fm/hildon-fm/hildon-file-common-private.h
===================================================================
--- projects/haf/trunk/hildon-fm/hildon-fm/hildon-file-common-private.h	2007-07-27 10:49:28 UTC (rev 12871)
+++ projects/haf/trunk/hildon-fm/hildon-fm/hildon-file-common-private.h	2007-07-27 11:09:19 UTC (rev 12872)
@@ -42,6 +42,7 @@
 #define N_(String) String
 #define HCS(String) dgettext("hildon-common-strings", String)
 #define KE(String) dgettext("ke-recv", String)
+#define FM(String) dgettext("osso-filemanager", String)
 
 /* If environment doesn't define, use this */
 #define MAX_FILENAME_LENGTH_DEFAULT 255