[maemo-commits] [maemo-commits] r10715 - in projects/haf/trunk/hildon-desktop: . libhildondesktop
From: subversion at stage.maemo.org subversion at stage.maemo.orgDate: Thu Mar 22 15:26:42 EET 2007
- Previous message: [maemo-commits] r10714 - projects/haf/hafbuildbot
- Next message: [maemo-commits] r10716 - in projects/haf/branches/maemo-af-desktop/python-hildondesktop: . libhildondesktop
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
Author: lucasr Date: 2007-03-22 15:26:29 +0200 (Thu, 22 Mar 2007) New Revision: 10715 Modified: projects/haf/trunk/hildon-desktop/ChangeLog projects/haf/trunk/hildon-desktop/libhildondesktop/hildon-home-titlebar.c projects/haf/trunk/hildon-desktop/libhildondesktop/hildon-home-titlebar.h projects/haf/trunk/hildon-desktop/libhildondesktop/hildon-home-window.c Log: 2007-03-22 Lucas Rocha <lucas.rocha at nokia.com> * libhildondesktop/hildon-home-titlebar.[ch], libhildondesktop/hildon-home-window.c: renamed HILDON_HOME_TITLEBAR_* to HILDON_DESKTOP_HOME_TITLEBAR_* for consistency. Modified: projects/haf/trunk/hildon-desktop/ChangeLog =================================================================== --- projects/haf/trunk/hildon-desktop/ChangeLog 2007-03-22 13:15:08 UTC (rev 10714) +++ projects/haf/trunk/hildon-desktop/ChangeLog 2007-03-22 13:26:29 UTC (rev 10715) @@ -1,3 +1,9 @@ +2007-03-22 Lucas Rocha <lucas.rocha at nokia.com> + + * libhildondesktop/hildon-home-titlebar.[ch], + libhildondesktop/hildon-home-window.c: renamed HILDON_HOME_TITLEBAR_* to + HILDON_DESKTOP_HOME_TITLEBAR_* for consistency. + 2007-03-21 Moises Martinez <moises.martinez at nokia.com> * libhildonwm/hd-wm.c: Modified: projects/haf/trunk/hildon-desktop/libhildondesktop/hildon-home-titlebar.c =================================================================== --- projects/haf/trunk/hildon-desktop/libhildondesktop/hildon-home-titlebar.c 2007-03-22 13:15:08 UTC (rev 10714) +++ projects/haf/trunk/hildon-desktop/libhildondesktop/hildon-home-titlebar.c 2007-03-22 13:26:29 UTC (rev 10715) @@ -77,8 +77,8 @@ { static const GEnumValue values[] = { - { HILDON_HOME_TITLEBAR_NORMAL, "HILDON_HOME_TITLEBAR_NORMAL", "normal" }, - { HILDON_HOME_TITLEBAR_LAYOUT, "HILDON_HOME_TITLEBAR_LAYOUT", "layout" }, + { HILDON_DESKTOP_HOME_TITLEBAR_NORMAL, "HILDON_DESKTOP_HOME_TITLEBAR_NORMAL", "normal" }, + { HILDON_DESKTOP_HOME_TITLEBAR_LAYOUT, "HILDON_DESKTOP_HOME_TITLEBAR_LAYOUT", "layout" }, { 0, NULL, NULL } }; @@ -339,7 +339,7 @@ "Mode", "Titlebar mode", HILDON_TYPE_HOME_TITLEBAR_MODE, - HILDON_HOME_TITLEBAR_NORMAL, + HILDON_DESKTOP_HOME_TITLEBAR_NORMAL, G_PARAM_READWRITE); g_object_class_install_property (gobject_class, @@ -415,7 +415,7 @@ titlebar->priv = priv = HILDON_HOME_TITLEBAR_GET_PRIVATE (titlebar); - priv->mode = HILDON_HOME_TITLEBAR_NORMAL; + priv->mode = HILDON_DESKTOP_HOME_TITLEBAR_NORMAL; priv->menu_key_pressed = FALSE; priv->menu_popup_status = FALSE; @@ -508,7 +508,7 @@ hildon_home_titlebar_new () { return g_object_new (HILDON_TYPE_HOME_TITLEBAR, - "mode", HILDON_HOME_TITLEBAR_NORMAL, + "mode", HILDON_DESKTOP_HOME_TITLEBAR_NORMAL, NULL); } @@ -531,14 +531,14 @@ switch (mode) { - case HILDON_HOME_TITLEBAR_NORMAL: + case HILDON_DESKTOP_HOME_TITLEBAR_NORMAL: gtk_label_set_text (GTK_LABEL (priv->label), priv->normal_text); gtk_widget_hide (priv->layout_accept); gtk_widget_hide (priv->layout_cancel); break; - case HILDON_HOME_TITLEBAR_LAYOUT: + case HILDON_DESKTOP_HOME_TITLEBAR_LAYOUT: gtk_label_set_text (GTK_LABEL (priv->label), priv->layout_text); @@ -564,10 +564,10 @@ switch (priv->mode) { - case HILDON_HOME_TITLEBAR_NORMAL: + case HILDON_DESKTOP_HOME_TITLEBAR_NORMAL: menu = GTK_MENU (priv->menu); break; - case HILDON_HOME_TITLEBAR_LAYOUT: + case HILDON_DESKTOP_HOME_TITLEBAR_LAYOUT: menu = GTK_MENU (priv->layout_menu); break; default: @@ -578,7 +578,7 @@ if (!menu) { g_warning ("Titlebar mode `%s', but no menu defined", - priv->mode == HILDON_HOME_TITLEBAR_NORMAL ? "normal" + priv->mode == HILDON_DESKTOP_HOME_TITLEBAR_NORMAL ? "normal" : "layout"); return; @@ -682,7 +682,7 @@ priv->normal_text = g_strdup (label); - if (priv->mode == HILDON_HOME_TITLEBAR_NORMAL) + if (priv->mode == HILDON_DESKTOP_HOME_TITLEBAR_NORMAL) gtk_label_set_text (GTK_LABEL (priv->label), priv->normal_text); g_object_notify (G_OBJECT (titlebar), "menu-title"); @@ -709,7 +709,7 @@ priv->layout_text = g_strdup (label); - if (priv->mode == HILDON_HOME_TITLEBAR_LAYOUT) + if (priv->mode == HILDON_DESKTOP_HOME_TITLEBAR_LAYOUT) gtk_label_set_text (GTK_LABEL (priv->label), priv->layout_text); g_object_notify (G_OBJECT (titlebar), "layout-menu-title"); Modified: projects/haf/trunk/hildon-desktop/libhildondesktop/hildon-home-titlebar.h =================================================================== --- projects/haf/trunk/hildon-desktop/libhildondesktop/hildon-home-titlebar.h 2007-03-22 13:15:08 UTC (rev 10714) +++ projects/haf/trunk/hildon-desktop/libhildondesktop/hildon-home-titlebar.h 2007-03-22 13:26:29 UTC (rev 10715) @@ -40,8 +40,8 @@ G_BEGIN_DECLS typedef enum { - HILDON_HOME_TITLEBAR_NORMAL, - HILDON_HOME_TITLEBAR_LAYOUT + HILDON_DESKTOP_HOME_TITLEBAR_NORMAL, + HILDON_DESKTOP_HOME_TITLEBAR_LAYOUT } HildonHomeTitlebarMode; GType hildon_home_titlebar_mode_get_type (void) G_GNUC_CONST; Modified: projects/haf/trunk/hildon-desktop/libhildondesktop/hildon-home-window.c =================================================================== --- projects/haf/trunk/hildon-desktop/libhildondesktop/hildon-home-window.c 2007-03-22 13:15:08 UTC (rev 10714) +++ projects/haf/trunk/hildon-desktop/libhildondesktop/hildon-home-window.c 2007-03-22 13:26:29 UTC (rev 10715) @@ -99,7 +99,7 @@ HildonHomeWindowPrivate *priv = window->priv; hildon_home_titlebar_set_mode (HILDON_HOME_TITLEBAR (priv->titlebar), - HILDON_HOME_TITLEBAR_LAYOUT); + HILDON_DESKTOP_HOME_TITLEBAR_LAYOUT); } @@ -110,7 +110,7 @@ HildonHomeWindowPrivate *priv = window->priv; hildon_home_titlebar_set_mode (HILDON_HOME_TITLEBAR (priv->titlebar), - HILDON_HOME_TITLEBAR_NORMAL); + HILDON_DESKTOP_HOME_TITLEBAR_NORMAL); hildon_home_window_set_desktop_dimmed (window, FALSE);
- Previous message: [maemo-commits] r10714 - projects/haf/hafbuildbot
- Next message: [maemo-commits] r10716 - in projects/haf/branches/maemo-af-desktop/python-hildondesktop: . libhildondesktop
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]