[maemo-commits] [maemo-commits] r14916 - in projects/haf/trunk/maemo-launcher: . client debian

[From: subversion at stage.maemo.org]

Author: guillem
Date: 2007-12-07 19:25:24 +0200 (Fri, 07 Dec 2007)
New Revision: 14916

Modified:
   projects/haf/trunk/maemo-launcher/ChangeLog
   projects/haf/trunk/maemo-launcher/client/client.c
   projects/haf/trunk/maemo-launcher/debian/changelog
Log:
Port client to Hildon 1.x


Modified: projects/haf/trunk/maemo-launcher/ChangeLog
===================================================================
--- projects/haf/trunk/maemo-launcher/ChangeLog	2007-12-07 13:58:39 UTC (rev 14915)
+++ projects/haf/trunk/maemo-launcher/ChangeLog	2007-12-07 17:25:24 UTC (rev 14916)
@@ -1,3 +1,7 @@
+2007-12-07  Guillem Jover  <guillem.jover at nokia.com>
+
+	* client/client.c: Rewrite for Hildon 1.x.
+
 2007-12-04  Guillem Jover  <guillem.jover at nokia.com>
 
 	* configure.ac (DBUS_CFLAGS, DBUS_LIBS, CLIENT_CFLAGS, CLIENT_LIBS)

Modified: projects/haf/trunk/maemo-launcher/client/client.c
===================================================================
--- projects/haf/trunk/maemo-launcher/client/client.c	2007-12-07 13:58:39 UTC (rev 14915)
+++ projects/haf/trunk/maemo-launcher/client/client.c	2007-12-07 17:25:24 UTC (rev 14916)
@@ -1,9 +1,9 @@
 /*
  * $Id$
  *
- * Copyright (C) 2005 Nokia Corporation
+ * Copyright (C) 2005, 2007 Nokia Corporation
  *
- * Author: Michael Natterer <mitch at imendio.com>
+ * Author: Guillem Jover <guillem.jover at nokia.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -21,26 +21,34 @@
  */
 
 #include <gtk/gtk.h>
-#include <hildon-widgets/hildon-app.h>
+#include <hildon/hildon-program.h>
+#include <hildon/hildon-window.h>
 
 int
 main(int argc, char *argv[])
 {
   GTimer *timer;
-  GtkWidget *view;
-  GtkWidget *app;
+  HildonProgram *program;
+  HildonWindow *window;
 
   timer = g_timer_new();
 
   gtk_init(&argc, &argv);
+
   g_print("gtk_init() took %f seconds\n", g_timer_elapsed(timer, NULL));
 
-  view = hildon_appview_new("maemo-client");
-  app = hildon_app_new_with_appview(HILDON_APPVIEW(view));
-  g_signal_connect(app, "destroy", G_CALLBACK(gtk_main_quit), NULL);
+  program = hildon_program_get_instance();
+  g_set_application_name("maemo-client");
+
+  window = HILDON_WINDOW(hildon_window_new());
+  hildon_program_add_window(program, window);
+
+  g_signal_connect(G_OBJECT(window), "destroy",
+                   G_CALLBACK(gtk_main_quit), NULL);
+
   g_print("creating widgets took %f seconds\n", g_timer_elapsed(timer, NULL));
 
-  gtk_widget_show_all(app);
+  gtk_widget_show_all(GTK_WIDGET(window));
   g_print("showing widgets took %f seconds\n", g_timer_elapsed(timer, NULL));
 
   g_timer_destroy(timer);

Modified: projects/haf/trunk/maemo-launcher/debian/changelog
===================================================================
--- projects/haf/trunk/maemo-launcher/debian/changelog	2007-12-07 13:58:39 UTC (rev 14915)
+++ projects/haf/trunk/maemo-launcher/debian/changelog	2007-12-07 17:25:24 UTC (rev 14916)
@@ -1,6 +1,7 @@
 maemo-launcher (0.27-1) UNRELEASED; urgency=low
 
   * New Upstream Release.
+    - Port client to Hildon 1.x.
 
  -- Guillem Jover <guillem.jover at nokia.com>  Tue, 04 Dec 2007 20:03:29 +0200