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

Fri Aug 7 14:33:42 EEST 2009

Author: kihamala
Date: 2009-08-07 14:33:38 +0300 (Fri, 07 Aug 2009)
New Revision: 19088

Added:
   projects/haf/trunk/hildon-control-panel/data/applets.desktop
Modified:
   projects/haf/trunk/hildon-control-panel/ChangeLog
   projects/haf/trunk/hildon-control-panel/configure.ac
   projects/haf/trunk/hildon-control-panel/data/Makefile.am
   projects/haf/trunk/hildon-control-panel/debian/changelog
   projects/haf/trunk/hildon-control-panel/src/hcp-app-loader.c
   projects/haf/trunk/hildon-control-panel/src/hcp-app-view.c
   projects/haf/trunk/hildon-control-panel/src/hcp-app.c
   projects/haf/trunk/hildon-control-panel/src/hcp-window.c
Log:
releasing


Modified: projects/haf/trunk/hildon-control-panel/ChangeLog
===================================================================

--- projects/haf/trunk/hildon-control-panel/ChangeLog	2009-08-07 08:39:03 UTC (rev 19087)
+++ projects/haf/trunk/hildon-control-panel/ChangeLog	2009-08-07 11:33:38 UTC (rev 19088)
@@ -1,3 +1,20 @@
+2009-08-07 Kimmo Hämäläinen <kimmo.hamalainen at nokia.com>
+
+	Release 2.2.13
+
+	* configure.ac: 2.2.13
+
+2009-08-07 David Kedves <dkedves at blumsoft.eu>
+
+	* data/applets.desktop:
+	* data/Makefile.am:
+	 - Include the applet ordering desktop file
+	* src/hcp-window.c:
+	 - On delete event, close the applets too
+	* src/hcp-app-view.c:
+	 - Only one applets should be started via
+	   HCP main window at a time
+
 2009-08-06 Kimmo Hämäläinen <kimmo.hamalainen at nokia.com>
 
 	Release 2.2.12

Modified: projects/haf/trunk/hildon-control-panel/configure.ac
===================================================================
--- projects/haf/trunk/hildon-control-panel/configure.ac	2009-08-07 08:39:03 UTC (rev 19087)
+++ projects/haf/trunk/hildon-control-panel/configure.ac	2009-08-07 11:33:38 UTC (rev 19088)
@@ -1,5 +1,5 @@
 AC_INIT(Makefile.am)
-AM_INIT_AUTOMAKE(hildon-control-panel, 2.2.12)
+AM_INIT_AUTOMAKE(hildon-control-panel, 2.2.13)
 AM_CONFIG_HEADER(config.h)
 
 AC_ARG_ENABLE(debug, [AC_HELP_STRING([--enable-debug],[Debug (default=no)])],

Modified: projects/haf/trunk/hildon-control-panel/data/Makefile.am
===================================================================
--- projects/haf/trunk/hildon-control-panel/data/Makefile.am	2009-08-07 08:39:03 UTC (rev 19087)
+++ projects/haf/trunk/hildon-control-panel/data/Makefile.am	2009-08-07 11:33:38 UTC (rev 19088)
@@ -21,7 +21,8 @@
 
 EXTRA_DIST = hildon-control-panel.pc.in \
 	com.nokia.controlpanel.service.in \
-	hildon-control-panel.desktop.in
+	hildon-control-panel.desktop.in \
+	applets.desktop
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = hildon-control-panel.pc

Added: projects/haf/trunk/hildon-control-panel/data/applets.desktop
===================================================================
--- projects/haf/trunk/hildon-control-panel/data/applets.desktop	2009-08-07 08:39:03 UTC (rev 19087)
+++ projects/haf/trunk/hildon-control-panel/data/applets.desktop	2009-08-07 11:33:38 UTC (rev 19088)
@@ -0,0 +1,28 @@
+[personalisation]
+personalisation.desktop=1
+cpprofiles.desktop=2
+cpdatetime.desktop=3
+cplanguageregional.desktop=4
+cpdisplay.desktop=5
+cpnotificationlight.desktop=6
+cptextinput.desktop=7
+
+[connectivity]
+osso-maesync-ui.desktop=1
+libasconfigapplet.desktop=2
+osso-connectivity-ui-btsettings.desktop=3
+location-cp.desktop=4
+sharing-accounts.desktop=5
+rtcom-accounts-ui.desktop=6
+osso-connectivity-ui-iapsettings.desktop=7
+connui-cellular-settings.desktop=8
+cpfmtx.desktop=9
+maemosec_certman_applet.desktop=10
+
+[general]
+cpdevicelock.desktop=1
+cpmemory.desktop=2
+cptvout.desktop=3
+tscalibrate.desktop=4
+cpdevice.desktop=5
+

Modified: projects/haf/trunk/hildon-control-panel/debian/changelog
===================================================================
--- projects/haf/trunk/hildon-control-panel/debian/changelog	2009-08-07 08:39:03 UTC (rev 19087)
+++ projects/haf/trunk/hildon-control-panel/debian/changelog	2009-08-07 11:33:38 UTC (rev 19088)
@@ -1,8 +1,11 @@
-hildon-control-panel (1:2.2.13-1~unreleased) unstable; urgency=low
+hildon-control-panel (1:2.2.13-1) unstable; urgency=low
 
-  * foo
+  Regression fixes [ David Kedves ]
+  * Only one applet can be started from HCP main-window at a time
+  * End Current Task should kill the applets too
+  * Include applet applet ordering
 
- -- Kimmo Hämäläinen <kimmo.hamalainen at nokia.com>  Thu,  6 Aug 2009 12:29:55 +0300
+ -- Kimmo Hämäläinen <kimmo.hamalainen at nokia.com>  Fri, 07 Aug 2009 09:26:15 +0200
 
 hildon-control-panel (1:2.2.12-1) unstable; urgency=low
 

Modified: projects/haf/trunk/hildon-control-panel/src/hcp-app-loader.c
===================================================================
--- projects/haf/trunk/hildon-control-panel/src/hcp-app-loader.c	2009-08-07 08:39:03 UTC (rev 19087)
+++ projects/haf/trunk/hildon-control-panel/src/hcp-app-loader.c	2009-08-07 11:33:38 UTC (rev 19088)
@@ -2,6 +2,8 @@
 #include <config.h>
 #endif
 
+#define _XOPEN_SOURCE 2009
+#include <unistd.h>
 #include <libosso.h>
 #include <dlfcn.h>
 #include <ctype.h>
@@ -121,10 +123,10 @@
    * argv[4] "%lu" -> CPA_parent xid
    */
     g_debug ("Parameters are: %s plugin.so plugin-name"
-             " 0/1 [user_activated]", argv[0]);
+             " 0/1 [user_activated] xwindow-id", argv[0]);
     return 1;
   }
-
+  
   if (!g_thread_supported ()) g_thread_init (NULL);
   
   hildon_gtk_init (&argc, &argv);

Modified: projects/haf/trunk/hildon-control-panel/src/hcp-app-view.c
===================================================================
--- projects/haf/trunk/hildon-control-panel/src/hcp-app-view.c	2009-08-07 08:39:03 UTC (rev 19087)
+++ projects/haf/trunk/hildon-control-panel/src/hcp-app-view.c	2009-08-07 11:33:38 UTC (rev 19088)
@@ -30,6 +30,7 @@
 
 #include "hcp-app-view.h"
 #include "hcp-app-list.h"
+#include "hcp-program.h"
 #include "hcp-app.h"
 #include "hcp-grid.h"
 #include "hcp-marshalers.h"
@@ -131,7 +132,13 @@
                          GtkTreePath *path, 
                          gpointer user_data)
 {
+  HCPProgram* program = hcp_program_get_instance ();
 
+  /* Users should able to start only one applet at a time
+   * from HCP main window (more can be started by libosso) */
+  if (program->running_applets)
+    return;
+
   HCPApp *app = hcp_app_view_get_selected_app (widget, path);
 
   /* important for state saving of executed app */

Modified: projects/haf/trunk/hildon-control-panel/src/hcp-app.c
===================================================================
--- projects/haf/trunk/hildon-control-panel/src/hcp-app.c	2009-08-07 08:39:03 UTC (rev 19087)
+++ projects/haf/trunk/hildon-control-panel/src/hcp-app.c	2009-08-07 11:33:38 UTC (rev 19088)
@@ -26,7 +26,7 @@
 #include <config.h>
 #endif
 
-#define _XOPEN_SOURCE
+#define _XOPEN_SOURCE 2009
 #include <unistd.h>
 #include <dlfcn.h>
 #include <string.h>

Modified: projects/haf/trunk/hildon-control-panel/src/hcp-window.c
===================================================================
--- projects/haf/trunk/hildon-control-panel/src/hcp-window.c	2009-08-07 08:39:03 UTC (rev 19087)
+++ projects/haf/trunk/hildon-control-panel/src/hcp-window.c	2009-08-07 11:33:38 UTC (rev 19088)
@@ -465,6 +465,31 @@
   hcp_window_enforce_state (window);
 }
 
+/* End current task */
+static void
+hcp_window_end_task (GtkWidget *widget,
+                     GdkEvent  *event,
+                     HCPWindow *window)
+{
+  g_return_if_fail (window);
+  g_return_if_fail (HCP_IS_WINDOW (window));
+
+  HCPProgram *program = hcp_program_get_instance ();
+
+  /* This sends TERM signak to applet processes ... */
+  if (program->running_applets)
+    g_list_foreach (program->running_applets,
+                    (GFunc) hcp_app_save_state,
+                    NULL);
+
+  hcp_window_save_state (window, TRUE);
+
+  gtk_widget_destroy (GTK_WIDGET (window));
+
+  gtk_main_quit ();
+}
+
+
 /* Normal quit ... */
 static void hcp_window_quit (GtkWidget *widget, HCPWindow *window)
 {
@@ -523,6 +548,9 @@
   g_signal_connect (G_OBJECT (window), "destroy",
                     G_CALLBACK (hcp_window_quit), window);
 
+  g_signal_connect (G_OBJECT (window), "delete-event",
+                    G_CALLBACK (hcp_window_end_task), window);
+
   g_signal_connect_after (G_OBJECT (window), "show",
                           G_CALLBACK (hcp_window_showed), window);
 

