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

From: subversion at stage.maemo.org subversion at stage.maemo.org
Date: Fri Jan 26 16:06:06 EET 2007 
Author: lucasr
Date: 2007-01-26 16:06:05 +0200 (Fri, 26 Jan 2007)
New Revision: 9366

Modified:
   projects/haf/branches/maemo-af-desktop/hildon-desktop/libhildondesktop/Makefile.am
   projects/haf/branches/maemo-af-desktop/hildon-desktop/src/hd-desktop.c
Log:
Fix some experimental code and organize the Makefiles.


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-26 13:56:55 UTC (rev 9365)
+++ projects/haf/branches/maemo-af-desktop/hildon-desktop/libhildondesktop/Makefile.am	2007-01-26 14:06:05 UTC (rev 9366)
@@ -62,45 +62,43 @@
 	hildon-desktop-marshalers.h
 
 libhildondesktop_la_SOURCES = \
-	$(HILDON_HOME_SOURCES)         \
-	$(BUILT_SOURCES)               \
-	hildon-desktop-item.h          \
-	hildon-desktop-item.c          \
-	hildon-desktop-panel-item.h    \
-	hildon-desktop-panel-item.c    \
-	hildon-desktop-item-socket.h   \
-	hildon-desktop-item-socket.c   \
-	hildon-desktop-item-plug.h     \
-	hildon-desktop-item-plug.c     \
-	hildon-desktop-plugin.h        \
-	hildon-desktop-plugin.c        \
-	hildon-desktop-window.h        \
-	hildon-desktop-window.c        \
-	hildon-desktop-panel.h         \
-	hildon-desktop-panel.c         \
-	hildon-desktop-panel-window.h  \
-	hildon-desktop-panel-window.c  \
-	panel-window-slider.c          \
-	panel-window-slider.h          \
+	$(HILDON_HOME_SOURCES)               \
+	$(BUILT_SOURCES)                     \
+	hildon-desktop-item.h                \
+	hildon-desktop-item.c                \
+	hildon-desktop-panel-item.h          \
+	hildon-desktop-panel-item.c          \
+	hildon-desktop-item-socket.h         \
+	hildon-desktop-item-socket.c         \
+	hildon-desktop-item-plug.h           \
+	hildon-desktop-item-plug.c           \
+	hildon-desktop-plugin.h              \
+	hildon-desktop-plugin.c              \
+	hildon-desktop-window.h              \
+	hildon-desktop-window.c              \
+	hildon-desktop-panel.h               \
+	hildon-desktop-panel.c               \
+	hildon-desktop-panel-window.h        \
+	hildon-desktop-panel-window.c        \
 	hildon-desktop-panel-window-dialog.h \
-    hildon-desktop-panel-window-dialog.c \	
-	hildon-desktop-panel-expandable.h \
-	hildon-desktop-panel-expandable.c \
-	hildon-desktop-multiscreen.h   \
-	hildon-desktop-multiscreen.c   \
-	statusbar-item.h               \
-	statusbar-item.c               \
-	statusbar-item-socket.h        \
-	statusbar-item-socket.c        \
-	tasknavigator-item.c           \
-	tasknavigator-item.h           \
-	tasknavigator-item-socket.c    \
-	tasknavigator-item-socket.h    \
-	hildon-log.h                   \
-	hildon-log.c                   \
-	libhildonmenu.h                \
-	libhildonmenu.c                \
-	hildon-thumb-menu-item.h       \
+        hildon-desktop-panel-window-dialog.c \
+	hildon-desktop-panel-expandable.h    \
+	hildon-desktop-panel-expandable.c    \
+	hildon-desktop-multiscreen.h         \
+	hildon-desktop-multiscreen.c         \
+	statusbar-item.h                     \
+	statusbar-item.c                     \
+	statusbar-item-socket.h              \
+	statusbar-item-socket.c              \
+	tasknavigator-item.c                 \
+	tasknavigator-item.h                 \
+	tasknavigator-item-socket.c          \
+	tasknavigator-item-socket.h          \
+	hildon-log.h                         \
+	hildon-log.c                         \
+	libhildonmenu.h                      \
+	libhildonmenu.c                      \
+	hildon-thumb-menu-item.h             \
 	hildon-thumb-menu-item.c
 
 libhildondesktop_la_LIBADD =                      \

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-26 13:56:55 UTC (rev 9365)
+++ projects/haf/branches/maemo-af-desktop/hildon-desktop/src/hd-desktop.c	2007-01-26 14:06:05 UTC (rev 9366)
@@ -38,7 +38,6 @@
 
 #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"
@@ -561,8 +560,7 @@
                                 NULL);
       hildon_home_window_applets_init (HILDON_HOME_WINDOW (container));
     }
-    else if (!g_ascii_strcasecmp (type, HD_CONTAINER_TYPE_PANEL_BOX)
-             || !g_ascii_strcasecmp (type, HD_CONTAINER_TYPE_PANEL_SLIDER))
+    else if (!g_ascii_strcasecmp (type, HD_CONTAINER_TYPE_PANEL_BOX))
     {
       HildonDesktopPanelWindowOrientation orientation;
       gchar *orientation_str;
@@ -654,7 +652,7 @@
       else 
         orientation = HILDON_DESKTOP_PANEL_WINDOW_ORIENTATION_LEFT; 
 
-      container = g_object_new (g_ascii_strcasecmp (type, HD_CONTAINER_TYPE_PANEL_SLIDER)?HD_TYPE_PANEL_WINDOW:TYPE_PANEL_WINDOW_SLIDER,
+      container = g_object_new (HD_TYPE_PANEL_WINDOW,
                                "x", x,
                                "y", y,
                                "width", width,
More information about the maemo-commits mailing list