[maemo-commits] [maemo-commits] r16847 - in projects/haf/trunk/hildon-control-panel: . data src

[From: subversion at stage.maemo.org]

Author: paradi
Date: 2008-12-03 14:13:06 +0200 (Wed, 03 Dec 2008)
New Revision: 16847

Modified:
   projects/haf/trunk/hildon-control-panel/ChangeLog
   projects/haf/trunk/hildon-control-panel/data/hildon-control-panel.schemas
   projects/haf/trunk/hildon-control-panel/src/hcp-window.c
   projects/haf/trunk/hildon-control-panel/src/hcp-window.h
Log:
  * src/hcp-window.c:
  * src/hcp-window.h:
    HCPWindow is now derived from HildonStackableWindow.
    Fixes #NB 94225
  * data/hildon-control-panel.schemas:
    Changed order of groups.
    Fixes #NB 92795


Modified: projects/haf/trunk/hildon-control-panel/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-control-panel/ChangeLog	2008-12-03 11:05:03 UTC (rev 16846)
+++ projects/haf/trunk/hildon-control-panel/ChangeLog	2008-12-03 12:13:06 UTC (rev 16847)
@@ -1,3 +1,12 @@
+2008-12-03 Peter Aradi <peter.aradi at blumsoft.eu>
+	* src/hcp-window.c:
+	* src/hcp-window.h:
+	HCPWindow is now derived from HildonStackableWindow.
+	Fixes #NB 94225
+	* data/hildon-control-panel.schemas:
+	Changed order of groups.
+	Fixes #NB 92795
+
 2008-11-24 Peter Aradi <peter.aradi at blumsoft.eu>
 	* src/hcp-window.c:
 	Menu now conforms to UI spec v 1.4

Modified: projects/haf/trunk/hildon-control-panel/data/hildon-control-panel.schemas
===================================================================
--- projects/haf/trunk/hildon-control-panel/data/hildon-control-panel.schemas	2008-12-03 11:05:03 UTC (rev 16846)
+++ projects/haf/trunk/hildon-control-panel/data/hildon-control-panel.schemas	2008-12-03 12:13:06 UTC (rev 16847)
@@ -7,7 +7,7 @@
       <owner>controlpanel</owner>
       <type>list</type>
       <list_type>string</list_type>
-      <default>[copa_ia_general,copa_ia_connectivity,copa_ia_personalisation]</default>
+      <default>[copa_ia_personalisation,copa_ia_connectivity,copa_ia_general]</default>
       <locale name="C"/>
     </schema>
     <schema>
@@ -16,7 +16,7 @@
       <owner>controlpanel</owner>
       <type>list</type>
       <list_type>string</list_type>
-      <default>[general,connectivity,personalisation]</default>
+      <default>[personalisation,connectivity,general]</default>
       <locale name="C"/>
     </schema>
   </schemalist>

Modified: projects/haf/trunk/hildon-control-panel/src/hcp-window.c
===================================================================
--- projects/haf/trunk/hildon-control-panel/src/hcp-window.c	2008-12-03 11:05:03 UTC (rev 16846)
+++ projects/haf/trunk/hildon-control-panel/src/hcp-window.c	2008-12-03 12:13:06 UTC (rev 16847)
@@ -52,7 +52,7 @@
 #define HCP_WINDOW_GET_PRIVATE(object) \
         (G_TYPE_INSTANCE_GET_PRIVATE ((object), HCP_TYPE_WINDOW, HCPWindowPrivate))
 
-G_DEFINE_TYPE (HCPWindow, hcp_window, HILDON_TYPE_WINDOW);
+G_DEFINE_TYPE (HCPWindow, hcp_window, HILDON_TYPE_STACKABLE_WINDOW);
 
 struct _HCPWindowPrivate 
 {

Modified: projects/haf/trunk/hildon-control-panel/src/hcp-window.h
===================================================================
--- projects/haf/trunk/hildon-control-panel/src/hcp-window.h	2008-12-03 11:05:03 UTC (rev 16846)
+++ projects/haf/trunk/hildon-control-panel/src/hcp-window.h	2008-12-03 12:13:06 UTC (rev 16847)
@@ -25,7 +25,7 @@
 #ifndef HCP_WINDOW_H
 #define HCP_WINDOW_H
 
-#include <hildon/hildon-window.h>
+#include <hildon/hildon-stackable-window.h>
 
 #include <glib-object.h>
 
@@ -44,14 +44,14 @@
 
 struct _HCPWindow 
 {
-  HildonWindow win;
+  HildonStackableWindow win;
 
   HCPWindowPrivate *priv;
 };
 
 struct _HCPWindowClass 
 {
-  HildonWindowClass parent_class;
+  HildonStackableWindowClass parent_class;
 };
 
 GType        hcp_window_get_type    (void);