[maemo-commits] [maemo-commits] r12236 - in projects/haf/trunk/hildon-desktop: . background-manager src

[From: subversion at stage.maemo.org]

Author: jobi
Date: 2007-06-11 19:43:34 +0300 (Mon, 11 Jun 2007)
New Revision: 12236

Modified:
   projects/haf/trunk/hildon-desktop/ChangeLog
   projects/haf/trunk/hildon-desktop/background-manager/background-manager.c
   projects/haf/trunk/hildon-desktop/src/hd-home-background.c
   projects/haf/trunk/hildon-desktop/src/hd-home-window.c
Log:

2007-06-11  Johan Bilien  <johan.bilien at nokia.com>

	* src/hd-home-background.c:
	- call the callback even when an error occurred, so it can be
	handled
	* background-manager/background-manager.c:
	- removed the "plain color fallback", no longer necessary
	now that home draws its own titlebar
	Fixes: NB#55272



Modified: projects/haf/trunk/hildon-desktop/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-desktop/ChangeLog	2007-06-11 16:28:56 UTC (rev 12235)
+++ projects/haf/trunk/hildon-desktop/ChangeLog	2007-06-11 16:43:34 UTC (rev 12236)
@@ -1,5 +1,15 @@
 2007-06-11  Johan Bilien  <johan.bilien at nokia.com>
 
+	* src/hd-home-background.c:
+	- call the callback even when an error occurred, so it can be
+	handled
+	* background-manager/background-manager.c:
+	- removed the "plain color fallback", no longer necessary
+	now that home draws its own titlebar
+	Fixes: NB#55272
+
+2007-06-11  Johan Bilien  <johan.bilien at nokia.com>
+
 	* src/hd-home-window.c:
 	- add a filter on the root window to track whether the home
 	window is topmost

Modified: projects/haf/trunk/hildon-desktop/background-manager/background-manager.c
===================================================================
--- projects/haf/trunk/hildon-desktop/background-manager/background-manager.c	2007-06-11 16:28:56 UTC (rev 12235)
+++ projects/haf/trunk/hildon-desktop/background-manager/background-manager.c	2007-06-11 16:43:34 UTC (rev 12236)
@@ -835,7 +835,7 @@
                    window_xid);
       return FALSE;
     }
-  
+
   color.red   = red;
   color.blue  = blue;
   color.green = green;
@@ -843,22 +843,13 @@
   if (filename && filename[0])
     {
       image = load_image_from_uri (filename,
-                                   TRUE, 
                                    TRUE,
+                                   TRUE,
                                    &local_error);
       if (local_error)
         {
-          /* We will try to recover by using a plain color */
-          g_warning ("Error when loading uri %s: %s",
-                     filename,
-                     local_error->message);
-
-          g_clear_error (&local_error);
-          image = NULL;
-          /*
           g_propagate_error (error, local_error);
           return FALSE;
-          */
         }
     }
 

Modified: projects/haf/trunk/hildon-desktop/src/hd-home-background.c
===================================================================
--- projects/haf/trunk/hildon-desktop/src/hd-home-background.c	2007-06-11 16:28:56 UTC (rev 12235)
+++ projects/haf/trunk/hildon-desktop/src/hd-home-background.c	2007-06-11 16:43:34 UTC (rev 12236)
@@ -642,12 +642,9 @@
                                               struct cb_data   *data)
 {
   GdkPixmap *pixmap;
-  
-  g_debug ("DBUS Callback");
 
   if (error)
     {
-      g_warning ("Error when setting background: %s", error->message);
       goto cleanup;
     }
 
@@ -656,7 +653,7 @@
       g_warning ("No pixmap id returned");
       goto cleanup;
     }
-    
+
   pixmap = gdk_pixmap_foreign_new (pixmap_xid);
 
   if (pixmap)
@@ -676,10 +673,10 @@
   else
     g_warning ("No such pixmap: %i", pixmap_xid);
 
+cleanup:
   if (data->callback)
     data->callback (data->background, pixmap_xid, error, data->user_data);
 
-cleanup:
   if (G_IS_OBJECT (data->background))
       g_object_unref (data->background);
   g_free (data);

Modified: projects/haf/trunk/hildon-desktop/src/hd-home-window.c
===================================================================
--- projects/haf/trunk/hildon-desktop/src/hd-home-window.c	2007-06-11 16:28:56 UTC (rev 12235)
+++ projects/haf/trunk/hildon-desktop/src/hd-home-window.c	2007-06-11 16:43:34 UTC (rev 12236)
@@ -2058,57 +2058,3 @@
 
   gtk_widget_show_all (priv->cancel_note);
 }
-
-#if 0
-static void
-scale_changed (GtkRange *range, GtkWidget *area)
-{
-  gint  alpha;
-  
-  alpha = (gint) gtk_range_get_value (range);
-
-  g_debug ("value_changed");
-
-  g_object_set (area,
-                "applet-default-alpha", alpha,
-                NULL);
-}
-
-static void
-hd_home_window_adjust_alpha_activate (HDHomeWindow *window)
-{
-  GtkWidget    *area, *dialog, *scale;
-  gint          alpha;
-  gint          response;
-
-  area = hildon_home_window_get_area (HILDON_HOME_WINDOW (window));
-
-  g_object_get (area,
-                "applet-default-alpha", &alpha,
-                NULL);
-
-  dialog = gtk_dialog_new_with_buttons ("Adjust applets' transparency",
-                                        GTK_WINDOW (window),
-                                        GTK_DIALOG_MODAL | 
-                                          GTK_DIALOG_DESTROY_WITH_PARENT,
-                                        GTK_STOCK_OK, GTK_RESPONSE_ACCEPT,
-                                        NULL);
-  gtk_widget_set_size_request (dialog, 300, -1);
-
-  scale = gtk_hscale_new_with_range (0.0,
-                                     100.0,
-                                     1.0);
-  gtk_widget_show (scale);
-  g_signal_connect (scale, "value-changed",
-                    G_CALLBACK (scale_changed),
-                    area);
-  gtk_range_set_value (GTK_RANGE (scale), (gdouble)alpha);
-  
-  gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), scale);
-
-  response = gtk_dialog_run (GTK_DIALOG (dialog));
-  
-  gtk_widget_destroy (dialog);
-}
-
-#endif