[maemo-commits] [maemo-commits] r10194 - in projects/haf/trunk/hildon-desktop: . src

[From: subversion at stage.maemo.org]

Author: moimart
Date: 2007-02-23 17:09:15 +0200 (Fri, 23 Feb 2007)
New Revision: 10194

Modified:
   projects/haf/trunk/hildon-desktop/ChangeLog
   projects/haf/trunk/hildon-desktop/src/hd-desktop.c
Log:

	* src/hd-desktop.c: Added new notification manager.
	* ChangeLog updated.



Modified: projects/haf/trunk/hildon-desktop/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-desktop/ChangeLog	2007-02-23 15:05:53 UTC (rev 10193)
+++ projects/haf/trunk/hildon-desktop/ChangeLog	2007-02-23 15:09:15 UTC (rev 10194)
@@ -1,5 +1,9 @@
 2007-02-23  Moises Martinez  <moises.martinez at nokia.com>
 
+	* src/hd-desktop.c: Added new notification manager.
+
+2007-02-23  Moises Martinez  <moises.martinez at nokia.com>
+
 	* libhildondesktop/notification-manager.xml:
 	* libhildondesktop/hildon-desktop-notification-manager.[ch]:
 	* libhildondesktop/Makefile.am:

Modified: projects/haf/trunk/hildon-desktop/src/hd-desktop.c
===================================================================
--- projects/haf/trunk/hildon-desktop/src/hd-desktop.c	2007-02-23 15:05:53 UTC (rev 10193)
+++ projects/haf/trunk/hildon-desktop/src/hd-desktop.c	2007-02-23 15:09:15 UTC (rev 10194)
@@ -38,12 +38,12 @@
 
 #include <hildon-base-lib/hildon-base-dnotify.h>
 #include <libhildondesktop/hildon-desktop-window.h>
+#include <libhildondesktop/hildon-desktop-notification-manager.h>
 
 #include "hd-desktop.h"
 #include "hd-select-plugins-dialog.h"
 #include "hd-config.h"
 #include "hd-plugin-manager.h"
-#include "hd-notification-manager.h"
 #include "hd-home-window.h"
 #include "hd-panel-window.h"
 #include "hd-panel-window-dialog.h"
@@ -70,7 +70,7 @@
   gchar           *config_file;
   GHashTable      *containers;
   GObject         *pm;
-  GObject         *nm;
+  GtkWidget       *nm;
 #ifdef HAVE_LIBOSSO
   osso_context_t  *osso_context;
 #endif
@@ -862,7 +862,7 @@
 
   desktop->priv->pm = hd_plugin_manager_new (); 
 
-  desktop->priv->nm = hd_notification_manager_new (); 
+  desktop->priv->nm = hildon_desktop_notification_manager_get_singleton (); 
 }
 
 static void