[maemo-commits] [maemo-commits] r9358 - in projects/haf/branches/maemo-af-desktop/hildon-desktop: . libhildondesktop src

[From: subversion at stage.maemo.org]

Author: jobi
Date: 2007-01-26 10:06:32 +0200 (Fri, 26 Jan 2007)
New Revision: 9358

Modified:
   projects/haf/branches/maemo-af-desktop/hildon-desktop/ChangeLog
   projects/haf/branches/maemo-af-desktop/hildon-desktop/libhildondesktop/Makefile.am
   projects/haf/branches/maemo-af-desktop/hildon-desktop/src/hd-desktop.c
   projects/haf/branches/maemo-af-desktop/hildon-desktop/src/hn-others-button.c
Log:

2007-01-26  Johan Bilien  <johan.bilien at nokia.com>

	* src/hn-others-button.c: Forgot a break statement



Modified: projects/haf/branches/maemo-af-desktop/hildon-desktop/ChangeLog
===================================================================
--- projects/haf/branches/maemo-af-desktop/hildon-desktop/ChangeLog	2007-01-25 18:21:29 UTC (rev 9357)
+++ projects/haf/branches/maemo-af-desktop/hildon-desktop/ChangeLog	2007-01-26 08:06:32 UTC (rev 9358)
@@ -1,3 +1,7 @@
+2007-01-26  Johan Bilien  <johan.bilien at nokia.com>
+
+	* src/hn-others-button.c: Forgot a break statement
+
 2007-01-25  Johan Bilien  <johan.bilien at nokia.com>
 
 	* libhildondesktop/statusbar-item.c: Made non-abstract

Modified: projects/haf/branches/maemo-af-desktop/hildon-desktop/libhildondesktop/Makefile.am
===================================================================
--- projects/haf/branches/maemo-af-desktop/hildon-desktop/libhildondesktop/Makefile.am	2007-01-25 18:21:29 UTC (rev 9357)
+++ projects/haf/branches/maemo-af-desktop/hildon-desktop/libhildondesktop/Makefile.am	2007-01-26 08:06:32 UTC (rev 9358)
@@ -80,8 +80,10 @@
 	hildon-desktop-panel.c         \
 	hildon-desktop-panel-window.h  \
 	hildon-desktop-panel-window.c  \
+	panel-window-slider.c          \
+	panel-window-slider.h          \
 	hildon-desktop-panel-window-dialog.h \
-        hildon-desktop-panel-window-dialog.c \	
+    hildon-desktop-panel-window-dialog.c \	
 	hildon-desktop-panel-expandable.h \
 	hildon-desktop-panel-expandable.c \
 	hildon-desktop-multiscreen.h   \

Modified: projects/haf/branches/maemo-af-desktop/hildon-desktop/src/hd-desktop.c
===================================================================
--- projects/haf/branches/maemo-af-desktop/hildon-desktop/src/hd-desktop.c	2007-01-25 18:21:29 UTC (rev 9357)
+++ projects/haf/branches/maemo-af-desktop/hildon-desktop/src/hd-desktop.c	2007-01-26 08:06:32 UTC (rev 9358)
@@ -38,6 +38,7 @@
 
 #include <hildon-base-lib/hildon-base-dnotify.h>
 #include <libhildondesktop/hildon-desktop-window.h>
+#include <libhildondesktop/panel-window-slider.h>
 
 #include "hd-desktop.h"
 #include "hd-select-plugins-dialog.h"
@@ -337,6 +338,8 @@
   GError *error = NULL;
   GList *plugin_list = NULL, *remove_list, *iter;
 
+  g_debug ("D-notified");
+
   remove_list = gtk_container_get_children (window->container);
 
   dir = g_dir_open (plugin_dir, 0, &error);
@@ -358,6 +361,8 @@
     
     desktop_path = g_build_filename (plugin_dir, filename, NULL);
 
+/*    g_debug ("found plugin %s", desktop_path);*/
+
     found = g_list_find_custom (remove_list, 
                                 desktop_path,
                                 hd_desktop_find_by_id);
@@ -556,7 +561,8 @@
                                 NULL);
       hildon_home_window_applets_init (HILDON_HOME_WINDOW (container));
     }
-    else if (!g_ascii_strcasecmp (type, HD_CONTAINER_TYPE_PANEL_BOX))
+    else if (!g_ascii_strcasecmp (type, HD_CONTAINER_TYPE_PANEL_BOX)
+             || !g_ascii_strcasecmp (type, HD_CONTAINER_TYPE_PANEL_SLIDER))
     {
       HildonDesktopPanelWindowOrientation orientation;
       gchar *orientation_str;
@@ -648,7 +654,7 @@
       else 
         orientation = HILDON_DESKTOP_PANEL_WINDOW_ORIENTATION_LEFT; 
 
-      container = g_object_new (HD_TYPE_PANEL_WINDOW,
+      container = g_object_new (g_ascii_strcasecmp (type, HD_CONTAINER_TYPE_PANEL_SLIDER)?HD_TYPE_PANEL_WINDOW:TYPE_PANEL_WINDOW_SLIDER,
                                "x", x,
                                "y", y,
                                "width", width,

Modified: projects/haf/branches/maemo-af-desktop/hildon-desktop/src/hn-others-button.c
===================================================================
--- projects/haf/branches/maemo-af-desktop/hildon-desktop/src/hn-others-button.c	2007-01-25 18:21:29 UTC (rev 9357)
+++ projects/haf/branches/maemo-af-desktop/hildon-desktop/src/hn-others-button.c	2007-01-26 08:06:32 UTC (rev 9358)
@@ -792,6 +792,7 @@
     case HILDON_DESKTOP_PANEL_WINDOW_ORIENTATION_BOTTOM:
         *x = button->allocation.x;
         *y = workarea.y + workarea.width - req.height;
+        break;
     default:
         g_assert_not_reached ();
   }