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

[From: subversion at stage.maemo.org]

Author: marivoll
Date: 2007-02-27 14:58:43 +0200 (Tue, 27 Feb 2007)
New Revision: 10226

Modified:
   projects/haf/trunk/hildon-fm/hildon-fm/hildon-file-chooser-dialog.c
Log:
	Use hildon_helper_set_insensitive_message instead of the
	"insensitive-press" signal.
	
	* hildon-fm/hildon-file-chooser-dialog.c
	(_HildonFileChooserDialogPrivate): Removed infobanner_message
	field.
	(insensitive_button): Removed.
	(build_ui): Use hildon_helper_set_insensitive_message instead of
	setting infobanner_message.
	(hildon_file_chooser_dialog_init): Don't connect to
	"insensitive-press" signal.


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-27 12:24:45 UTC (rev 10225)
+++ projects/haf/trunk/hildon-fm/hildon-fm/hildon-file-chooser-dialog.c	2007-02-27 12:58:43 UTC (rev 10226)
@@ -54,6 +54,7 @@
 #include <hildon/hildon-caption.h>
 #include <hildon/hildon-defines.h>
 #include <hildon/hildon-banner.h>
+#include <hildon/hildon-helper.h>
 #include <libintl.h>
 #include <gdk/gdkx.h>
 #include <stdlib.h>
@@ -101,7 +102,6 @@
     gint max_full_path_length;
     gint max_filename_length;
     gboolean popup_protect;
-    gchar *infobanner_message;
     GtkFileSystemHandle *create_folder_handle;
 
     /* Popup menu contents */
@@ -276,14 +276,6 @@
 			    self->priv->max_filename_length);
 }
 
-static void insensitive_button(GtkWidget *widget, gpointer data)
-{ 
-  HildonFileChooserDialogPrivate *priv =
-	HILDON_FILE_CHOOSER_DIALOG(data)->priv;
-
-  hildon_banner_show_information(widget, NULL, priv->infobanner_message);
-}
-
 static void file_activated_handler(GtkWidget * widget, gpointer user_data)
 {
     gtk_dialog_response(GTK_DIALOG(user_data), GTK_RESPONSE_OK);
@@ -922,7 +914,8 @@
                              _("ckdg_bd_select_object_ok_open"));
         gtk_button_set_label(GTK_BUTTON(priv->cancel_button),
                              _("ckdg_bd_select_object_cancel"));
-	priv->infobanner_message = _("sfil_ib_select_file");
+	hildon_helper_set_insensitive_message (priv->action_button,
+					       _("sfil_ib_select_file"));
         break;
     case GTK_FILE_CHOOSER_ACTION_SAVE:
         if (hildon_file_chooser_dialog_save_multiple_set(priv))
@@ -960,7 +953,8 @@
                              _("ckdg_bd_save_object_dialog_cancel"));
         gtk_file_chooser_set_current_name(GTK_FILE_CHOOSER(self),
                                           _("ckdg_va_save_object_name_stub_default"));
-	priv->infobanner_message = HCS("ckdg_ib_enter_name");
+	hildon_helper_set_insensitive_message (priv->action_button,
+					       HCS("ckdg_ib_enter_name"));
         break;
     case GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER:
         gtk_widget_hide(priv->caption_control_name);
@@ -977,7 +971,8 @@
                              _("ckdg_bd_change_folder_new_folder"));
         gtk_button_set_label(GTK_BUTTON(priv->cancel_button),
                              _("ckdg_bd_change_folder_cancel"));
-	priv->infobanner_message = _("sfil_ib_select_file");
+	hildon_helper_set_insensitive_message (priv->action_button,
+					       _("sfil_ib_select_file"));
         break;
     case GTK_FILE_CHOOSER_ACTION_CREATE_FOLDER:
         hildon_caption_set_label(HILDON_CAPTION(priv->caption_control_name),
@@ -996,7 +991,8 @@
                              _("ckdg_bd_new_folder_dialog_ok"));
         gtk_button_set_label(GTK_BUTTON(priv->cancel_button),
                              _("ckdg_bd_new_folder_dialog_cancel"));
-	priv->infobanner_message = HCS("ckdg_ib_enter_name");
+	hildon_helper_set_insensitive_message (priv->action_button,
+					       HCS("ckdg_ib_enter_name"));
         break;
     default:
         g_assert_not_reached();
@@ -1760,7 +1756,7 @@
     priv->autonaming_enabled = TRUE;
     priv->should_show_folder_button = TRUE;
     priv->should_show_location = TRUE;
-    priv->stub_name = priv->ext_name = priv->infobanner_message = NULL;
+    priv->stub_name = priv->ext_name = NULL;
     priv->action = GTK_FILE_CHOOSER_ACTION_OPEN;
     priv->action_button =
         gtk_dialog_add_button(GTK_DIALOG(self),
@@ -1888,8 +1884,6 @@
     g_signal_connect(eventbox, "button-release-event",
                      G_CALLBACK(hildon_file_chooser_dialog_location_pressed), 
                      self);
-    g_signal_connect(priv->action_button, "insensitive-press", 
-                     G_CALLBACK(insensitive_button), self);
 
     gtk_dialog_set_default_response(GTK_DIALOG(self), GTK_RESPONSE_OK);
 }