[maemo-commits] [maemo-commits] r15228 - in projects/haf/trunk/hildon-desktop: . libhildondesktop libhildonwm src

[From: subversion at stage.maemo.org]

Author: lucasr
Date: 2008-02-26 13:10:32 +0200 (Tue, 26 Feb 2008)
New Revision: 15228

Modified:
   projects/haf/trunk/hildon-desktop/ChangeLog
   projects/haf/trunk/hildon-desktop/libhildondesktop/hildon-home-area.c
   projects/haf/trunk/hildon-desktop/libhildonwm/hd-wm.c
   projects/haf/trunk/hildon-desktop/src/hd-desktop.c
   projects/haf/trunk/hildon-desktop/src/hd-home-window.c
Log:
2008-02-25  Lucas Rocha  <lucas.rocha at nokia.com>

	* src/hd-desktop.c (hd_desktop_plugin_list_to_conf), 
	src/hd-home-window.c (hd_home_window_background,
	hd_home_window_screen_off), libhildondesktop/hildon-home-area.c,
	libhildonwm/hd-wm.c: several small fixed in order to cleanly build 
	on 64 bit architectures. 
	Patch from Bill Filler <bill.filler at canonical.com>. 


Modified: projects/haf/trunk/hildon-desktop/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-desktop/ChangeLog	2008-02-26 09:09:28 UTC (rev 15227)
+++ projects/haf/trunk/hildon-desktop/ChangeLog	2008-02-26 11:10:32 UTC (rev 15228)
@@ -1,3 +1,12 @@
+2008-02-25  Lucas Rocha  <lucas.rocha at nokia.com>
+
+	* src/hd-desktop.c (hd_desktop_plugin_list_to_conf), 
+	src/hd-home-window.c (hd_home_window_background,
+	hd_home_window_screen_off), libhildondesktop/hildon-home-area.c,
+	libhildonwm/hd-wm.c: several small fixed in order to cleanly build 
+	on 64 bit architectures. 
+	Patch from Bill Filler <bill.filler at canonical.com>. 
+
 2008-02-20  Lucas Rocha  <lucas.rocha at nokia.com>
 
 	* src/hd-switcher.c: fix #ifdef check for maemo GTK+. Patch from

Modified: projects/haf/trunk/hildon-desktop/libhildondesktop/hildon-home-area.c
===================================================================
--- projects/haf/trunk/hildon-desktop/libhildondesktop/hildon-home-area.c	2008-02-26 09:09:28 UTC (rev 15227)
+++ projects/haf/trunk/hildon-desktop/libhildondesktop/hildon-home-area.c	2008-02-26 11:10:32 UTC (rev 15228)
@@ -1856,7 +1856,7 @@
   GKeyFile             *keyfile;
   FILE                 *file;
   gchar                *buffer = NULL;
-  guint                 buffer_size;
+  gsize                 buffer_size;
   GError               *local_error = NULL;
   gint                  ret;
   guint                 n_children, i;
@@ -1958,7 +1958,7 @@
   GKeyFile *keyfile;
   GError *local_error = NULL;
   gchar **groups = NULL;
-  guint n_groups;
+  gsize n_groups;
   GList *applets = NULL;
 
   g_return_if_fail (area);

Modified: projects/haf/trunk/hildon-desktop/libhildonwm/hd-wm.c
===================================================================
--- projects/haf/trunk/hildon-desktop/libhildonwm/hd-wm.c	2008-02-26 09:09:28 UTC (rev 15227)
+++ projects/haf/trunk/hildon-desktop/libhildonwm/hd-wm.c	2008-02-26 11:10:32 UTC (rev 15228)
@@ -1735,8 +1735,8 @@
     hdwm->priv->active_window = hdwm->priv->last_active_window = win;
       
     /* Window with no views */
-    hd_wm_debug ("Window 0x%x just became active", (int)win);
-	  
+    hd_wm_debug ("Window %p just became active", win);	  
+
     HDWMEntryInfo *info = HD_WM_ENTRY_INFO (win);
 
     g_signal_emit_by_name (hdwm,"entry_info_stack_changed",info);

Modified: projects/haf/trunk/hildon-desktop/src/hd-desktop.c
===================================================================
--- projects/haf/trunk/hildon-desktop/src/hd-desktop.c	2008-02-26 09:09:28 UTC (rev 15227)
+++ projects/haf/trunk/hildon-desktop/src/hd-desktop.c	2008-02-26 11:10:32 UTC (rev 15228)
@@ -409,7 +409,7 @@
   GError *error = NULL;
   gchar *buffer;
   gchar *config_file_path;
-  gint buffer_size;
+  gsize buffer_size;
 
   g_return_if_fail (config_file != NULL);
 
@@ -443,7 +443,7 @@
     }
   }
 
-  buffer = g_key_file_to_data (keyfile, (gsize *) &buffer_size, &error);
+  buffer = g_key_file_to_data (keyfile, &buffer_size, &error);
 
   if (error)
   {
@@ -453,7 +453,7 @@
     return;
   }
 
-  g_file_set_contents (config_file_path, buffer, buffer_size, &error);
+  g_file_set_contents (config_file_path, buffer, (gssize) buffer_size, &error);
 
   if (error)
   {

Modified: projects/haf/trunk/hildon-desktop/src/hd-home-window.c
===================================================================
--- projects/haf/trunk/hildon-desktop/src/hd-home-window.c	2008-02-26 09:09:28 UTC (rev 15227)
+++ projects/haf/trunk/hildon-desktop/src/hd-home-window.c	2008-02-26 11:10:32 UTC (rev 15228)
@@ -1457,10 +1457,9 @@
 
   if (!priv->screen_is_off)
     {
-
       gtk_container_foreach (GTK_CONTAINER (area),
                              (GtkCallback)hildon_desktop_home_item_set_is_background,
-                             (gpointer)is_background);
+                             GINT_TO_POINTER (is_background));
     }
 
 }
@@ -1484,7 +1483,7 @@
     {
       gtk_container_foreach (GTK_CONTAINER (area),
                              (GtkCallback)hildon_desktop_home_item_set_is_background,
-                             (gpointer)is_off);
+                             GINT_TO_POINTER (is_off));
     }
 
 }