[maemo-commits] [maemo-commits] r12988 - in projects/haf/trunk/hildon-desktop: . background-manager src
From: subversion at stage.maemo.org subversion at stage.maemo.orgDate: Wed Aug 1 18:19:34 EEST 2007
- Previous message: [maemo-commits] r12987 - in projects/haf/trunk/hildon-desktop: . libhildondesktop src
- Next message: [maemo-commits] r12989 - in projects/haf/trunk/maemo-launcher: . debian launcher
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
Author: jobi Date: 2007-08-01 18:19:32 +0300 (Wed, 01 Aug 2007) New Revision: 12988 Modified: projects/haf/trunk/hildon-desktop/ChangeLog projects/haf/trunk/hildon-desktop/background-manager/Makefile.am projects/haf/trunk/hildon-desktop/background-manager/hbm-background.c projects/haf/trunk/hildon-desktop/src/hd-home-l10n.h projects/haf/trunk/hildon-desktop/src/hd-home-window.c Log: 2007-08-01 Johan Bilien <johan.bilien at nokia.com> * background-manager/hbm-background.c: - do not check if the MMC bay is opened anymore, the volume will not be unmounted if it is anyway * src/hd-home-window.c, src/hd-home-l10n.h: - remove handling of the "MMC cover open" error * background-manager/Makefile.am: - do not link against gconf anymore Fixes: NB#63137 Modified: projects/haf/trunk/hildon-desktop/ChangeLog =================================================================== --- projects/haf/trunk/hildon-desktop/ChangeLog 2007-08-01 15:02:24 UTC (rev 12987) +++ projects/haf/trunk/hildon-desktop/ChangeLog 2007-08-01 15:19:32 UTC (rev 12988) @@ -1,3 +1,14 @@ +2007-08-01 Johan Bilien <johan.bilien at nokia.com> + + * background-manager/hbm-background.c: + - do not check if the MMC bay is opened anymore, the + volume will not be unmounted if it is anyway + * src/hd-home-window.c, src/hd-home-l10n.h: + - remove handling of the "MMC cover open" error + * background-manager/Makefile.am: + - do not link against gconf anymore + Fixes: NB#63137 + 2007-08-01 Mohammad Anwari <mdamt at maemo.org> Right-to-left dance: Modified: projects/haf/trunk/hildon-desktop/background-manager/Makefile.am =================================================================== --- projects/haf/trunk/hildon-desktop/background-manager/Makefile.am 2007-08-01 15:02:24 UTC (rev 12987) +++ projects/haf/trunk/hildon-desktop/background-manager/Makefile.am 2007-08-01 15:19:32 UTC (rev 12988) @@ -29,14 +29,12 @@ pkginclude_HEADERS = hildon-background-manager.h hildon_background_manager_CPPFLAGS = @GNOME_VFS_CFLAGS@ \ - @GCONF_CFLAGS@ \ @DBUS_GLIB_CFLAGS@ \ @OSSO_CFLAGS@ \ @GTK_CFLAGS@ hildon_background_manager_LDFLAGS = @GNOME_VFS_LIBS@ \ - @GCONF_LIBS@ \ @DBUS_GLIB_LIBS@ \ @OSSO_LIBS@ \ @GTK_LIBS@ Modified: projects/haf/trunk/hildon-desktop/background-manager/hbm-background.c =================================================================== --- projects/haf/trunk/hildon-desktop/background-manager/hbm-background.c 2007-08-01 15:02:24 UTC (rev 12987) +++ projects/haf/trunk/hildon-desktop/background-manager/hbm-background.c 2007-08-01 15:19:32 UTC (rev 12988) @@ -33,8 +33,6 @@ #include <gdk-pixbuf/gdk-pixbuf.h> #include <gdk/gdkx.h> -#include <gconf/gconf-client.h> - #include <libgnomevfs/gnome-vfs.h> #include <X11/extensions/Xrender.h> @@ -48,8 +46,6 @@ #define MAXIMUM_WIDTH 1600 #define MAXIMUM_HEIGHT 960 #define BUFFER_SIZE 8192 -#define HBM_GCONF_MMC_COVER_OPEN "/system/osso/af/mmc-cover-open" -#define HBM_ENV_MMC_MOUNTPOINT "MMC_MOUNTPOINT" #define HBM_CACHE_PERMISSION (GNOME_VFS_PERM_USER_READ | \ GNOME_VFS_PERM_USER_WRITE | \ GNOME_VFS_PERM_GROUP_READ | \ @@ -82,7 +78,6 @@ GdkDisplay *display; GdkPixbufLoader *loader; - GConfClient *gconf_client; gint width, height; GnomeVFSHandle *handle; GnomeVFSHandle *cache_handle; @@ -95,7 +90,6 @@ gboolean caching; gboolean oom; - gboolean on_mmc; guchar buffer[BUFFER_SIZE]; @@ -111,7 +105,6 @@ HBM_TYPE_BACKGROUND, HBMBackgroundPrivate); - background->priv->gconf_client = gconf_client_get_default (); } static void @@ -168,14 +161,7 @@ static void hbm_background_finalize (GObject *object) { - HBMBackgroundPrivate *priv = HBM_BACKGROUND (object)->priv; - if (priv->gconf_client) - { - g_object_unref (priv->gconf_client); - priv->gconf_client = NULL; - } - } static void @@ -294,60 +280,7 @@ priv->pixbuf_width, priv->pixbuf_height); } -static gboolean -hbm_background_is_on_mmc (HBMBackground *background) -{ - HBMBackgroundPrivate *priv = background->priv; - gchar *filename = NULL; - gchar *mmc_mount_point = NULL; - - g_object_get (background, - "filename", &filename, - NULL); - g_return_val_if_fail (filename, FALSE); - - mmc_mount_point = g_strconcat ("file://", - g_getenv (HBM_ENV_MMC_MOUNTPOINT), - NULL); - - - priv->on_mmc = g_str_has_prefix (filename, mmc_mount_point); - g_free (mmc_mount_point); - - return priv->on_mmc; - -} - static void -hbm_background_is_mmc_open (HBMBackground *background, GError **error) -{ - HBMBackgroundPrivate *priv = background->priv; - GError *gconf_error = NULL; - gboolean mmc_cover_open; - - mmc_cover_open = gconf_client_get_bool (priv->gconf_client, - HBM_GCONF_MMC_COVER_OPEN, - &gconf_error); - if (gconf_error) - { - g_propagate_error (error, gconf_error); - - return; - } - - if (mmc_cover_open) - { - g_set_error (error, - BACKGROUND_MANAGER_ERROR, - BACKGROUND_MANAGER_ERROR_MMC_OPEN, - "MMC cover is open"); - } - - return; - -} - -static void hbm_background_open_file (HBMBackground *background, GError **error) { HBMBackgroundPrivate *priv = background->priv; @@ -467,12 +400,6 @@ hbm_background_is_oom (background, error); if (*error) return FALSE; - if (priv->on_mmc) - { - hbm_background_is_mmc_open (background, error); - if (*error) return FALSE; - } - result = gnome_vfs_read (priv->handle, priv->buffer, BUFFER_SIZE, @@ -589,11 +516,6 @@ hbm_background_enable_memory_cap (background); - hbm_background_is_on_mmc (background); - - if (priv->on_mmc) - hbm_background_is_mmc_open (background, &local_error); - if (local_error) goto error; priv->loader = gdk_pixbuf_loader_new (); Modified: projects/haf/trunk/hildon-desktop/src/hd-home-l10n.h =================================================================== --- projects/haf/trunk/hildon-desktop/src/hd-home-l10n.h 2007-08-01 15:02:24 UTC (rev 12987) +++ projects/haf/trunk/hildon-desktop/src/hd-home-l10n.h 2007-08-01 15:19:32 UTC (rev 12988) @@ -98,7 +98,6 @@ #define HH_FLASH_FULL_TEXT _KE_RECV("cerm_device_memory_full") #define HH_NO_CONNECTION_TEXT _HCS("sfil_ni_cannot_open_no_connection") #define HH_FILE_CORRUPTED_TEXT _HCS("ckct_ni_unable_to_open_file_corrupted") -#define HH_MMC_OPEN_TEXT _HCS("sfil_ni_cannot_open_mmc_cover_open") /* help topics */ Modified: projects/haf/trunk/hildon-desktop/src/hd-home-window.c =================================================================== --- projects/haf/trunk/hildon-desktop/src/hd-home-window.c 2007-08-01 15:02:24 UTC (rev 12987) +++ projects/haf/trunk/hildon-desktop/src/hd-home-window.c 2007-08-01 15:19:32 UTC (rev 12988) @@ -673,9 +673,6 @@ "org.freedesktop.DBus.GLib.UnmappedError.BackgroundManagerErrorQuark.Code1"))) text = HH_NO_CONNECTION_TEXT; else if ((dbus_g_error_has_name (error, - "org.freedesktop.DBus.GLib.UnmappedError.BackgroundManagerErrorQuark.Code4"))) - text = HH_MMC_OPEN_TEXT; - else if ((dbus_g_error_has_name (error, "org.freedesktop.DBus.GLib.UnmappedError.BackgroundManagerErrorQuark.Code6"))) text = HH_FLASH_FULL_TEXT; else if ((dbus_g_error_has_name (error,
- Previous message: [maemo-commits] r12987 - in projects/haf/trunk/hildon-desktop: . libhildondesktop src
- Next message: [maemo-commits] r12989 - in projects/haf/trunk/maemo-launcher: . debian launcher
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]