[maemo-commits] [maemo-commits] r9522 - projects/haf/trunk/hildon-fm/hildon-fm

From: subversion at stage.maemo.org subversion at stage.maemo.org
Date: Thu Feb 1 17:29:10 EET 2007 
Author: marivoll
Date: 2007-02-01 17:29:09 +0200 (Thu, 01 Feb 2007)
New Revision: 9522

Modified:
   projects/haf/trunk/hildon-fm/hildon-fm/hildon-file-chooser-dialog.c
   projects/haf/trunk/hildon-fm/hildon-fm/hildon-file-details-dialog.c
   projects/haf/trunk/hildon-fm/hildon-fm/hildon-file-selection.c
Log:
	Partly adapted to new Hildon API.
	
	* hildon-fm/hildon-file-chooser-dialog.c,
	hildon-fm/hildon-file-details-dialog.c,
	hildon-fm/hildon-file-selection.c: Include <hildon/foo.h> instead
	of <hildon-widgets/foo.h>.  Use hildon_banner_show_information
	instead of gtk_infoprint.  Use gtk_style_lookup_color instead of
	gtk_style_lookup_logical_color.
	* hildon-fm/hildon-file-chooser-dialog.c (response_handler): Don't
	pass argument to file_ib_name_too_long string.  It doesn't have
	formatting codes in it.


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-02-01 14:57:58 UTC (rev 9521)
+++ projects/haf/trunk/hildon-fm/hildon-fm/hildon-file-chooser-dialog.c	2007-02-01 15:29:09 UTC (rev 9522)
@@ -40,7 +40,6 @@
 #include "hildon-file-selection.h"
 #include "hildon-file-chooser-dialog.h"
 #include "hildon-file-system-private.h"
-#include <hildon-widgets/gtk-infoprint.h>
 #include <gtk/gtkbutton.h>
 #include <gtk/gtkbox.h>
 #include <gtk/gtkentry.h>
@@ -52,9 +51,9 @@
 #include <gtk/gtkimage.h>
 #include <gtk/gtklabel.h>
 #include <string.h>
-#include <hildon-widgets/hildon-caption.h>
-#include <hildon-widgets/hildon-defines.h>
-#include <hildon-widgets/hildon-banner.h>
+#include <hildon/hildon-caption.h>
+#include <hildon/hildon-defines.h>
+#include <hildon/hildon-banner.h>
 #include <libintl.h>
 #include <gdk/gdkx.h>
 #include <stdlib.h>
@@ -1100,7 +1099,7 @@
             message = _("sfil_ni_operation_failed");
 
         ULOG_ERR(error->message);
-        gtk_infoprint(GTK_WINDOW(self), message);
+        hildon_banner_show_information (GTK_WIDGET(self), NULL, message);
         hildon_file_chooser_dialog_select_text(self->priv);
         gtk_dialog_set_response_sensitive(dialog, GTK_RESPONSE_OK, TRUE);
     } else {
@@ -1220,11 +1219,9 @@
 {
     HildonFileChooserDialog *self;
     HildonFileChooserDialogPrivate *priv;
-    GtkWindow *window;
 
     self = HILDON_FILE_CHOOSER_DIALOG(widget);
     priv = self->priv;
-    window = GTK_WINDOW(widget);
 
     switch (arg1) {
     case GTK_RESPONSE_OK:
@@ -1240,13 +1237,15 @@
                 priv->edited = FALSE;
                 hildon_file_chooser_dialog_do_autonaming(priv);
                 hildon_file_chooser_dialog_select_text(priv);
-                gtk_infoprint(window, HCS("ckdg_ib_enter_name"));
+                hildon_banner_show_information
+		  (widget, NULL, HCS("ckdg_ib_enter_name"));
             } else if (entry_text[0] == '.') {
 	        /* We don't allow files with a dot as the first character.
 		 */
                 hildon_file_chooser_dialog_select_text(priv);
 	        g_signal_stop_emission_by_name(widget, "response");
-		gtk_infoprint(window, _("sfil_ib_invalid_name_dot"));
+		hildon_banner_show_information
+		  (widget, NULL, _("sfil_ib_invalid_name_dot"));
 	    } else {
                 GString *illegals = check_illegal_characters(entry_text);
 
@@ -1259,7 +1258,7 @@
                     msg = g_strdup_printf(
                               HCS("ckdg_ib_illegal_characters_entered"),
                               illegals->str);
-                    gtk_infoprint(window, msg);
+                    hildon_banner_show_information (widget, NULL, msg);
                     g_free(msg);
                     g_string_free(illegals, TRUE);
                 }
@@ -1276,8 +1275,8 @@
                     {
                         g_signal_stop_emission_by_name(widget, "response");
                         hildon_file_chooser_dialog_select_text(priv);
-                        gtk_infoprintf(window, HCS("file_ib_name_too_long"), 
-                            path_length - self->priv->max_filename_length);
+                        hildon_banner_show_information
+			  (widget, NULL, HCS("file_ib_name_too_long"));
                     }
                     g_free(uri);
                 }
@@ -1888,7 +1887,7 @@
                      priv);
     g_signal_connect(eventbox, "button-release-event",
                      G_CALLBACK(hildon_file_chooser_dialog_location_pressed), 
-                     self); 
+                     self);
     g_signal_connect(priv->action_button, "insensitive-press", 
                      G_CALLBACK(insensitive_button), self);
 

Modified: projects/haf/trunk/hildon-fm/hildon-fm/hildon-file-details-dialog.c
===================================================================
--- projects/haf/trunk/hildon-fm/hildon-fm/hildon-file-details-dialog.c	2007-02-01 14:57:58 UTC (rev 9521)
+++ projects/haf/trunk/hildon-fm/hildon-fm/hildon-file-details-dialog.c	2007-02-01 15:29:09 UTC (rev 9522)
@@ -38,9 +38,10 @@
 #include <libintl.h>
 #include <libgnomevfs/gnome-vfs.h>
 
-#include <hildon-widgets/hildon-caption.h>
-#include <hildon-widgets/gtk-infoprint.h>
-#include <hildon-widgets/hildon-defines.h>
+#include <hildon/hildon-banner.h>
+#include <hildon/hildon-caption.h>
+#include <hildon/hildon-defines.h>
+
 #include "hildon-file-details-dialog.h"
 #include "hildon-file-system-model.h"
 
@@ -193,7 +194,8 @@
     }
 
     if (result != GNOME_VFS_OK)
-      gtk_infoprint(GTK_WINDOW(self), gnome_vfs_result_to_string(result));
+      hildon_banner_show_information (GTK_WIDGET (self), NULL,
+				      gnome_vfs_result_to_string (result));
     
     gnome_vfs_file_info_unref(info);
     g_free(uri);

Modified: projects/haf/trunk/hildon-fm/hildon-fm/hildon-file-selection.c
===================================================================
--- projects/haf/trunk/hildon-fm/hildon-fm/hildon-file-selection.c	2007-02-01 14:57:58 UTC (rev 9521)
+++ projects/haf/trunk/hildon-fm/hildon-fm/hildon-file-selection.c	2007-02-01 15:29:09 UTC (rev 9522)
@@ -46,9 +46,8 @@
 #include <libintl.h>
 
 #include "hildon-file-selection.h"
-#include <hildon-widgets/gtk-infoprint.h>
-#include <hildon-widgets/hildon-banner.h>
-#include <hildon-widgets/hildon-defines.h>
+#include <hildon/hildon-banner.h>
+#include <hildon/hildon-defines.h>
 
 #include "hildon-file-common-private.h"
 
@@ -1959,10 +1958,10 @@
      * So this is only for active cells */
     if (sensitive)  
     {
-      found1 = gtk_style_lookup_logical_color(GTK_WIDGET(data)->style, 
-                                              "DefaultTextColor", &color1);
-      found2 = gtk_style_lookup_logical_color(GTK_WIDGET(data)->style, 
-					      "SecondaryTextColor", &color2);
+      found1 = gtk_style_lookup_color(GTK_WIDGET(data)->style, 
+				      "DefaultTextColor", &color1);
+      found2 = gtk_style_lookup_color(GTK_WIDGET(data)->style, 
+				      "SecondaryTextColor", &color2);
 
       attrs = pango_attr_list_new();
       bytes1 = strlen(title);
More information about the maemo-commits mailing list