From a6348fb84c37377a1c3a61f9f973c2d099d0ca73 Mon Sep 17 00:00:00 2001 From: Christian Persch Date: Sat, 14 Jul 2007 22:21:57 +0000 Subject: Load the appearance capplet. Doesn't seem to work yet, see bug #456337. 2007-07-15 Christian Persch * src/popup-commands.c: (background_download_completed): Load the appearance capplet. Doesn't seem to work yet, see bug #456337. svn path=/trunk/; revision=7159 --- ChangeLog | 7 +++++++ src/popup-commands.c | 23 ++++++++++++++--------- 2 files changed, 21 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2af6013e6..8003e8a54 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2007-07-15 Christian Persch + + * src/popup-commands.c: (background_download_completed): + + Load the appearance capplet. Doesn't seem to work yet, see bug + #456337. + 2007-07-14 Christian Persch * embed/mozilla/ContentHandler.cpp: diff --git a/src/popup-commands.c b/src/popup-commands.c index 4cc6ed4ce..fe76a02a8 100644 --- a/src/popup-commands.c +++ b/src/popup-commands.c @@ -272,7 +272,7 @@ popup_cmd_save_image_as (GtkAction *action, window, TRUE, "image"); } -#define GNOME_BACKGROUND_PREFERENCES "gnome-background-properties" +#define GNOME_APPEARANCE_PROPERTIES "gnome-appearance-properties.desktop" static void background_download_completed (EphyEmbedPersist *persist) @@ -284,16 +284,21 @@ background_download_completed (EphyEmbedPersist *persist) bg = ephy_embed_persist_get_dest (persist); - g_object_unref (persist); - - /* open the "Background Properties" capplet */ - if (!ephy_file_launch_desktop_file ("background.desktop", bg, user_time)) + /* open the Appearance Properties capplet on the Background tab */ + /* FIXME! */ + if (!ephy_file_launch_desktop_file (GNOME_APPEARANCE_PROPERTIES, bg, user_time)) { - /* If the above try didn't work, then we try the Fedora name. - * This is a fix for #387206, but is actually a workaround for - * bugzilla.redhat.com #201867 */ - ephy_file_launch_desktop_file ("gnome-background.desktop", bg, user_time); + /* Fallback for <= 2.18 desktop: try to open the "Background Properties" capplet */ + if (!ephy_file_launch_desktop_file ("background.desktop", bg, user_time)) + { + /* If the above try didn't work, then we try the Fedora name. + * This is a fix for #387206, but is actually a workaround for + * bugzilla.redhat.com #201867 */ + ephy_file_launch_desktop_file ("gnome-background.desktop", bg, user_time); + } } + + g_object_unref (persist); } void -- cgit