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

[From: subversion at stage.maemo.org]

Author: moimart
Date: 2007-02-26 14:53:44 +0200 (Mon, 26 Feb 2007)
New Revision: 10208

Modified:
   projects/haf/trunk/hildon-desktop/ChangeLog
   projects/haf/trunk/hildon-desktop/libhildondesktop/hildon-desktop-notification-manager.c
   projects/haf/trunk/hildon-desktop/libhildondesktop/hildon-desktop-notification-manager.h
   projects/haf/trunk/hildon-desktop/src/hd-desktop.c
Log:

	* src/hd-desktop.c:
        - Fixed usage of notification manager.
        * libhildondesktop/hildon-desktop-notification-manager.[ch]:
        - Fixed silly castings on notification manager.
        - Added support for timeout.
	* ChangeLog updated.



Modified: projects/haf/trunk/hildon-desktop/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-desktop/ChangeLog	2007-02-26 12:40:35 UTC (rev 10207)
+++ projects/haf/trunk/hildon-desktop/ChangeLog	2007-02-26 12:53:44 UTC (rev 10208)
@@ -1,3 +1,11 @@
+2007-02-26  Moises Martinez  <moises.martinez at nokia.com>
+
+	* src/hd-desktop.c:
+        - Fixed usage of notification manager.
+        * libhildondesktop/hildon-desktop-notification-manager.[ch]:
+	- Fixed silly castings on notification manager.
+        - Added support for timeout.
+
 2007-02-26  Johan Bilien  <johan.bilien at nokia.com>
 
 	* libhildonwm/hd-keys.c: Use DBus directly for sending message
@@ -6,6 +14,11 @@
 	* libhildonwm/Makefile.am, libhildonwm/libhildonwm.pc.in:
 	libhildonwm doesn't depend on libosso anymore
 
+2007-02-26  Lucas Rocha  <lucas.rocha at nokia.com>
+
+        * src/hn-app-button.c: return TRUE on button press handler to fix
+        miss-behavior when clicking on app button.
+
 2007-02-23  Moises Martinez  <moises.martinez at nokia.com>
 
 	* src/hd-desktop.c: Added new notification manager.

Modified: projects/haf/trunk/hildon-desktop/libhildondesktop/hildon-desktop-notification-manager.c
===================================================================
--- projects/haf/trunk/hildon-desktop/libhildondesktop/hildon-desktop-notification-manager.c	2007-02-26 12:40:35 UTC (rev 10207)
+++ projects/haf/trunk/hildon-desktop/libhildondesktop/hildon-desktop-notification-manager.c	2007-02-26 12:53:44 UTC (rev 10208)
@@ -128,7 +128,20 @@
 {
 }
 
-GtkWidget *
+static gboolean 
+hildon_desktop_notification_manager_timeout (GtkTreeIter *iter)
+{
+ GtkListStore *nm = 
+   hildon_desktop_notification_manager_get_singleton ();	
+
+  gtk_list_store_remove (nm, iter);
+
+  g_free (iter);
+
+  return FALSE;
+}
+
+GtkListStore *
 hildon_desktop_notification_manager_get_singleton (void)
 {
   static GObject *nm = NULL;
@@ -136,7 +149,7 @@
   if (nm == NULL)
     nm = g_object_new (HILDON_DESKTOP_TYPE_NOTIFICATION_MANAGER, NULL);
 
-  return GTK_WIDGET (nm);
+  return GTK_LIST_STORE (nm);
 }
 
 gboolean
@@ -151,7 +164,7 @@
                                         	    gint                   timeout, 
                                         	    DBusGMethodInvocation *context)
 {
-  GtkTreeIter iter;
+  GtkTreeIter iter,*iter_timeout;
 
 
   gtk_list_store_append (GTK_LIST_STORE (nm),
@@ -169,6 +182,19 @@
 		      COL_HINTS, hints,
 		      COL_TIMEOUT, timeout,
 		      -1);
+
+   
+
+  if (timeout > 0)
+  {
+    iter_timeout = g_new0 (GtkTreeIter, 1);
+
+    *iter_timeout = iter;  
+    
+    g_timeout_add (timeout,
+		   (GSourceFunc)hildon_desktop_notification_manager_timeout,
+		   iter_timeout);
+  }
 		      
   dbus_g_method_return (context, id);
 

Modified: projects/haf/trunk/hildon-desktop/libhildondesktop/hildon-desktop-notification-manager.h
===================================================================
--- projects/haf/trunk/hildon-desktop/libhildondesktop/hildon-desktop-notification-manager.h	2007-02-26 12:40:35 UTC (rev 10207)
+++ projects/haf/trunk/hildon-desktop/libhildondesktop/hildon-desktop-notification-manager.h	2007-02-26 12:53:44 UTC (rev 10208)
@@ -54,12 +54,12 @@
 
 struct _HildonDesktopNotificationManagerClass 
 {
-  GtkListStore parent_class;
+  GtkListStoreClass parent_class;
 };
 
 GType      hildon_desktop_notification_manager_get_type          (void);
 
-GtkWidget *hildon_desktop_notification_manager_get_singleton     (void);
+GtkListStore *hildon_desktop_notification_manager_get_singleton     (void);
 
 gboolean   hildon_desktop_notification_manager_notify_handler    (HildonDesktopNotificationManager *nm,
                                                       const gchar           *app_name,

Modified: projects/haf/trunk/hildon-desktop/src/hd-desktop.c
===================================================================
--- projects/haf/trunk/hildon-desktop/src/hd-desktop.c	2007-02-26 12:40:35 UTC (rev 10207)
+++ projects/haf/trunk/hildon-desktop/src/hd-desktop.c	2007-02-26 12:53:44 UTC (rev 10208)
@@ -70,7 +70,7 @@
   gchar           *config_file;
   GHashTable      *containers;
   GObject         *pm;
-  GtkWidget       *nm;
+  GtkListStore    *nm;
 #ifdef HAVE_LIBOSSO
   osso_context_t  *osso_context;
 #endif