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

[From: subversion at stage.maemo.org]

Author: lucasr
Date: 2007-08-15 14:48:07 +0300 (Wed, 15 Aug 2007)
New Revision: 13199

Modified:
   projects/haf/trunk/hildon-desktop/ChangeLog
   projects/haf/trunk/hildon-desktop/libhildondesktop/hildon-desktop-home-item.c
   projects/haf/trunk/hildon-desktop/libhildondesktop/hildon-desktop-marshalers.list
Log:
2007-08-15  Lucas Rocha  <lucas.rocha at nokia.com>

	* libhildondesktop/hildon-desktop-marshalers.list, 
	libhildondesktop/hildon-desktop-home-item.c
	(hildon_desktop_home_item_class_init): correctly set "settings" signal
	with OBJECT return type and input parameters.


Modified: projects/haf/trunk/hildon-desktop/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-desktop/ChangeLog	2007-08-15 11:38:18 UTC (rev 13198)
+++ projects/haf/trunk/hildon-desktop/ChangeLog	2007-08-15 11:48:07 UTC (rev 13199)
@@ -1,5 +1,12 @@
 2007-08-15  Lucas Rocha  <lucas.rocha at nokia.com>
 
+	* libhildondesktop/hildon-desktop-marshalers.list, 
+	libhildondesktop/hildon-desktop-home-item.c
+	(hildon_desktop_home_item_class_init): correctly set "settings" signal
+	with OBJECT return type and input parameters.
+
+2007-08-15  Lucas Rocha  <lucas.rocha at nokia.com>
+
 	* libhildondesktop/hildon-desktop-popup-window.c: mark the extra panes
 	as temporary windows.
 

Modified: projects/haf/trunk/hildon-desktop/libhildondesktop/hildon-desktop-home-item.c
===================================================================
--- projects/haf/trunk/hildon-desktop/libhildondesktop/hildon-desktop-home-item.c	2007-08-15 11:38:18 UTC (rev 13198)
+++ projects/haf/trunk/hildon-desktop/libhildondesktop/hildon-desktop-home-item.c	2007-08-15 11:48:07 UTC (rev 13199)
@@ -202,6 +202,9 @@
 static void
 hildon_desktop_home_item_snap_to_grid (HildonDesktopHomeItem *item);
 
+static GtkWidget * 
+hildon_desktop_home_item_settings (HildonDesktopHomeItem *item, GtkWidget *widget);
+
 static void
 hildon_desktop_home_item_set_state (HildonDesktopHomeItem       *item,
                                     HildonDesktopHomeItemState   state,
@@ -290,6 +293,8 @@
   object_class->set_property = hildon_desktop_home_item_set_property;
   object_class->get_property = hildon_desktop_home_item_get_property;
 
+  applet_class->settings = hildon_desktop_home_item_settings;
+
   gtkobject_class->destroy = hildon_desktop_home_item_destroy;
 
   /* Set the widgets virtual functions */
@@ -361,8 +366,8 @@
                 G_STRUCT_OFFSET (HildonDesktopHomeItemClass, settings),
                 NULL,
                 NULL,
-                g_cclosure_user_marshal_POINTER__POINTER,
-                G_TYPE_POINTER,
+                g_cclosure_user_marshal_OBJECT__OBJECT,
+                GTK_TYPE_WIDGET,
                 1,
                 GTK_TYPE_WIDGET);
 
@@ -1557,8 +1562,13 @@
   g_object_notify (G_OBJECT (widget), "state");
 }
 
+static GtkWidget *
+hildon_desktop_home_item_settings (HildonDesktopHomeItem *applet, GtkWidget *widget)
+{
+  /* No settings menu item by default */
+  return NULL;
+}
 
-
 /********************/
 /* public functions */
 /********************/
@@ -1683,7 +1693,7 @@
 {
   HildonDesktopHomeItemPriv    *priv;
   GtkWidget                    *top_level;
-
+  
   g_return_val_if_fail (HILDON_DESKTOP_IS_HOME_ITEM (item), NULL);
 
   priv = HILDON_DESKTOP_HOME_ITEM_GET_PRIVATE (item);
@@ -1695,9 +1705,9 @@
 
   g_signal_emit_by_name (item,
                          "settings",
-                         GTK_IS_WINDOW (top_level)?top_level:NULL,
+                         GTK_IS_WINDOW (top_level) ? top_level : NULL,
                          &priv->settings_menu_item);
-
+  
   if (GTK_IS_MENU_ITEM (priv->settings_menu_item))
   {
     GtkWidget *settings_item;

Modified: projects/haf/trunk/hildon-desktop/libhildondesktop/hildon-desktop-marshalers.list
===================================================================
--- projects/haf/trunk/hildon-desktop/libhildondesktop/hildon-desktop-marshalers.list	2007-08-15 11:38:18 UTC (rev 13198)
+++ projects/haf/trunk/hildon-desktop/libhildondesktop/hildon-desktop-marshalers.list	2007-08-15 11:48:07 UTC (rev 13199)
@@ -1,4 +1,4 @@
-POINTER:POINTER
+OBJECT:OBJECT
 VOID:STRING,POINTER
 VOID:POINTER,POINTER
 VOID:POINTER,POINTER,POINTER