[maemo-commits] [maemo-commits] r8275 - in projects/haf/branches/maemo-af-desktop/hildon-desktop: . libhildondesktop

[From: www-data at stage.maemo.org]

Author: jobi
Date: 2006-11-23 12:50:45 +0200 (Thu, 23 Nov 2006)
New Revision: 8275

Modified:
   projects/haf/branches/maemo-af-desktop/hildon-desktop/ChangeLog
   projects/haf/branches/maemo-af-desktop/hildon-desktop/libhildondesktop/hildon-home-window.c
   projects/haf/branches/maemo-af-desktop/hildon-desktop/libhildondesktop/hildon-home-window.h
Log:

2006-11-23  Johan Bilien  <johan.bilien at nokia.com>

	* libhildondesktop/hildon-home-window.[ch]: Inherit from
	HildonDesktopWindow



Modified: projects/haf/branches/maemo-af-desktop/hildon-desktop/ChangeLog
===================================================================
--- projects/haf/branches/maemo-af-desktop/hildon-desktop/ChangeLog	2006-11-23 10:15:38 UTC (rev 8274)
+++ projects/haf/branches/maemo-af-desktop/hildon-desktop/ChangeLog	2006-11-23 10:50:45 UTC (rev 8275)
@@ -1,5 +1,10 @@
-2006-11-21  Johan Bilien  <johan.bilien at nokia.com>
+2006-11-23  Johan Bilien  <johan.bilien at nokia.com>
 
+	* libhildondesktop/hildon-home-window.[ch]: Inherit from
+	HildonDesktopWindow
+
+2006-11-23  Johan Bilien  <johan.bilien at nokia.com>
+
 	* src/hd-plugin-loader-legacy.[ch]: made _set_key_type public
 
 2006-11-22  Moises Martinez  <moises.martinzes at nokia.com>

Modified: projects/haf/branches/maemo-af-desktop/hildon-desktop/libhildondesktop/hildon-home-window.c
===================================================================
--- projects/haf/branches/maemo-af-desktop/hildon-desktop/libhildondesktop/hildon-home-window.c	2006-11-23 10:15:38 UTC (rev 8274)
+++ projects/haf/branches/maemo-af-desktop/hildon-desktop/libhildondesktop/hildon-home-window.c	2006-11-23 10:50:45 UTC (rev 8275)
@@ -121,7 +121,7 @@
   guint is_inactive : 1;
 };
 
-G_DEFINE_TYPE (HildonHomeWindow, hildon_home_window, GTK_TYPE_WINDOW);
+G_DEFINE_TYPE (HildonHomeWindow, hildon_home_window, HILDON_DESKTOP_TYPE_WINDOW);
 
 enum
 {
@@ -239,7 +239,7 @@
 
 static void
 titlebar_layout_accept_cb (HildonHomeTitlebar *titlebar,
-			   HildonHomeWindow   *window)
+                           HildonHomeWindow   *window)
 {
   HildonHomeWindowPrivate *priv = window->priv;
   gchar *filename;
@@ -354,7 +354,7 @@
 
 static void
 titlebar_help_activate_cb (HildonHomeTitlebar *titlebar,
-		           HildonHomeWindow   *window)
+                           HildonHomeWindow   *window)
 {
   osso_context_t *osso_ctx;
   osso_return_t res;
@@ -909,8 +909,9 @@
   gtk_box_pack_end (GTK_BOX (vbox), priv->main_area, TRUE, TRUE, 0);
   gtk_widget_show (priv->main_area);
 
-  priv->applet_area = hildon_home_area_new ();/*gtk_fixed_new();*/
-  gtk_container_add( GTK_CONTAINER(priv->main_area), priv->applet_area );
+  priv->applet_area = hildon_home_area_new ();
+  gtk_container_add (GTK_CONTAINER(priv->main_area), priv->applet_area);
+  HILDON_DESKTOP_WINDOW (window)->container = priv->applet_area;
   g_signal_connect (priv->applet_area, "layout-mode-start",
                     G_CALLBACK (area_layout_mode_start),
                     window);

Modified: projects/haf/branches/maemo-af-desktop/hildon-desktop/libhildondesktop/hildon-home-window.h
===================================================================
--- projects/haf/branches/maemo-af-desktop/hildon-desktop/libhildondesktop/hildon-home-window.h	2006-11-23 10:15:38 UTC (rev 8274)
+++ projects/haf/branches/maemo-af-desktop/hildon-desktop/libhildondesktop/hildon-home-window.h	2006-11-23 10:50:45 UTC (rev 8275)
@@ -25,7 +25,7 @@
 #ifndef __HILDON_HOME_WINDOW_H__
 #define __HILDON_HOME_WINDOW_H__
 
-#include <gtk/gtkwindow.h>
+#include <libhildondesktop/hildon-desktop-window.h>
 #include <libosso.h>
 
 G_BEGIN_DECLS
@@ -37,20 +37,20 @@
 #define HILDON_IS_HOME_WINDOW_CLASS(klass)	(G_TYPE_CHECK_CLASS_TYPE ((klass), HILDON_TYPE_HOME_WINDOW))
 #define HILDON_HOME_WINDOW_GET_CLASS(obj)	(G_TYPE_INSTANCE_GET_CLASS ((obj), HILDON_TYPE_HOME_WINDOW, HildonHomeWindowClass))
 
-typedef struct _HildonHomeWindow		HildonHomeWindow;
+typedef struct _HildonHomeWindow		    HildonHomeWindow;
 typedef struct _HildonHomeWindowPrivate		HildonHomeWindowPrivate;
 typedef struct _HildonHomeWindowClass		HildonHomeWindowClass;
 
 struct _HildonHomeWindow
 {
-  GtkWindow parent_instance;
+  HildoDesktopnWindow parent_instance;
 
   HildonHomeWindowPrivate *priv;
 };
 
 struct _HildonHomeWindowClass
 {
-  GtkWindowClass parent_class;
+  HildonDesktopClass parent_class;
 
   void    (* background)    (HildonHomeWindow *window, gboolean is_background);
   void    (* lowmem)        (HildonHomeWindow *window, gboolean is_lowmem);