diff options
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | embed/mozilla/ContentHandler.cpp | 15 | ||||
| -rw-r--r-- | embed/mozilla/ContentHandler.h | 1 | ||||
| -rw-r--r-- | src/prefs-dialog.c | 3 |
4 files changed, 20 insertions, 7 deletions
@@ -1,3 +1,11 @@ +2003-07-05 Marco Pesenti Gritti <marco@it.gnome.org> + + * embed/mozilla/ContentHandler.cpp: + * embed/mozilla/ContentHandler.h: + * src/prefs-dialog.c: (setup_font_menu): + + Api resync and cleanup from galeon. + 2003-07-04 Christian Persch <chpe@cvs.gnome.org> * data/epiphany.schemas.in: diff --git a/embed/mozilla/ContentHandler.cpp b/embed/mozilla/ContentHandler.cpp index d06d3dbdd..332456b71 100644 --- a/embed/mozilla/ContentHandler.cpp +++ b/embed/mozilla/ContentHandler.cpp @@ -246,10 +246,20 @@ GContentHandler::~GContentHandler() // begin nsIHelperAppLauncher impl //////////////////////////////////////////////////////////////////////////////// +#if MOZILLA_SNAPSHOT > 8 /* void show (in nsIHelperAppLauncher aLauncher, in nsISupports aContext); */ NS_IMETHODIMP GContentHandler::Show(nsIHelperAppLauncher *aLauncher, + nsISupports *aContext, + PRBool aForced) +#else +NS_IMETHODIMP GContentHandler::Show(nsIHelperAppLauncher *aLauncher, nsISupports *aContext) +#endif { + /* aForced reflects if the content being sent is normally viewable + * in mozilla or not. That fact doesn't affect us, so ignore it + */ + nsresult rv; mLauncher = aLauncher; @@ -400,11 +410,6 @@ NS_METHOD GContentHandler::LaunchHelperApp (void) return NS_OK; } -NS_METHOD GContentHandler::ShowHelperProgressDialog (void) -{ - return NS_ERROR_NOT_IMPLEMENTED; -} - NS_METHOD GContentHandler::GetLauncher (nsIHelperAppLauncher * *_retval) { NS_IF_ADDREF (*_retval = mLauncher); diff --git a/embed/mozilla/ContentHandler.h b/embed/mozilla/ContentHandler.h index 9d3cfca2e..d08cf6cbd 100644 --- a/embed/mozilla/ContentHandler.h +++ b/embed/mozilla/ContentHandler.h @@ -63,7 +63,6 @@ class GContentHandler : public nsIHelperAppLauncherDialog NS_METHOD FindHelperApp (void); NS_METHOD LaunchHelperApp (void); - NS_METHOD ShowHelperProgressDialog (void); NS_METHOD GetLauncher (nsIHelperAppLauncher * *_retval); NS_METHOD GetContext (nsISupports * *_retval); diff --git a/src/prefs-dialog.c b/src/prefs-dialog.c index 763a2e395..817127564 100644 --- a/src/prefs-dialog.c +++ b/src/prefs-dialog.c @@ -447,7 +447,6 @@ setup_font_menu (PrefsDialog *dialog, GList *fonts; gchar *name; char key[255]; - int pos; GtkWidget *entry = GTK_COMBO(combo)->entry; EphyEmbedSingle *single; @@ -478,6 +477,8 @@ setup_font_menu (PrefsDialog *dialog, /* set the default value */ if (name != NULL) { + int pos = 0; + gtk_editable_delete_text (GTK_EDITABLE(entry), 0, -1); gtk_editable_insert_text (GTK_EDITABLE(entry), name, g_utf8_strlen (name, -1), |