[maemo-commits] [maemo-commits] r13359 - in projects/haf/trunk/hildon-desktop: . libhildondesktop src
From: subversion at stage.maemo.org subversion at stage.maemo.orgDate: Wed Aug 22 18:09:38 EEST 2007
- Previous message: [maemo-commits] r13358 - projects/haf/tags/sapwood
- Next message: [maemo-commits] r13360 - projects/haf/hafbuildbot
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
Author: lucasr Date: 2007-08-22 18:09:35 +0300 (Wed, 22 Aug 2007) New Revision: 13359 Modified: projects/haf/trunk/hildon-desktop/ChangeLog projects/haf/trunk/hildon-desktop/libhildondesktop/hildon-desktop-panel-expandable.c projects/haf/trunk/hildon-desktop/libhildondesktop/hildon-desktop-panel-window-dialog.c projects/haf/trunk/hildon-desktop/libhildondesktop/hildon-desktop-panel-window.c projects/haf/trunk/hildon-desktop/libhildondesktop/libhildonmenu.c projects/haf/trunk/hildon-desktop/src/hd-home-background.c projects/haf/trunk/hildon-desktop/src/hd-home-window.c projects/haf/trunk/hildon-desktop/src/hn-app-button.c Log: 2007-08-22 Lucas Rocha <lucas.rocha at nokia.com> * src/hd-home-background.c, src/hd-home-window.c, src/hn-app-button.c, libhildondesktop/libhildonmenu.c, libhildondesktop/hildon-desktop-panel-expandable.c, libhildondesktop/hildon-desktop-panel-window-dialog.c, libhildondesktop/hildon-desktop-panel-window.c: disabled all debugging messages by default. Modified: projects/haf/trunk/hildon-desktop/ChangeLog =================================================================== --- projects/haf/trunk/hildon-desktop/ChangeLog 2007-08-22 15:09:07 UTC (rev 13358) +++ projects/haf/trunk/hildon-desktop/ChangeLog 2007-08-22 15:09:35 UTC (rev 13359) @@ -1,5 +1,14 @@ 2007-08-22 Lucas Rocha <lucas.rocha at nokia.com> + * src/hd-home-background.c, src/hd-home-window.c, src/hn-app-button.c, + libhildondesktop/libhildonmenu.c, + libhildondesktop/hildon-desktop-panel-expandable.c, + libhildondesktop/hildon-desktop-panel-window-dialog.c, + libhildondesktop/hildon-desktop-panel-window.c: disabled all debugging + messages by default. + +2007-08-22 Lucas Rocha <lucas.rocha at nokia.com> + * src/hd-switcher-menu.c (hd_switcher_menu_show_menu_cb): close all other temporary windows when opening switcher menu with Home key. Fixes NB#61425. Modified: projects/haf/trunk/hildon-desktop/libhildondesktop/hildon-desktop-panel-expandable.c =================================================================== --- projects/haf/trunk/hildon-desktop/libhildondesktop/hildon-desktop-panel-expandable.c 2007-08-22 15:09:07 UTC (rev 13358) +++ projects/haf/trunk/hildon-desktop/libhildondesktop/hildon-desktop-panel-expandable.c 2007-08-22 15:09:35 UTC (rev 13359) @@ -40,7 +40,7 @@ #define SYSTEM_TRAY_CANCEL_MESSAGE 2 #endif -#define STATUSBAR_DEBUG 1 +#define STATUSBAR_DEBUG 0 #if (STATUSBAR_DEBUG) #define sb_debug(o,a...) g_debug("sb: " o,##a) #else Modified: projects/haf/trunk/hildon-desktop/libhildondesktop/hildon-desktop-panel-window-dialog.c =================================================================== --- projects/haf/trunk/hildon-desktop/libhildondesktop/hildon-desktop-panel-window-dialog.c 2007-08-22 15:09:07 UTC (rev 13358) +++ projects/haf/trunk/hildon-desktop/libhildondesktop/hildon-desktop-panel-window-dialog.c 2007-08-22 15:09:35 UTC (rev 13359) @@ -258,8 +258,6 @@ { gint width, height; - g_debug ("Using DOCK_TITLEBAR SHOW_ON_DESKTOP"); - gtk_window_set_accept_focus (GTK_WINDOW (window), FALSE); gtk_container_set_border_width (GTK_CONTAINER (window), 0); @@ -277,11 +275,7 @@ "height", height, NULL); - g_debug ("WINDOW SIZE DOCK %d %d", width, height); gtk_widget_set_size_request (GTK_BIN (window)->child, width, height); - - g_debug ("heeeeeeey %d %d", GTK_WIDGET (window)->requisition.width, - GTK_WIDGET (window)->requisition.height); } else { Modified: projects/haf/trunk/hildon-desktop/libhildondesktop/hildon-desktop-panel-window.c =================================================================== --- projects/haf/trunk/hildon-desktop/libhildondesktop/hildon-desktop-panel-window.c 2007-08-22 15:09:07 UTC (rev 13358) +++ projects/haf/trunk/hildon-desktop/libhildondesktop/hildon-desktop-panel-window.c 2007-08-22 15:09:35 UTC (rev 13359) @@ -34,6 +34,8 @@ G_DEFINE_TYPE (HildonDesktopPanelWindow, hildon_desktop_panel_window, HILDON_DESKTOP_TYPE_WINDOW); +#undef DEBUG + enum { PROP_0, @@ -914,9 +916,11 @@ g_return_if_fail (GTK_WIDGET_REALIZED (widget)); +#ifdef DEBUG g_debug ("Move: %s to x:%d y:%d & Resize: %s", move ? "TRUE" : "FALSE", window->priv->geometry.x, window->priv->geometry.y, resize ? "TRUE" : "FALSE"); +#endif if (move && resize) gdk_window_move_resize (widget->window, Modified: projects/haf/trunk/hildon-desktop/libhildondesktop/libhildonmenu.c =================================================================== --- projects/haf/trunk/hildon-desktop/libhildondesktop/libhildonmenu.c 2007-08-22 15:09:07 UTC (rev 13358) +++ projects/haf/trunk/hildon-desktop/libhildondesktop/libhildonmenu.c 2007-08-22 15:09:35 UTC (rev 13359) @@ -53,6 +53,8 @@ #define DESKTOP_ENTRY_GROUP "Desktop Entry" #define SERVICE_PREFIX "com.nokia." +#undef DEBUG + typedef struct { gchar *name; gchar *comment; @@ -239,7 +241,9 @@ return NULL; } +#ifdef DEBUG g_debug( "get_desktop_files: reading dir '%s'", full_path ); +#endif gchar *current_path = NULL; @@ -264,9 +268,11 @@ } else if (S_ISDIR(buf.st_mode)) { /* Recurse */ +#ifdef DEBUG g_debug( "get_desktop_files: recursing into '%s'", current_path ); - +#endif + desktop_files = get_desktop_files(g_strdup(current_path), desktop_files); @@ -377,9 +383,10 @@ item->allocated = FALSE; - +#ifdef DEBUG g_debug( "get_desktop_files: appending .desktop = %s", dir_entry->d_name); +#endif desktop_files = g_list_append(desktop_files, item); @@ -595,7 +602,9 @@ root_element = xmlDocGetRootElement(doc); if (root_element == NULL) { +#ifdef DEBUG g_debug( "read_menu_conf: failed to get root element." ); +#endif xmlFreeDoc(doc); goto check_unallocated; } @@ -603,7 +612,9 @@ if (xmlStrcmp(root_element->name, (const xmlChar *) "Menu") != 0) { /* Not a menu */ +#ifdef DEBUG g_debug( "read_menu_conf: not a menu."); +#endif xmlFreeDoc(doc); goto check_unallocated; } @@ -892,9 +903,10 @@ /* If the user has her own menu file.. */ if ( g_file_test( user_menu_conf_file, G_FILE_TEST_EXISTS ) ) { +#ifdef DEBUG g_debug( "get_menu_contents: using user menu file = '%s'\n", user_menu_conf_file ); - +#endif /* .. read it */ read_menu_conf(user_menu_conf_file, contents, NULL, NULL, NULL, desktop_files); @@ -946,7 +958,9 @@ "failed to end Include element." ); goto cleanup_and_exit; } else { +#ifdef DEBUG g_debug( "write_menu_conf: </Include>" ); +#endif } include_open = FALSE; } @@ -958,7 +972,9 @@ "failed to start Menu element." ); goto cleanup_and_exit; } else { +#ifdef DEBUG g_debug( "write_menu_conf: <Menu>" ); +#endif } /* <Name> ... </Name> */ Modified: projects/haf/trunk/hildon-desktop/src/hd-home-background.c =================================================================== --- projects/haf/trunk/hildon-desktop/src/hd-home-background.c 2007-08-22 15:09:07 UTC (rev 13358) +++ projects/haf/trunk/hildon-desktop/src/hd-home-background.c 2007-08-22 15:09:35 UTC (rev 13359) @@ -41,6 +41,8 @@ #include <glib/gkeyfile.h> #include <glib/gstdio.h> +#undef DEBUG + /* Key used in the home-background.conf */ #define HD_HOME_BACKGROUND_KEY_GROUP "Hildon Home" #define HD_HOME_BACKGROUND_KEY_URI "BackgroundImage" @@ -380,10 +382,12 @@ on_external_fs = filename[0] != G_DIR_SEPARATOR && (!g_str_has_prefix (filename, "file://")); +#ifdef DEBUG g_debug ("filename %s requires caching: %i", filename, (on_internal_mmc || on_external_fs)); - +#endif + return (on_internal_mmc || on_external_fs); @@ -563,10 +567,11 @@ "mode", &mode, NULL); +#ifdef DEBUG g_debug ("Applying background %s aynchronously, cache: %s", filename, cache); +#endif - if (cache && *cache) { file_to_use = cache; Modified: projects/haf/trunk/hildon-desktop/src/hd-home-window.c =================================================================== --- projects/haf/trunk/hildon-desktop/src/hd-home-window.c 2007-08-22 15:09:07 UTC (rev 13358) +++ projects/haf/trunk/hildon-desktop/src/hd-home-window.c 2007-08-22 15:09:35 UTC (rev 13359) @@ -77,6 +77,8 @@ #define HD_HOME_BACKGROUND_DEFAULT HD_DESKTOP_BACKGROUNDS_PATH\ "/default.desktop" +#undef DEBUG + #define BG_DESKTOP_GROUP "Desktop Entry" #define BG_DESKTOP_IMAGE_FILENAME "File" @@ -419,9 +421,11 @@ g_clear_error (&error); +#ifdef DEBUG g_debug ("Got an error when loading background configuration, " "reverting to default background."); - +#endif + /* Revert to the default background file */ keyfile = g_key_file_new (); g_key_file_load_from_file (keyfile, @@ -561,8 +565,10 @@ HDHomeWindowPrivate *priv; guint greeting_pid; +#ifdef DEBUG g_debug ("Background applied!"); - +#endif + priv = HD_HOME_WINDOW_GET_PRIVATE (window); if (priv->background_loading_timeout > 0) @@ -618,8 +624,11 @@ XRenderFreePicture (GDK_DISPLAY (), priv->background_picture); priv->background_picture = picture; + +#ifdef DEBUG g_debug ("Received picture %i", (gint)priv->background_picture); - +#endif + if (GTK_WIDGET_VISIBLE (GTK_WIDGET (window))) gdk_window_invalidate_rect (GTK_WIDGET (window)->window, (GdkRectangle*)(>K_WIDGET (window)->allocation), @@ -1002,7 +1011,10 @@ if (!priv->osso_context) return; +#ifdef DEBUG g_debug ("Launching controlpanel applet %s", applet_path); +#endif + res = osso_cp_plugin_execute (priv->osso_context, applet_path, NULL, @@ -1111,8 +1123,10 @@ { GtkWidget *area = GTK_BIN (window)->child; +#ifdef DEBUG g_debug ("Saving area layout"); - +#endif + if (HILDON_IS_HOME_AREA (area)) { GError *error = NULL; @@ -1346,8 +1360,10 @@ area = GTK_BIN (window)->child; g_return_if_fail (HILDON_IS_HOME_AREA (area)); +#ifdef DEBUG g_debug ("Background state changed, is_background: %i", is_background); - +#endif + priv->is_background = is_background; if (!priv->screen_is_off) @@ -1373,8 +1389,10 @@ priv->screen_is_off = is_off; +#ifdef DEBUG g_debug ("Screen state changed, is_off: %i", is_off); - +#endif + if (!priv->is_background) { gtk_container_foreach (GTK_CONTAINER (area), Modified: projects/haf/trunk/hildon-desktop/src/hn-app-button.c =================================================================== --- projects/haf/trunk/hildon-desktop/src/hn-app-button.c 2007-08-22 15:09:07 UTC (rev 13358) +++ projects/haf/trunk/hildon-desktop/src/hn-app-button.c 2007-08-22 15:09:35 UTC (rev 13359) @@ -64,6 +64,7 @@ #include <X11/Xutil.h> #include <X11/Xatom.h> +#undef DEBUG /* Menu item strings */ #define AS_HOME_ITEM _("tana_fi_home") @@ -475,8 +476,10 @@ if (app_button->priv->prev_button && app_button->priv->prev_button != GTK_TOGGLE_BUTTON(app_button)) { +#ifdef DEBUG g_debug ("Retoggling previously toggled button"); - +#endif + /*gtk_toggle_button_set_active (app_button->priv->prev_button, TRUE);*/ gtk_toggle_button_toggled (app_button->priv->prev_button); } @@ -505,6 +508,7 @@ */ gtk_widget_get_pointer(widget, &x, &y); +#ifdef DEBUG g_debug ("pointer [%d,%d],\n" "allocation [%d, %d, %d, %d]", x, y, @@ -512,6 +516,7 @@ widget->allocation.y, widget->allocation.width, widget->allocation.height); +#endif if(x > widget->allocation.width || x < 0 || y > widget->allocation.height || y < 0) @@ -521,13 +526,15 @@ if (app_button->priv->prev_button) { +#ifdef DEBUG g_debug ("Retoggling previously toggled button"); - +#endif gtk_toggle_button_set_active (app_button->priv->prev_button, TRUE); gtk_toggle_button_toggled (app_button->priv->prev_button); } - +#ifdef DEBUG g_debug ("%s: %d, hd_wm_activate(HN_TN_ACTIVATE_LAST_APP_WINDOW);",__FILE__,__LINE__); +#endif return TRUE; } @@ -569,13 +576,15 @@ /* pointer outside the button, i.e., press canceled */ if (app_button->priv->prev_button) { +#ifdef DEBUG g_debug ("Retoggling previously toggled button"); - +#endif gtk_toggle_button_set_active (app_button->priv->prev_button, TRUE); gtk_toggle_button_toggled (app_button->priv->prev_button); } - +#ifdef DEBUG g_debug ("%s: %d, hd_wm_activate(HN_TN_ACTIVATE_KEY_FOCUS);",__FILE__,__LINE__); +#endif gtk_widget_grab_focus (GTK_WIDGET (app_button)); } @@ -688,7 +697,9 @@ if (!event) { +#ifdef DEBUG g_debug ("no event given !!!"); +#endif return FALSE; } @@ -743,13 +754,16 @@ HNAppButtonPrivate *priv = app_button->priv; gint x,y; gboolean untoggle = FALSE; - + +#ifdef DEBUG g_debug("Button released ..."); +#endif if (priv->tooltip) { +#ifdef DEBUG g_debug("removing tooltip timer"); - +#endif /* have to remove the show timer, so that if the tooltip is not * yet showing, it does not get displayed */ @@ -1413,9 +1427,11 @@ hn_app_button_set_is_blinking (HNAppButton *button, gboolean is_blinking) { +#ifdef DEBUG g_debug("Setting is_blinking %d -> %d", button->priv->is_blinking, is_blinking); +#endif g_return_if_fail (HN_IS_APP_BUTTON (button));
- Previous message: [maemo-commits] r13358 - projects/haf/tags/sapwood
- Next message: [maemo-commits] r13360 - projects/haf/hafbuildbot
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]