aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDiego Escalante Urrelo <diegoe@svn.gnome.org>2007-01-09 07:01:05 +0800
committerDiego Escalante Urrelo <diegoe@src.gnome.org>2007-01-09 07:01:05 +0800
commit6269b4651b778e1bdc125a222317e4b558ca14b1 (patch)
treeb45995202367915676cba63608fc9f97901903f2
parent0b36f30129faf775ebf3c783d1823ceb75ee05bc (diff)
downloadgsoc2013-epiphany-6269b4651b778e1bdc125a222317e4b558ca14b1.tar
gsoc2013-epiphany-6269b4651b778e1bdc125a222317e4b558ca14b1.tar.gz
gsoc2013-epiphany-6269b4651b778e1bdc125a222317e4b558ca14b1.tar.bz2
gsoc2013-epiphany-6269b4651b778e1bdc125a222317e4b558ca14b1.tar.lz
gsoc2013-epiphany-6269b4651b778e1bdc125a222317e4b558ca14b1.tar.xz
gsoc2013-epiphany-6269b4651b778e1bdc125a222317e4b558ca14b1.tar.zst
gsoc2013-epiphany-6269b4651b778e1bdc125a222317e4b558ca14b1.zip
Check the result of ephy_file_launch_desktop_file () so if it fails we try
2007-01-08 Diego Escalante Urrelo <diegoe@svn.gnome.org> * src/popup-commands.c: (background_download_completed) Check the result of ephy_file_launch_desktop_file () so if it fails we try an alternative naming of the background capplet: gnome-background. This is seen in fedora. Bug #387206, which is actually caused by bugzilla.redhat.com #201867. svn path=/trunk/; revision=6798
-rw-r--r--ChangeLog9
-rw-r--r--src/popup-commands.c8
2 files changed, 16 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 53b5ce0c4..9d60e494f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2007-01-08 Diego Escalante Urrelo <diegoe@svn.gnome.org>
+
+ * src/popup-commands.c: (background_download_completed)
+
+ Check the result of ephy_file_launch_desktop_file () so if it fails we
+ try an alternative naming of the background capplet: gnome-background.
+ This is seen in fedora. Bug #387206, which is actually caused by
+ bugzilla.redhat.com #201867.
+
2007-01-08 Luca Ferretti <elle.uca@libero.it>
* data/epiphany.pc.in:
diff --git a/src/popup-commands.c b/src/popup-commands.c
index 7043f6496..c6dcaf969 100644
--- a/src/popup-commands.c
+++ b/src/popup-commands.c
@@ -284,7 +284,13 @@ background_download_completed (EphyEmbedPersist *persist)
g_object_unref (persist);
/* open the "Background Properties" capplet */
- ephy_file_launch_desktop_file ("background.desktop", bg, user_time);
+ 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);
+ }
}
void