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

From: subversion at stage.maemo.org subversion at stage.maemo.org
Date: Tue Feb 13 22:45:08 EET 2007
Author: jobi
Date: 2007-02-13 22:45:06 +0200 (Tue, 13 Feb 2007)
New Revision: 9831

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/libhildondesktop/hildon-desktop-marshalers.list
   projects/haf/branches/maemo-af-desktop/hildon-desktop/libhildondesktop/hildon-desktop-panel-window.c
   projects/haf/branches/maemo-af-desktop/hildon-desktop/libhildondesktop/hildon-home-applet.c
   projects/haf/branches/maemo-af-desktop/hildon-desktop/src/hd-config.h
   projects/haf/branches/maemo-af-desktop/hildon-desktop/src/hd-desktop.c
   projects/haf/branches/maemo-af-desktop/hildon-desktop/src/hd-notification-manager.c
Log:

2007-02-13  Johan Bilien  <johan.bilien at nokia.com>

	* src/hd-notification-manager.c: Fix the build against libhildon1



Modified: projects/haf/branches/maemo-af-desktop/hildon-desktop/ChangeLog
===================================================================
--- projects/haf/branches/maemo-af-desktop/hildon-desktop/ChangeLog	2007-02-13 16:10:00 UTC (rev 9830)
+++ projects/haf/branches/maemo-af-desktop/hildon-desktop/ChangeLog	2007-02-13 20:45:06 UTC (rev 9831)
@@ -1,3 +1,7 @@
+2007-02-13  Johan Bilien  <johan.bilien at nokia.com>
+
+	* src/hd-notification-manager.c: Fix the build against libhildon1
+
 2007-02-13  Moises Martinez  <moises.martinez at nokia.com>
 
 	* libhildonwm/hd-wm.c:

Modified: projects/haf/branches/maemo-af-desktop/hildon-desktop/libhildondesktop/Makefile.am
===================================================================
--- projects/haf/branches/maemo-af-desktop/hildon-desktop/libhildondesktop/Makefile.am	2007-02-13 16:10:00 UTC (rev 9830)
+++ projects/haf/branches/maemo-af-desktop/hildon-desktop/libhildondesktop/Makefile.am	2007-02-13 20:45:06 UTC (rev 9831)
@@ -95,6 +95,12 @@
 	tasknavigator-item.h                 \
 	tasknavigator-item-socket.c          \
 	tasknavigator-item-socket.h          \
+	panel-window-slider.c                \
+	panel-window-slider.h                \
+	icon-window.c                        \
+	icon-window.h                        \
+	hd-wm-list.c                         \
+	hd-wm-list.h                         \
 	hildon-log.h                         \
 	hildon-log.c                         \
 	libhildonmenu.h                      \

Modified: projects/haf/branches/maemo-af-desktop/hildon-desktop/libhildondesktop/hildon-desktop-marshalers.list
===================================================================
--- projects/haf/branches/maemo-af-desktop/hildon-desktop/libhildondesktop/hildon-desktop-marshalers.list	2007-02-13 16:10:00 UTC (rev 9830)
+++ projects/haf/branches/maemo-af-desktop/hildon-desktop/libhildondesktop/hildon-desktop-marshalers.list	2007-02-13 20:45:06 UTC (rev 9831)
@@ -1 +1,2 @@
 POINTER:POINTER
+VOID:POINTER,POINTER

Modified: projects/haf/branches/maemo-af-desktop/hildon-desktop/libhildondesktop/hildon-desktop-panel-window.c
===================================================================
--- projects/haf/branches/maemo-af-desktop/hildon-desktop/libhildondesktop/hildon-desktop-panel-window.c	2007-02-13 16:10:00 UTC (rev 9830)
+++ projects/haf/branches/maemo-af-desktop/hildon-desktop/libhildondesktop/hildon-desktop-panel-window.c	2007-02-13 20:45:06 UTC (rev 9831)
@@ -897,9 +897,11 @@
 
   g_return_if_fail (GTK_WIDGET_REALIZED (widget));
 
+#if 0
   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/branches/maemo-af-desktop/hildon-desktop/libhildondesktop/hildon-home-applet.c
===================================================================
--- projects/haf/branches/maemo-af-desktop/hildon-desktop/libhildondesktop/hildon-home-applet.c	2007-02-13 16:10:00 UTC (rev 9830)
+++ projects/haf/branches/maemo-af-desktop/hildon-desktop/libhildondesktop/hildon-home-applet.c	2007-02-13 20:45:06 UTC (rev 9831)
@@ -561,9 +561,11 @@
       attributes_mask = GDK_WA_X | GDK_WA_Y | GDK_WA_VISUAL | GDK_WA_COLORMAP;
 
       parent_window = gtk_widget_get_parent_window (widget);
+      g_debug ("GOT PARENT WINDOW: %p", parent_window);
       widget->window = gdk_window_new (parent_window,
                                        &attributes,
                                        attributes_mask);
+      g_debug ("GOT NEW WINDOW: %p", widget->window);
       
       widget->style = gtk_style_attach (widget->style, widget->window);
       

Modified: projects/haf/branches/maemo-af-desktop/hildon-desktop/src/hd-config.h
===================================================================
--- projects/haf/branches/maemo-af-desktop/hildon-desktop/src/hd-config.h	2007-02-13 16:10:00 UTC (rev 9830)
+++ projects/haf/branches/maemo-af-desktop/hildon-desktop/src/hd-config.h	2007-02-13 20:45:06 UTC (rev 9831)
@@ -38,6 +38,7 @@
 #define HD_CONTAINER_TYPE_PANEL_FIXED       "panel_fixed"
 #define HD_CONTAINER_TYPE_PANEL_BOX         "panel_box"
 #define HD_CONTAINER_TYPE_PANEL_EXPANDABLE  "panel_expandable"
+#define HD_CONTAINER_TYPE_PANEL_SLIDER      "panel_slider"
 
 #define HD_WINDOW_ORIENTATION_TOP           "top"
 #define HD_WINDOW_ORIENTATION_BOTTOM        "bottom"

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-02-13 16:10:00 UTC (rev 9830)
+++ projects/haf/branches/maemo-af-desktop/hildon-desktop/src/hd-desktop.c	2007-02-13 20:45:06 UTC (rev 9831)
@@ -38,6 +38,8 @@
 
 #include <hildon-base-lib/hildon-base-dnotify.h>
 #include <libhildondesktop/hildon-desktop-window.h>
+#include <libhildondesktop/panel-window-slider.h>
+#include <libhildondesktop/hildon-desktop-panel-window-dialog.h>
 
 #include "hd-desktop.h"
 #include "hd-select-plugins-dialog.h"
@@ -590,8 +592,9 @@
 
       hildon_home_window_applets_init (HILDON_HOME_WINDOW (info->container));
     }
-    else if (!g_ascii_strcasecmp (type, HD_CONTAINER_TYPE_PANEL_BOX) ||
- 	     !g_ascii_strcasecmp (type, HD_CONTAINER_TYPE_PANEL_EXPANDABLE))
+    else if ((!g_ascii_strcasecmp (type, HD_CONTAINER_TYPE_PANEL_BOX))
+           ||(!g_ascii_strcasecmp (type, HD_CONTAINER_TYPE_PANEL_SLIDER))
+ 	       ||(!g_ascii_strcasecmp (type, HD_CONTAINER_TYPE_PANEL_EXPANDABLE)))
     {
       HildonDesktopPanelWindowOrientation orientation;
       gchar *orientation_str;
@@ -735,6 +738,17 @@
                                         "padding-bottom", 0,
                                          NULL);
       }
+      else
+      if (!g_ascii_strcasecmp (type, HD_CONTAINER_TYPE_PANEL_SLIDER))
+        {
+          info->container = g_object_new (TYPE_PANEL_WINDOW_SLIDER,
+                                          "x", x,
+                                          "y", y,
+                                          "width", width,
+                                          "height", height,
+                                          "orientation", orientation,
+                                          NULL);
+        }
 
       g_free (orientation_str);
     }

Modified: projects/haf/branches/maemo-af-desktop/hildon-desktop/src/hd-notification-manager.c
===================================================================
--- projects/haf/branches/maemo-af-desktop/hildon-desktop/src/hd-notification-manager.c	2007-02-13 16:10:00 UTC (rev 9830)
+++ projects/haf/branches/maemo-af-desktop/hildon-desktop/src/hd-notification-manager.c	2007-02-13 20:45:06 UTC (rev 9831)
@@ -31,7 +31,11 @@
 #include <glib-object.h>
 #include <dbus/dbus-glib-bindings.h>
 
+#ifdef HAVE_LIBHILDON
+#include <hildon/hildon-banner.h>
+#else
 #include <hildon-widgets/hildon-banner.h>
+#endif
 
 #include "hd-notification-manager.h"
 #include "hd-notification-service.h"


More information about the maemo-commits mailing list