[maemo-commits] [maemo-commits] r12841 - in projects/haf/trunk/hildon-desktop: . background-manager libhildondesktop src
From: subversion at stage.maemo.org subversion at stage.maemo.orgDate: Wed Jul 25 16:05:38 EEST 2007
- Previous message: [maemo-commits] r12840 - in projects/haf/trunk/hildon-desktop: . background-manager
- Next message: [maemo-commits] r12842 - in projects/haf/trunk/hildon-plugins-settings: . src
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
Author: jobi Date: 2007-07-25 16:05:35 +0300 (Wed, 25 Jul 2007) New Revision: 12841 Modified: projects/haf/trunk/hildon-desktop/ChangeLog projects/haf/trunk/hildon-desktop/background-manager/background-manager.c projects/haf/trunk/hildon-desktop/background-manager/background-manager.h projects/haf/trunk/hildon-desktop/background-manager/background-manager.xml.in projects/haf/trunk/hildon-desktop/libhildondesktop/hildon-desktop-background.c projects/haf/trunk/hildon-desktop/libhildondesktop/hildon-desktop-background.h projects/haf/trunk/hildon-desktop/libhildondesktop/hildon-desktop-marshalers.list projects/haf/trunk/hildon-desktop/src/hd-home-background.c projects/haf/trunk/hildon-desktop/src/hd-home-window.c Log: 2007-07-25 Johan Bilien <johan.bilien at nokia.com> * src/hd-home-background.[ch], libhildondesktop/hildon-desktop-background.[ch]: - removed unused area argument * background-manager/background-manager.{c,h,xml.in}: - removed corresponding _offset arguments Modified: projects/haf/trunk/hildon-desktop/ChangeLog =================================================================== --- projects/haf/trunk/hildon-desktop/ChangeLog 2007-07-25 12:52:28 UTC (rev 12840) +++ projects/haf/trunk/hildon-desktop/ChangeLog 2007-07-25 13:05:35 UTC (rev 12841) @@ -1,5 +1,13 @@ 2007-07-25 Johan Bilien <johan.bilien at nokia.com> + * src/hd-home-background.[ch], + libhildondesktop/hildon-desktop-background.[ch]: + - removed unused area argument + * background-manager/background-manager.{c,h,xml.in}: + - removed corresponding _offset arguments + +2007-07-25 Johan Bilien <johan.bilien at nokia.com> + * background-manager/hbm-background.c: - added cropping before uploading to X Modified: projects/haf/trunk/hildon-desktop/background-manager/background-manager.c =================================================================== --- projects/haf/trunk/hildon-desktop/background-manager/background-manager.c 2007-07-25 12:52:28 UTC (rev 12840) +++ projects/haf/trunk/hildon-desktop/background-manager/background-manager.c 2007-07-25 13:05:35 UTC (rev 12841) @@ -99,10 +99,6 @@ guint16 green, guint16 blue, BackgroundMode mode, - gint32 top_offset, - gint32 bottom_offset, - gint32 left_offset, - gint32 right_offset, gint *picture_xid, GError **error) { Modified: projects/haf/trunk/hildon-desktop/background-manager/background-manager.h =================================================================== --- projects/haf/trunk/hildon-desktop/background-manager/background-manager.h 2007-07-25 12:52:28 UTC (rev 12840) +++ projects/haf/trunk/hildon-desktop/background-manager/background-manager.h 2007-07-25 13:05:35 UTC (rev 12841) @@ -101,10 +101,6 @@ guint16 green, guint16 blue, BackgroundMode mode, - gint32 top_offset, - gint32 bottom_offset, - gint32 left_offset, - gint32 right_offset, gint *pixmap_xid, GError **error); Modified: projects/haf/trunk/hildon-desktop/background-manager/background-manager.xml.in =================================================================== --- projects/haf/trunk/hildon-desktop/background-manager/background-manager.xml.in 2007-07-25 12:52:28 UTC (rev 12840) +++ projects/haf/trunk/hildon-desktop/background-manager/background-manager.xml.in 2007-07-25 13:05:35 UTC (rev 12841) @@ -8,10 +8,6 @@ <arg type="i" name="red"/> <arg type="i" name="green"/> <arg type="i" name="blue"/> - <arg type="i" name="top_offset"/> - <arg type="i" name="bottom_offset"/> - <arg type="i" name="left_offset"/> - <arg type="i" name="right_offset"/> <arg type="i" name="mode"/> <arg type="i" direction="out" name="pixmap_id"/> </method> Modified: projects/haf/trunk/hildon-desktop/libhildondesktop/hildon-desktop-background.c =================================================================== --- projects/haf/trunk/hildon-desktop/libhildondesktop/hildon-desktop-background.c 2007-07-25 12:52:28 UTC (rev 12840) +++ projects/haf/trunk/hildon-desktop/libhildondesktop/hildon-desktop-background.c 2007-07-25 13:05:35 UTC (rev 12841) @@ -207,11 +207,10 @@ apply), NULL, NULL, - g_cclosure_user_marshal_VOID__POINTER_POINTER_POINTER, + g_cclosure_user_marshal_VOID__POINTER_POINTER, G_TYPE_NONE, - 3, + 2, GDK_TYPE_WINDOW, - GDK_TYPE_RECTANGLE, G_TYPE_POINTER); SIGNALS[APPLY_ASYNC] = @@ -222,11 +221,10 @@ apply_async), NULL, NULL, - g_cclosure_user_marshal_VOID__POINTER_POINTER_POINTER_POINTER, + g_cclosure_user_marshal_VOID__POINTER_POINTER_POINTER, G_TYPE_NONE, - 4, + 3, GDK_TYPE_WINDOW, - GDK_TYPE_RECTANGLE, G_TYPE_POINTER, G_TYPE_POINTER); @@ -369,9 +367,8 @@ void hildon_desktop_background_apply (HildonDesktopBackground *background, - GdkWindow *window, - GdkRectangle *area, - GError **error) + GdkWindow *window, + GError **error) { g_return_if_fail (HILDON_DESKTOP_IS_BACKGROUND (background)); @@ -379,14 +376,12 @@ SIGNALS[APPLY], 0, window, - area, error); } void hildon_desktop_background_apply_async (HildonDesktopBackground *background, GdkWindow *window, - GdkRectangle *area, HildonDesktopBackgroundApplyCallback cb, gpointer user_data) @@ -397,7 +392,6 @@ SIGNALS[APPLY_ASYNC], 0, window, - area, cb, user_data); } Modified: projects/haf/trunk/hildon-desktop/libhildondesktop/hildon-desktop-background.h =================================================================== --- projects/haf/trunk/hildon-desktop/libhildondesktop/hildon-desktop-background.h 2007-07-25 12:52:28 UTC (rev 12840) +++ projects/haf/trunk/hildon-desktop/libhildondesktop/hildon-desktop-background.h 2007-07-25 13:05:35 UTC (rev 12841) @@ -84,12 +84,10 @@ void (*apply) (HildonDesktopBackground *bg, GdkWindow *window, - GdkRectangle *area, GError **error); void (*apply_async) (HildonDesktopBackground *bg, GdkWindow *window, - GdkRectangle *area, HildonDesktopBackgroundApplyCallback cb, gpointer user_data); HildonDesktopBackground * @@ -107,12 +105,10 @@ GError **error); void hildon_desktop_background_apply (HildonDesktopBackground *bg, GdkWindow *window, - GdkRectangle *region, GError **error); void hildon_desktop_background_apply_async (HildonDesktopBackground *bg, GdkWindow *window, - GdkRectangle *region, HildonDesktopBackgroundApplyCallback cb, gpointer user_data); Modified: projects/haf/trunk/hildon-desktop/libhildondesktop/hildon-desktop-marshalers.list =================================================================== --- projects/haf/trunk/hildon-desktop/libhildondesktop/hildon-desktop-marshalers.list 2007-07-25 12:52:28 UTC (rev 12840) +++ projects/haf/trunk/hildon-desktop/libhildondesktop/hildon-desktop-marshalers.list 2007-07-25 13:05:35 UTC (rev 12841) @@ -1,5 +1,5 @@ POINTER:POINTER VOID:STRING,POINTER +VOID:POINTER,POINTER VOID:POINTER,POINTER,POINTER -VOID:POINTER,POINTER,POINTER,POINTER OBJECT:VOID Modified: projects/haf/trunk/hildon-desktop/src/hd-home-background.c =================================================================== --- projects/haf/trunk/hildon-desktop/src/hd-home-background.c 2007-07-25 12:52:28 UTC (rev 12840) +++ projects/haf/trunk/hildon-desktop/src/hd-home-background.c 2007-07-25 13:05:35 UTC (rev 12841) @@ -277,7 +277,6 @@ static void hd_home_background_apply (HildonDesktopBackground *background, GdkWindow *window, - GdkRectangle *area, GError **error) { DBusGProxy *background_manager_proxy; @@ -312,17 +311,6 @@ HILDON_BACKGROUND_MANAGER_INTERFACE); top_offset = bottom_offset = right_offset = left_offset = 0; - if (area) - { - gint width, height; - gdk_drawable_get_size (GDK_DRAWABLE (window), &width, &height); - - top_offset = area->y; - bottom_offset = MAX (0, height - area->height - area->y); - left_offset = area->x; - right_offset = MAX (0, width- area->width - area->x); - } - #define S(string) (string?string:"") org_maemo_hildon_background_manager_set_background (background_manager_proxy, GDK_WINDOW_XID (window), @@ -331,10 +319,6 @@ color->green, color->blue, mode, - top_offset, - bottom_offset, - left_offset, - right_offset, &pixmap_xid, error); #undef S @@ -400,7 +384,6 @@ static void hd_home_background_apply_async (HildonDesktopBackground *background, GdkWindow *window, - GdkRectangle *area, HildonDesktopBackgroundApplyCallback cb, gpointer user_data) { @@ -409,9 +392,8 @@ DBusGConnection *connection; GError *local_error = NULL; struct cb_data *data; - gint32 top_offset, bottom_offset, right_offset, left_offset; - gchar *filename; - GdkColor *color; + gchar *filename; + GdkColor *color; HildonDesktopBackgroundMode mode; g_return_if_fail (HD_IS_HOME_BACKGROUND (background) && window); @@ -445,18 +427,6 @@ data->user_data = user_data; data->window = window; - top_offset = bottom_offset = right_offset = left_offset = 0; - if (area) - { - gint width, height; - gdk_drawable_get_size (GDK_DRAWABLE (window), &width, &height); - - top_offset = area->y; - bottom_offset = MAX (0, height - area->height - area->y); - left_offset = area->x; - right_offset = MAX (0, width- area->width - area->x); - } - g_debug ("Applying background %s aynchronously", filename); @@ -472,10 +442,6 @@ color->green, color->blue, mode, - top_offset, - bottom_offset, - left_offset, - right_offset, (org_maemo_hildon_background_manager_set_background_reply) hd_home_background_apply_async_dbus_callback, data); #undef S Modified: projects/haf/trunk/hildon-desktop/src/hd-home-window.c =================================================================== --- projects/haf/trunk/hildon-desktop/src/hd-home-window.c 2007-07-25 12:52:28 UTC (rev 12840) +++ projects/haf/trunk/hildon-desktop/src/hd-home-window.c 2007-07-25 13:05:35 UTC (rev 12841) @@ -908,10 +908,8 @@ if (priv->background) { - g_debug ("About to apply %p", (gpointer)priv->background); hildon_desktop_background_apply_async (priv->background, widget->window, - NULL, (HildonDesktopBackgroundApplyCallback) background_apply_callback, widget); @@ -1751,7 +1749,6 @@ { hildon_desktop_background_apply_async (background, GTK_WIDGET (window)->window, - NULL, (HildonDesktopBackgroundApplyCallback) background_apply_callback, window); @@ -1843,7 +1840,6 @@ hildon_desktop_background_apply_async (background, GTK_WIDGET (window)->window, - NULL, (HildonDesktopBackgroundApplyCallback)background_apply_and_save_callback, window); } @@ -1863,7 +1859,6 @@ hildon_desktop_background_apply_async (background, GTK_WIDGET (window)->window, - NULL, (HildonDesktopBackgroundApplyCallback) background_apply_callback, window); @@ -1878,7 +1873,6 @@ hildon_desktop_background_apply_async (priv->previous_background, GTK_WIDGET (window)->window, - NULL, (HildonDesktopBackgroundApplyCallback) background_apply_callback, window);
- Previous message: [maemo-commits] r12840 - in projects/haf/trunk/hildon-desktop: . background-manager
- Next message: [maemo-commits] r12842 - in projects/haf/trunk/hildon-plugins-settings: . src
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]