[maemo-commits] [maemo-commits] r11352 - in projects/haf/trunk/hildon-home-webshortcut: . plugin

[From: subversion at stage.maemo.org]

Author: jobi
Date: 2007-04-27 15:48:37 +0300 (Fri, 27 Apr 2007)
New Revision: 11352

Modified:
   projects/haf/trunk/hildon-home-webshortcut/ChangeLog
   projects/haf/trunk/hildon-home-webshortcut/plugin/hildon-home-webshortcut.c
Log:

2007-04-27  Johan Bilien  <johan.bilien at nokia.com>

	* plugin/hildon-home-webshortcut.c: Pass the object
	instead of its private member to the loader error handler.
	Fixes: NB#55297



Modified: projects/haf/trunk/hildon-home-webshortcut/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-home-webshortcut/ChangeLog	2007-04-26 15:55:06 UTC (rev 11351)
+++ projects/haf/trunk/hildon-home-webshortcut/ChangeLog	2007-04-27 12:48:37 UTC (rev 11352)
@@ -1,3 +1,9 @@
+2007-04-27  Johan Bilien  <johan.bilien at nokia.com>
+
+	* plugin/hildon-home-webshortcut.c: Pass the object
+	instead of its private member to the loader error handler.
+	Fixes: NB#55297
+
 2007-03-09  Johan Bilien  <johan.bilien at nokia.com>
 
 	* Reverted version to 1.9.0 for coherence with the rest

Modified: projects/haf/trunk/hildon-home-webshortcut/plugin/hildon-home-webshortcut.c
===================================================================
--- projects/haf/trunk/hildon-home-webshortcut/plugin/hildon-home-webshortcut.c	2007-04-26 15:55:06 UTC (rev 11351)
+++ projects/haf/trunk/hildon-home-webshortcut/plugin/hildon-home-webshortcut.c	2007-04-27 12:48:37 UTC (rev 11352)
@@ -108,7 +108,8 @@
   HhwsPrivate  *priv = hhws->priv;
   GtkWidget    *note = NULL;
 
-  note = hildon_note_new_information (GTK_WINDOW (priv->home_win),
+  note = hildon_note_new_information (priv->home_win?
+                                      GTK_WINDOW (priv->home_win):NULL,
                                       text);
 
   gtk_dialog_run (GTK_DIALOG (note));
@@ -278,8 +279,10 @@
   gtk_file_filter_add_mime_type (mime_type_filter, "image/bmp");
   gtk_file_filter_add_mime_type (mime_type_filter, "image/tiff");
   gtk_file_filter_add_mime_type (mime_type_filter, "sketch/png");
+#if 0
   gtk_file_chooser_set_filter (GTK_FILE_CHOOSER (dialog),
                                mime_type_filter);
+#endif
 
   dir = hhws_get_user_image_dir ();
   if (!gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (dialog), dir))
@@ -355,7 +358,7 @@
               error_handler = g_signal_connect (priv->loader,
                                                 "loading-failed",
                                                 G_CALLBACK (hhws_loader_error_cb),
-                                                priv);
+                                                hhws);
 
               hhws_loader_set_uri (priv->loader, new_image_path);
               g_signal_handler_disconnect (priv->loader, error_handler);
@@ -655,9 +658,9 @@
                GtkWidget               *parent)
 {
   Hhws         *hhws = HHWS (applet);
-  HhwsPrivate  *priv = hhws->priv; 
+  HhwsPrivate  *priv = hhws->priv;
   GtkWidget    *item;
- 
+
   priv->home_win = parent;
   item = gtk_menu_item_new_with_label (HHWS_TITLEBAR_MENU);