diff options
| author | Jean-François Rameau <jframeau@cvs.gnome.org> | 2006-08-10 04:08:29 +0800 |
|---|---|---|
| committer | Jean-François Rameau <jframeau@src.gnome.org> | 2006-08-10 04:08:29 +0800 |
| commit | 8e5ee4c532e32d5780f21e3c1a1894121e08d016 (patch) | |
| tree | 23ae3545d29b2d2ec2c6e8a6be1aea7a25fba30c | |
| parent | 5c78cf1e2bf9b81889f605412416b23b9841bdc4 (diff) | |
| download | gsoc2013-epiphany-8e5ee4c532e32d5780f21e3c1a1894121e08d016.tar.gz gsoc2013-epiphany-8e5ee4c532e32d5780f21e3c1a1894121e08d016.tar.zst gsoc2013-epiphany-8e5ee4c532e32d5780f21e3c1a1894121e08d016.zip | |
ephy_file_launch_desktop_file accepts now a parameter. Fix #343321.
2006-08-09 Jean-François Rameau <jframeau@cvs.gnome.org>
* src/popup-commands.c: (background_download_completed):
* lib/ephy-file-helpers.h: (ephy_file_launch_desktop_file):
* lib/ephy-file-helpers.c: (ephy_file_launch_desktop_file):
ephy_file_launch_desktop_file accepts now a parameter. Fix #343321.
* src/ephy-window.c:
Remove CONF_DESKTOP_BG_PICTURE #define. No need.
| -rw-r--r-- | ChangeLog | 12 | ||||
| -rw-r--r-- | lib/ephy-file-helpers.c | 3 | ||||
| -rw-r--r-- | lib/ephy-file-helpers.h | 1 | ||||
| -rw-r--r-- | src/ephy-window.c | 1 | ||||
| -rw-r--r-- | src/popup-commands.c | 10 |
5 files changed, 16 insertions, 11 deletions
@@ -1,3 +1,15 @@ +2006-08-09 Jean-François Rameau <jframeau@cvs.gnome.org> + + * src/popup-commands.c: (background_download_completed): + * lib/ephy-file-helpers.h: (ephy_file_launch_desktop_file): + * lib/ephy-file-helpers.c: (ephy_file_launch_desktop_file): + + ephy_file_launch_desktop_file accepts now a parameter. Fix #343321. + + * src/ephy-window.c: + + Remove CONF_DESKTOP_BG_PICTURE #define. No need. + 2006-08-08 Christian Persch <chpe@cvs.gnome.org> * configure.ac: diff --git a/lib/ephy-file-helpers.c b/lib/ephy-file-helpers.c index ef34c9b99..f5cd19995 100644 --- a/lib/ephy-file-helpers.c +++ b/lib/ephy-file-helpers.c @@ -925,6 +925,7 @@ launch_desktop_item (const char *desktop_file, gboolean ephy_file_launch_desktop_file (const char *filename, + const char *parameter, guint32 user_time) { GError *error = NULL; @@ -947,7 +948,7 @@ ephy_file_launch_desktop_file (const char *filename, if (path != NULL) { - ret = launch_desktop_item (path, NULL, user_time, &error); + ret = launch_desktop_item (path, parameter, user_time, &error); if (ret == -1 || error != NULL) { diff --git a/lib/ephy-file-helpers.h b/lib/ephy-file-helpers.h index ef96d7b3e..8e6a381d4 100644 --- a/lib/ephy-file-helpers.h +++ b/lib/ephy-file-helpers.h @@ -80,6 +80,7 @@ void ephy_file_delete_on_exit (const char *path); EphyMimePermission ephy_file_check_mime (const char *mime_type); gboolean ephy_file_launch_desktop_file (const char *filename, + const char *parameter, guint32 user_time); gboolean ephy_file_launch_application (GnomeVFSMimeApplication *application, diff --git a/src/ephy-window.c b/src/ephy-window.c index d7722a0be..5f11553aa 100644 --- a/src/ephy-window.c +++ b/src/ephy-window.c @@ -413,7 +413,6 @@ static const struct }; #define CONF_LOCKDOWN_HIDE_MENUBAR "/apps/epiphany/lockdown/hide_menubar" -#define CONF_DESKTOP_BG_PICTURE "/desktop/gnome/background/picture_filename" #define BOOKMARKS_MENU_PATH "/menubar/BookmarksMenu" diff --git a/src/popup-commands.c b/src/popup-commands.c index 3b5f66d29..fe6579f2d 100644 --- a/src/popup-commands.c +++ b/src/popup-commands.c @@ -260,19 +260,11 @@ background_download_completed (EphyEmbedPersist *persist) user_time = ephy_embed_persist_get_user_time (persist); bg = ephy_embed_persist_get_dest (persist); - eel_gconf_set_string (CONF_DESKTOP_BG_PICTURE, bg); - - type = eel_gconf_get_string (CONF_DESKTOP_BG_TYPE); - if (type == NULL || strcmp (type, "none") == 0) - { - eel_gconf_set_string (CONF_DESKTOP_BG_TYPE, "wallpaper"); - } - g_free (type); g_object_unref (persist); /* open the "Background Properties" capplet */ - ephy_file_launch_desktop_file ("background.desktop", user_time); + ephy_file_launch_desktop_file ("background.desktop", bg, user_time); } void |