[maemo-commits] [maemo-commits] r8784 - in projects/haf/branches/maemo-af-desktop/hildon-desktop: . libhildondesktop
From: subversion at stage.maemo.org subversion at stage.maemo.orgDate: Fri Dec 15 17:03:09 EET 2006
- Previous message: [maemo-commits] r8783 - in projects/haf/branches/maemo-af-desktop/hildon-desktop: . libhildondesktop libhildonwm
- Next message: [maemo-commits] r8785 - in projects/haf/branches/maemo-af-desktop/hildon-desktop: . libhildondesktop
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
Author: jobi Date: 2006-12-15 17:03:08 +0200 (Fri, 15 Dec 2006) New Revision: 8784 Modified: projects/haf/branches/maemo-af-desktop/hildon-desktop/ChangeLog projects/haf/branches/maemo-af-desktop/hildon-desktop/libhildondesktop/hildon-desktop-item.c projects/haf/branches/maemo-af-desktop/hildon-desktop/libhildondesktop/hildon-desktop-item.h projects/haf/branches/maemo-af-desktop/hildon-desktop/libhildondesktop/hildon-home-applet.c projects/haf/branches/maemo-af-desktop/hildon-desktop/libhildondesktop/hildon-home-applet.h Log: 2006-12-15 Johan Bilien <johan.bilien at nokia.com> * libhildondesktop/hildon-desktop-item.[ch]: added _find_by_id * libhildondesktop/hildon-home-applet.[ch]: Removed desktop_file property (replaced by desktop item id) Modified: projects/haf/branches/maemo-af-desktop/hildon-desktop/ChangeLog =================================================================== --- projects/haf/branches/maemo-af-desktop/hildon-desktop/ChangeLog 2006-12-15 14:53:16 UTC (rev 8783) +++ projects/haf/branches/maemo-af-desktop/hildon-desktop/ChangeLog 2006-12-15 15:03:08 UTC (rev 8784) @@ -1,3 +1,9 @@ +2006-12-15 Johan Bilien <johan.bilien at nokia.com> + + * libhildondesktop/hildon-desktop-item.[ch]: added _find_by_id + * libhildondesktop/hildon-home-applet.[ch]: Removed + desktop_file property (replaced by desktop item id) + 2006-12-15 Moises Martinez <moises.martinzes at nokia.com> * libhildondesktop/hn-app-switcher.c: Modified: projects/haf/branches/maemo-af-desktop/hildon-desktop/libhildondesktop/hildon-desktop-item.c =================================================================== --- projects/haf/branches/maemo-af-desktop/hildon-desktop/libhildondesktop/hildon-desktop-item.c 2006-12-15 14:53:16 UTC (rev 8783) +++ projects/haf/branches/maemo-af-desktop/hildon-desktop/libhildondesktop/hildon-desktop-item.c 2006-12-15 15:03:08 UTC (rev 8784) @@ -260,3 +260,15 @@ return item->name; } +gint +hildon_desktop_item_find_by_id (HildonDesktopItem *item, + const gchar *id) +{ + g_return_val_if_fail (item && HILDON_DESKTOP_IS_ITEM (item), -1); + g_return_val_if_fail (id, -1); + + if (!item->id) + return -1; + + return g_str_equal (item->id, id); +} Modified: projects/haf/branches/maemo-af-desktop/hildon-desktop/libhildondesktop/hildon-desktop-item.h =================================================================== --- projects/haf/branches/maemo-af-desktop/hildon-desktop/libhildondesktop/hildon-desktop-item.h 2006-12-15 14:53:16 UTC (rev 8783) +++ projects/haf/branches/maemo-af-desktop/hildon-desktop/libhildondesktop/hildon-desktop-item.h 2006-12-15 15:03:08 UTC (rev 8784) @@ -67,6 +67,9 @@ const gchar* hildon_desktop_item_get_name (HildonDesktopItem *item); +gint hildon_desktop_item_find_by_id (HildonDesktopItem *item, + const gchar *id); + G_END_DECLS #endif Modified: projects/haf/branches/maemo-af-desktop/hildon-desktop/libhildondesktop/hildon-home-applet.c =================================================================== --- projects/haf/branches/maemo-af-desktop/hildon-desktop/libhildondesktop/hildon-home-applet.c 2006-12-15 14:53:16 UTC (rev 8783) +++ projects/haf/branches/maemo-af-desktop/hildon-desktop/libhildondesktop/hildon-home-applet.c 2006-12-15 15:03:08 UTC (rev 8784) @@ -69,7 +69,6 @@ typedef struct HildonHomeAppletPriv_ { - gchar *desktop_file; gboolean layout_mode; HildonHomeAppletResizeType resize_type; HomeAppletHandler *handler; @@ -120,9 +119,6 @@ static void hildon_home_applet_layout_mode_end (HildonHomeApplet *applet); -static void -hildon_home_applet_desktop_file_changed (HildonHomeApplet *applet); - static gboolean hildon_home_applet_button_press_event (GtkWidget *applet, GdkEventButton *event); @@ -262,7 +258,6 @@ applet_class->layout_mode_start = hildon_home_applet_layout_mode_start; applet_class->layout_mode_end = hildon_home_applet_layout_mode_end; - applet_class->desktop_file_changed = hildon_home_applet_desktop_file_changed; parent_class = g_type_class_peek_parent (applet_class); @@ -286,16 +281,6 @@ G_TYPE_NONE, 0); - g_signal_new ("desktop-file-changed", - G_OBJECT_CLASS_TYPE (object_class), - G_SIGNAL_RUN_FIRST, - G_STRUCT_OFFSET (HildonHomeAppletClass, desktop_file_changed), - NULL, - NULL, - g_cclosure_marshal_VOID__VOID, - G_TYPE_NONE, - 0); - g_signal_new ("background", G_OBJECT_CLASS_TYPE (object_class), G_SIGNAL_RUN_FIRST, @@ -350,12 +335,6 @@ HILDON_HOME_APPLET_PROPERTY_LAYOUT_MODE, pspec); - pspec = g_param_spec_string ("desktop-file", - "Desktop file name", - "Path the applet's desktop file", - "", - G_PARAM_READWRITE | G_PARAM_CONSTRUCT); - g_object_class_install_property (object_class, HILDON_HOME_APPLET_PROPERTY_DESKTOP_FILE, pspec); @@ -473,9 +452,6 @@ priv->event_window = NULL; } - g_free (priv->desktop_file); - priv->desktop_file = NULL; - if (priv->close_button) g_object_unref (priv->close_button); priv->close_button = NULL; @@ -515,10 +491,6 @@ hildon_home_applet_set_layout_mode (HILDON_HOME_APPLET (object), g_value_get_boolean (value)); break; - case HILDON_HOME_APPLET_PROPERTY_DESKTOP_FILE: - hildon_home_applet_set_desktop_file (HILDON_HOME_APPLET (object), - g_value_get_string (value)); - break; case HILDON_HOME_APPLET_PROPERTY_MINIMUM_WIDTH: g_object_notify (object, "minimum-width"); priv->minimum_width = g_value_get_int (value); @@ -551,9 +523,6 @@ case HILDON_HOME_APPLET_PROPERTY_LAYOUT_MODE: g_value_set_boolean (value, priv->layout_mode); break; - case HILDON_HOME_APPLET_PROPERTY_DESKTOP_FILE: - g_value_set_string (value, priv->desktop_file); - break; case HILDON_HOME_APPLET_PROPERTY_MINIMUM_WIDTH: g_value_set_int (value, priv->minimum_width); break; @@ -1012,76 +981,6 @@ } -static void -hildon_home_applet_desktop_file_changed (HildonHomeApplet *applet) -{ - HildonHomeAppletPriv *priv; - GtkWidget *applet_widget; - gboolean horizontal, vertical; - gint width, height; - gint state_size = 0; - void *state_data = NULL; - - priv = HILDON_HOME_APPLET_GET_PRIVATE (applet); - - if (!priv->desktop_file) - return; - - /* Replace with Desktop Plugin Manager */ - - priv->handler = home_applet_handler_new (priv->desktop_file, - state_data, - &state_size); - - if (!priv->handler) - return; - - applet_widget = home_applet_handler_get_widget (priv->handler); - - if (!applet_widget) - return; - - if (GTK_IS_WIDGET (applet_widget)) - gtk_container_add (GTK_CONTAINER (applet), applet_widget); - - home_applet_handler_get_resizable (priv->handler, &horizontal, &vertical); - - if (horizontal && vertical) - hildon_home_applet_set_resize_type (applet, HILDON_HOME_APPLET_RESIZE_BOTH); - else if (horizontal) - hildon_home_applet_set_resize_type (applet, - HILDON_HOME_APPLET_RESIZE_HORIZONTAL); - else if (vertical) - hildon_home_applet_set_resize_type (applet, - HILDON_HOME_APPLET_RESIZE_VERTICAL); - else - hildon_home_applet_set_resize_type (applet, HILDON_HOME_APPLET_RESIZE_NONE); - -#if 0 - home_applet_handler_get_size (priv->handler, &width, &height); - gtk_widget_set_size_request (GTK_WIDGET (applet), width, height); -#endif - - home_applet_handler_get_minimum_size (priv->handler, &width, &height); - - if (width > 0) - { - g_object_notify (G_OBJECT (applet), "minimum-width"); - priv->minimum_width = width; - } - - if (height > 0) - { - g_object_notify (G_OBJECT (applet), "minimum-height"); - priv->minimum_height = height; - } - - /* FIXME: This should not be called, but some applets (clock) - * currently require this */ - gtk_widget_show_all (applet_widget); - -} - static gboolean hildon_home_applet_visibility_notify_event (GtkWidget *applet, GdkEventVisibility *event) @@ -1390,22 +1289,6 @@ return GTK_WIDGET(newapplet); } -GtkWidget * -hildon_home_applet_new_with_plugin (const gchar *desktop_file) -{ - HildonHomeAppletPriv *priv; - HildonHomeApplet *newapplet = g_object_new (HILDON_TYPE_HOME_APPLET, - "desktop-file", - desktop_file, - NULL); - /* FIXME */ - priv = HILDON_HOME_APPLET_GET_PRIVATE (newapplet); - if (!priv->handler) - return NULL; - - return GTK_WIDGET (newapplet); -} - gboolean hildon_home_applet_get_layout_mode (HildonHomeApplet *applet) { @@ -1467,38 +1350,6 @@ } } -void -hildon_home_applet_set_desktop_file (HildonHomeApplet *applet, - const gchar *desktop_file) -{ - HildonHomeAppletPriv *priv; - g_return_if_fail (applet); - - priv = HILDON_HOME_APPLET_GET_PRIVATE (applet); - - if ((desktop_file && !priv->desktop_file) || - (!desktop_file && priv->desktop_file) || - strcmp (desktop_file, priv->desktop_file)) - { - g_object_notify (G_OBJECT (applet), "desktop-file"); - g_free (priv->desktop_file); - priv->desktop_file = g_strdup (desktop_file); - - g_signal_emit_by_name (G_OBJECT (applet), "desktop-file-changed"); - } -} - -const gchar * -hildon_home_applet_get_desktop_file (HildonHomeApplet *applet) -{ - HildonHomeAppletPriv *priv; - g_return_val_if_fail (applet, FALSE); - - priv = HILDON_HOME_APPLET_GET_PRIVATE (applet); - - return priv->desktop_file; -} - GtkWidget * hildon_home_applet_get_settings_menu_item (HildonHomeApplet *applet) { @@ -1554,21 +1405,6 @@ } -gint -hildon_home_applet_find_by_name (HildonHomeApplet *applet, const gchar *name) -{ - HildonHomeAppletPriv *priv; - g_return_val_if_fail (applet && name, -2); - - priv = HILDON_HOME_APPLET_GET_PRIVATE (applet); - - if (!priv->desktop_file) - return -1; - - return strcmp (priv->desktop_file, name); - -} - gboolean hildon_home_applet_get_overlaps (HildonHomeApplet *applet) { Modified: projects/haf/branches/maemo-af-desktop/hildon-desktop/libhildondesktop/hildon-home-applet.h =================================================================== --- projects/haf/branches/maemo-af-desktop/hildon-desktop/libhildondesktop/hildon-home-applet.h 2006-12-15 14:53:16 UTC (rev 8783) +++ projects/haf/branches/maemo-af-desktop/hildon-desktop/libhildondesktop/hildon-home-applet.h 2006-12-15 15:03:08 UTC (rev 8784) @@ -124,12 +124,6 @@ HildonHomeAppletResizeType hildon_home_applet_get_resize_type (HildonHomeApplet *applet); -void hildon_home_applet_set_desktop_file (HildonHomeApplet *applet, - const gchar *desktop_file); - -const gchar * -hildon_home_applet_get_desktop_file (HildonHomeApplet *applet); - GtkWidget * hildon_home_applet_get_settings_menu_item (HildonHomeApplet *applet);
- Previous message: [maemo-commits] r8783 - in projects/haf/branches/maemo-af-desktop/hildon-desktop: . libhildondesktop libhildonwm
- Next message: [maemo-commits] r8785 - in projects/haf/branches/maemo-af-desktop/hildon-desktop: . libhildondesktop
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]