aboutsummaryrefslogtreecommitdiffstats
path: root/embed
diff options
context:
space:
mode:
authorChristian Persch <chpe@svn.gnome.org>2007-02-13 03:16:53 +0800
committerChristian Persch <chpe@src.gnome.org>2007-02-13 03:16:53 +0800
commit78af3f21eef420fa3d6c850fb87ff5e92d5efb26 (patch)
treea8182654915510790e74181594397c322725659f /embed
parent5e60306f7024b5f8fcde62753acd94510863fa13 (diff)
downloadgsoc2013-epiphany-78af3f21eef420fa3d6c850fb87ff5e92d5efb26.tar
gsoc2013-epiphany-78af3f21eef420fa3d6c850fb87ff5e92d5efb26.tar.gz
gsoc2013-epiphany-78af3f21eef420fa3d6c850fb87ff5e92d5efb26.tar.bz2
gsoc2013-epiphany-78af3f21eef420fa3d6c850fb87ff5e92d5efb26.tar.lz
gsoc2013-epiphany-78af3f21eef420fa3d6c850fb87ff5e92d5efb26.tar.xz
gsoc2013-epiphany-78af3f21eef420fa3d6c850fb87ff5e92d5efb26.tar.zst
gsoc2013-epiphany-78af3f21eef420fa3d6c850fb87ff5e92d5efb26.zip
=== Release 2.17.91 ===RELEASE_2_17_91
2007-02-12 Christian Persch <chpe@svn.gnome.org> === Release 2.17.91 === * configure.ac: * data/mime-types-permissions.xml: svn path=/trunk/; revision=6904
Diffstat (limited to 'embed')
-rw-r--r--embed/mozilla/ContentHandler.cpp1
-rw-r--r--embed/mozilla/GeckoPrintSession.cpp2
2 files changed, 2 insertions, 1 deletions
diff --git a/embed/mozilla/ContentHandler.cpp b/embed/mozilla/ContentHandler.cpp
index dd190f0c0..f4f1ac604 100644
--- a/embed/mozilla/ContentHandler.cpp
+++ b/embed/mozilla/ContentHandler.cpp
@@ -377,6 +377,7 @@ NS_METHOD GContentHandler::MIMEInitiateAction (void)
{
const char *id = gnome_vfs_mime_application_get_desktop_id (mHelperApp);
+ /* FIXME! menu editing can make this check fail!!!! */
if (id && strcmp (id, "epiphany.desktop") == 0)
{
mHelperApp = nsnull;
diff --git a/embed/mozilla/GeckoPrintSession.cpp b/embed/mozilla/GeckoPrintSession.cpp
index e433d71a7..8e4f7ebc7 100644
--- a/embed/mozilla/GeckoPrintSession.cpp
+++ b/embed/mozilla/GeckoPrintSession.cpp
@@ -490,7 +490,7 @@ GeckoPrintSession::OpenProgressDialog (nsIDOMWindowInternal *aParent,
gtk_window_set_resizable (GTK_WINDOW (dialog), FALSE);
gtk_container_set_border_width (GTK_CONTAINER (dialog), 5);
gtk_box_set_spacing (GTK_BOX (dialog->vbox), 14); /* 2 * 5 + 14 = 24 */
- gtk_box_set_spacing (GTK_BOX (dialog->action_area), 6);
+ gtk_box_set_spacing (GTK_BOX (dialog->action_area), 5);
hbox = gtk_hbox_new (FALSE, 12);
gtk_container_set_border_width (GTK_CONTAINER (hbox), 5);