[maemo-commits] [maemo-commits] r9832 - in projects/haf/branches/maemo-af-desktop/hildon-desktop: libhildondesktop src
From: subversion at stage.maemo.org subversion at stage.maemo.orgDate: Tue Feb 13 22:47:58 EET 2007
- Previous message: [maemo-commits] r9831 - in projects/haf/branches/maemo-af-desktop/hildon-desktop: . libhildondesktop src
- Next message: [maemo-commits] r9833 - projects/haf/branches/dbus/0.x/trunk/debian
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
Author: jobi
Date: 2007-02-13 22:47:57 +0200 (Tue, 13 Feb 2007)
New Revision: 9832
Modified:
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
Log:
Reverted accidental changes
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 20:45:06 UTC (rev 9831)
+++ projects/haf/branches/maemo-af-desktop/hildon-desktop/libhildondesktop/Makefile.am 2007-02-13 20:47:57 UTC (rev 9832)
@@ -95,12 +95,6 @@
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 20:45:06 UTC (rev 9831)
+++ projects/haf/branches/maemo-af-desktop/hildon-desktop/libhildondesktop/hildon-desktop-marshalers.list 2007-02-13 20:47:57 UTC (rev 9832)
@@ -1,2 +1 @@
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 20:45:06 UTC (rev 9831)
+++ projects/haf/branches/maemo-af-desktop/hildon-desktop/libhildondesktop/hildon-desktop-panel-window.c 2007-02-13 20:47:57 UTC (rev 9832)
@@ -897,11 +897,9 @@
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 20:45:06 UTC (rev 9831)
+++ projects/haf/branches/maemo-af-desktop/hildon-desktop/libhildondesktop/hildon-home-applet.c 2007-02-13 20:47:57 UTC (rev 9832)
@@ -561,11 +561,9 @@
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 20:45:06 UTC (rev 9831)
+++ projects/haf/branches/maemo-af-desktop/hildon-desktop/src/hd-config.h 2007-02-13 20:47:57 UTC (rev 9832)
@@ -38,7 +38,6 @@
#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 20:45:06 UTC (rev 9831)
+++ projects/haf/branches/maemo-af-desktop/hildon-desktop/src/hd-desktop.c 2007-02-13 20:47:57 UTC (rev 9832)
@@ -38,8 +38,6 @@
#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"
@@ -592,9 +590,8 @@
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_SLIDER))
- ||(!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_EXPANDABLE))
{
HildonDesktopPanelWindowOrientation orientation;
gchar *orientation_str;
@@ -738,17 +735,6 @@
"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);
}
- Previous message: [maemo-commits] r9831 - in projects/haf/branches/maemo-af-desktop/hildon-desktop: . libhildondesktop src
- Next message: [maemo-commits] r9833 - projects/haf/branches/dbus/0.x/trunk/debian
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]