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

[From: subversion at stage.maemo.org]

Author: lucasr
Date: 2007-05-07 16:18:58 +0300 (Mon, 07 May 2007)
New Revision: 11500

Modified:
   projects/haf/trunk/hildon-desktop/ChangeLog
   projects/haf/trunk/hildon-desktop/src/hd-desktop.c
Log:
2007-05-07  Lucas Rocha  <lucas.rocha at nokia.com>

	* src/hd-desktop.c: call default action when system note dialog gets
	the response event.


Modified: projects/haf/trunk/hildon-desktop/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-desktop/ChangeLog	2007-05-07 13:07:27 UTC (rev 11499)
+++ projects/haf/trunk/hildon-desktop/ChangeLog	2007-05-07 13:18:58 UTC (rev 11500)
@@ -1,5 +1,10 @@
 2007-05-07  Lucas Rocha  <lucas.rocha at nokia.com>
 
+	* src/hd-desktop.c: call default action when system note dialog gets
+	the response event.
+
+2007-05-07  Lucas Rocha  <lucas.rocha at nokia.com>
+
 	* src/hd-desktop.c, libhildondesktop/hildon-desktop-notification-manager.[ch], 
 	libhildondesktop/notification-manager.xml: support for setting the
 	button label on system.note.dialog to cover the open "closeable"

Modified: projects/haf/trunk/hildon-desktop/src/hd-desktop.c
===================================================================
--- projects/haf/trunk/hildon-desktop/src/hd-desktop.c	2007-05-07 13:07:27 UTC (rev 11499)
+++ projects/haf/trunk/hildon-desktop/src/hd-desktop.c	2007-05-07 13:18:58 UTC (rev 11500)
@@ -657,79 +657,6 @@
                           user_data);
 }
 
-#if 0
-  if (g_str_equal ("delayed_infobanner", method))
-  {
-      gint parent_window_id = 0;
-
-      if (arguments->len < 4 ||
-          arguments->len > 5 ||
-          val[0]->type != DBUS_TYPE_INT32 ||
-          val[1]->type != DBUS_TYPE_INT32 ||
-          val[2]->type != DBUS_TYPE_INT32 ||
-          val[3]->type != DBUS_TYPE_STRING ||
-          (arguments->len == 5 && val[4]->type != DBUS_TYPE_INT32))
-      {
-        if (arguments->len < 4) 
-        {
-          retval->value.s = "Not enough arguments.";
-        } 
-        else 
-        {
-          g_sprintf (retval->value.s, "Wrong type of arguments: "
-                     "(%d,%d,%d,%d); was expecting (%d, %d, %d and %d)",
-                     val[0]->type, val[1]->type,
-                     val[2]->type, val[3]->type,
-                     DBUS_TYPE_INT32, DBUS_TYPE_INT32,
-                     DBUS_TYPE_INT32, DBUS_TYPE_STRING);
-        }
-
-        g_warning (retval->value.s);
-
-        return OSSO_ERROR;
-      }
-
-      if (arguments->len == 5)
-        parent_window_id = val[4]->value.i;
-
-      return _delayed_infobanner_add (val[0]->value.i,
-                                      val[1]->value.i,
-                                      val[2]->value.i,
-                                      val[3]->value.s,
-                                      parent_window_id);
-  }
-  else if (g_str_equal( "cancel_delayed_infobanner", method))
-  {
-    if (arguments->len > 1 ||
-        val[0]->type != DBUS_TYPE_INT32 ) 
-    {
-      retval->type = DBUS_TYPE_STRING;
-
-      if (arguments->len > 1) 
-      {
-        retval->value.s = "Too many args.";
-      } 
-      else 
-      {
-        g_sprintf(retval->value.s, "Wrong type of arguments: "
-                  "(%d), was expecting int (%d)",
-                  val[0]->type, DBUS_TYPE_INT32);
-      }
-
-      g_warning (retval->value.s);
-
-      return OSSO_ERROR;
-    }
-
-    _delayed_infobanner_remove (GINT_TO_POINTER (val[0]->value.i));
-
-    /* This function returns boolean for the timeout functions, *
-     * we don't care about that here. It's false always, anyway */
-    return OSSO_OK;
-
-  }
-#endif
-
 static void 
 hd_desktop_load_containers (HDDesktop *desktop)
 {
@@ -1142,6 +1069,7 @@
   nm = (HildonDesktopNotificationManager *) 
 	  gtk_tree_model_filter_get_model (GTK_TREE_MODEL_FILTER (desktop->priv->nm));
 
+  hildon_desktop_notification_manager_call_action (nm, ninfo->id, "default");
   hildon_desktop_notification_manager_close_notification (nm, ninfo->id, NULL);
   
   g_free (ninfo);