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

[From: subversion at stage.maemo.org]

Author: paradi
Date: 2009-10-01 11:51:42 +0300 (Thu, 01 Oct 2009)
New Revision: 19403

Modified:
   projects/haf/trunk/hildon-control-panel/ChangeLog
   projects/haf/trunk/hildon-control-panel/configure.ac
   projects/haf/trunk/hildon-control-panel/debian/changelog
   projects/haf/trunk/hildon-control-panel/src/hcp-window.c
Log:
  * Fixes: NB#141348 - Remove clear device


Modified: projects/haf/trunk/hildon-control-panel/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-control-panel/ChangeLog	2009-09-30 15:06:26 UTC (rev 19402)
+++ projects/haf/trunk/hildon-control-panel/ChangeLog	2009-10-01 08:51:42 UTC (rev 19403)
@@ -1,3 +1,14 @@
+2009-09-30  Peter Aradi <peter.aradi at maemo.org>
+
+	Release 2.2.18
+
+	* configure.ac: 2.2.18
+
+2009-09-30  Peter Aradi <peter.aradi at maemo.org>
+
+	* src/hcp-window.c:
+	removed item from app menu
+
 2009-09-23  Peter Aradi <peter.aradi at maemo.org>
 
 	Release 2.2.17

Modified: projects/haf/trunk/hildon-control-panel/configure.ac
===================================================================
--- projects/haf/trunk/hildon-control-panel/configure.ac	2009-09-30 15:06:26 UTC (rev 19402)
+++ projects/haf/trunk/hildon-control-panel/configure.ac	2009-10-01 08:51:42 UTC (rev 19403)
@@ -1,5 +1,5 @@
 AC_INIT(Makefile.am)
-AM_INIT_AUTOMAKE(hildon-control-panel, 2.2.17)
+AM_INIT_AUTOMAKE(hildon-control-panel, 2.2.18)
 AM_CONFIG_HEADER(config.h)
 
 AC_ARG_ENABLE(debug, [AC_HELP_STRING([--enable-debug],[Debug (default=no)])],

Modified: projects/haf/trunk/hildon-control-panel/debian/changelog
===================================================================
--- projects/haf/trunk/hildon-control-panel/debian/changelog	2009-09-30 15:06:26 UTC (rev 19402)
+++ projects/haf/trunk/hildon-control-panel/debian/changelog	2009-10-01 08:51:42 UTC (rev 19403)
@@ -1,3 +1,9 @@
+hildon-control-panel (1:2.2.18-1) unstable; urgency=low
+
+  * Fixes: NB#141348 - Remove clear device
+
+ -- Peter Aradi <peter.aradi at maemo.org>  Wed, 30 Sep 2009 17:12:15 +0100
+
 hildon-control-panel (1:2.2.17-1) unstable; urgency=low
 
   * Fixes: NB#139895 - Control panel needs to take a screenshot

Modified: projects/haf/trunk/hildon-control-panel/src/hcp-window.c
===================================================================
--- projects/haf/trunk/hildon-control-panel/src/hcp-window.c	2009-09-30 15:06:26 UTC (rev 19402)
+++ projects/haf/trunk/hildon-control-panel/src/hcp-window.c	2009-10-01 08:51:42 UTC (rev 19403)
@@ -85,6 +85,9 @@
 #define HCP_CUD_SCRIPT         "/usr/sbin/osso-app-killer-cud.sh"
 #define HCP_SCREENSHOT_PATH    "/home/user/.cache/launch/com.nokia.controlpanel.pvr"
 
+#define HCP_WITH_ROS           1
+#define HCP_WITH_CUD           0
+
 static void 
 hcp_window_enforce_state (HCPWindow *window)
 {
@@ -369,6 +372,7 @@
 }
 
 #ifdef MAEMO_TOOLS
+#if HCP_WITH_CUD
 static gboolean 
 hcp_window_clear_user_data (GtkWidget *widget, HCPWindow *window)
 {
@@ -378,7 +382,8 @@
 
   return TRUE;
 }
-
+#endif
+#if HCP_WITH_ROS
 static gboolean 
 hcp_window_reset_factory_settings (GtkWidget *widget, HCPWindow *window)
 {
@@ -388,8 +393,8 @@
 
   return TRUE;
 }
-
 #endif
+#endif
 
 static void 
 hcp_window_topmost_status_change (GObject *gobject, 
@@ -576,29 +581,36 @@
 #ifdef MAEMO_TOOLS
 
   /* Reset Factory Settings */
-  mi = hildon_button_new_with_text (HILDON_SIZE_AUTO_WIDTH |
-									HILDON_SIZE_FINGER_HEIGHT, 
-									HILDON_BUTTON_ARRANGEMENT_VERTICAL,
-									HCP_MENU_RFS, NULL);
+#if HCP_WITH_ROS
+  mi = hildon_button_new (HILDON_SIZE_AUTO_WIDTH |
+						  HILDON_SIZE_FINGER_HEIGHT,
+  						  HILDON_BUTTON_ARRANGEMENT_VERTICAL);
+
+  GtkWidget *ros_label = gtk_label_new (HCP_MENU_RFS);
+  gtk_label_set_justify (GTK_LABEL(ros_label), GTK_JUSTIFY_CENTER );
+
+  gtk_container_add (GTK_CONTAINER(mi), ros_label);
+ 
   hildon_helper_set_logical_font (mi, "SmallSystemFont");
  
   hildon_app_menu_append (menu, GTK_BUTTON(mi));
 
   g_signal_connect (mi, "clicked",
                     G_CALLBACK (hcp_window_reset_factory_settings), window);
-
+#endif
   /* Clean User Data */
+#if HCP_WITH_CUD
   mi = hildon_button_new_with_text (HILDON_SIZE_AUTO_WIDTH |
 									HILDON_SIZE_FINGER_HEIGHT, 
 									HILDON_BUTTON_ARRANGEMENT_VERTICAL,
 									HCP_MENU_CUD, NULL);
-  hildon_helper_set_logical_font (mi, "SmallSystemFont");
 
   hildon_app_menu_append (menu, GTK_BUTTON(mi));
 
   g_signal_connect (mi, "clicked",
                     G_CALLBACK (hcp_window_clear_user_data), window);
 #endif
+#endif
   
   gtk_widget_show_all (GTK_WIDGET (menu));