aboutsummaryrefslogtreecommitdiffstats
path: root/embed/mozilla
diff options
context:
space:
mode:
authorChristian Persch <chpe@cvs.gnome.org>2003-12-30 05:05:09 +0800
committerChristian Persch <chpe@src.gnome.org>2003-12-30 05:05:09 +0800
commitc76b79acb1dd84aec4b91bae8841099699a38139 (patch)
tree2b0b28700be1db98ad314b12e00b4d76d6885fee /embed/mozilla
parent6ca9d693750a2b0807670b0072ed5d162e12fea0 (diff)
downloadgsoc2013-epiphany-c76b79acb1dd84aec4b91bae8841099699a38139.tar
gsoc2013-epiphany-c76b79acb1dd84aec4b91bae8841099699a38139.tar.gz
gsoc2013-epiphany-c76b79acb1dd84aec4b91bae8841099699a38139.tar.bz2
gsoc2013-epiphany-c76b79acb1dd84aec4b91bae8841099699a38139.tar.lz
gsoc2013-epiphany-c76b79acb1dd84aec4b91bae8841099699a38139.tar.xz
gsoc2013-epiphany-c76b79acb1dd84aec4b91bae8841099699a38139.tar.zst
gsoc2013-epiphany-c76b79acb1dd84aec4b91bae8841099699a38139.zip
Unified return type of ephy_embed_shell_get_X to be GObject *. Fixed all
2003-12-29 Christian Persch <chpe@cvs.gnome.org> * embed/ephy-embed-shell.c: (ephy_embed_shell_get_favicon_cache), (ephy_embed_shell_get_global_history), (ephy_embed_shell_get_downloader_view), (ephy_embed_shell_get_embed_single), (ephy_embed_shell_get_encodings), (ephy_embed_shell_check_mime), (ephy_embed_shell_class_init): * embed/ephy-embed-shell.h: * embed/mozilla/ContentHandler.cpp: * embed/mozilla/EphyHeaderSniffer.cpp: * embed/mozilla/GlobalHistory.cpp: * embed/mozilla/mozilla-notifiers.cpp: * src/bookmarks/ephy-bookmarks.c: (compute_lower_fav), (ephy_setup_history_notifiers): * src/ephy-completion-model.c: (ephy_completion_model_init): * src/ephy-shell.c: (ephy_shell_get_history_window): * src/ephy-tab.c: (ephy_tab_set_icon_address), (ephy_tab_address_cb), (ephy_tab_zoom_changed_cb): * src/ephy-toolbars-model.c: (impl_get_item_id): * src/prefs-dialog.c: (setup_font_combo), (prefs_clear_cache_button_clicked_cb): Unified return type of ephy_embed_shell_get_X to be GObject *. Fixed all callers.
Diffstat (limited to 'embed/mozilla')
-rw-r--r--embed/mozilla/ContentHandler.cpp3
-rw-r--r--embed/mozilla/EphyHeaderSniffer.cpp4
-rw-r--r--embed/mozilla/GlobalHistory.cpp7
-rw-r--r--embed/mozilla/mozilla-notifiers.cpp9
4 files changed, 17 insertions, 6 deletions
diff --git a/embed/mozilla/ContentHandler.cpp b/embed/mozilla/ContentHandler.cpp
index 1ad9095ff..32a18ca96 100644
--- a/embed/mozilla/ContentHandler.cpp
+++ b/embed/mozilla/ContentHandler.cpp
@@ -35,6 +35,7 @@
#include "ephy-prefs.h"
#include "eel-gconf-extensions.h"
+#include "ephy-embed-single.h"
#include "ephy-embed-shell.h"
#include <libgnomevfs/gnome-vfs-mime.h>
@@ -79,7 +80,7 @@ NS_IMETHODIMP GContentHandler::Show(nsIHelperAppLauncher *aLauncher,
rv = Init ();
if (NS_FAILED (rv)) return rv;
- single = ephy_embed_shell_get_embed_single (embed_shell);
+ single = EPHY_EMBED_SINGLE (ephy_embed_shell_get_embed_single (embed_shell));
g_signal_emit_by_name (single, "handle_content", mMimeType,
mUrl.get(), &handled);
diff --git a/embed/mozilla/EphyHeaderSniffer.cpp b/embed/mozilla/EphyHeaderSniffer.cpp
index b6bc1ffb0..cfd61913f 100644
--- a/embed/mozilla/EphyHeaderSniffer.cpp
+++ b/embed/mozilla/EphyHeaderSniffer.cpp
@@ -49,6 +49,8 @@
#include "EphyHeaderSniffer.h"
#include "netCore.h"
+#include "ephy-embed-single.h"
+#include "ephy-embed-shell.h"
#include "ephy-file-chooser.h"
#include "ephy-prefs.h"
#include "ephy-gui.h"
@@ -101,7 +103,7 @@ EphyHeaderSniffer::HandleContent ()
if (mPostData) return NS_ERROR_FAILURE;
mURL->GetSpec (uriSpec);
- single = ephy_embed_shell_get_embed_single (embed_shell);
+ single = EPHY_EMBED_SINGLE (ephy_embed_shell_get_embed_single (embed_shell));
g_signal_emit_by_name (single, "handle_content", mContentType.get(),
uriSpec.get(), &handled);
diff --git a/embed/mozilla/GlobalHistory.cpp b/embed/mozilla/GlobalHistory.cpp
index a2c2c5861..3e87d84ca 100644
--- a/embed/mozilla/GlobalHistory.cpp
+++ b/embed/mozilla/GlobalHistory.cpp
@@ -14,13 +14,16 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *
+ * $Id$
*/
#ifdef HAVE_CONFIG_H
-#include <config.h>
+#include "config.h"
#endif
#include "ephy-embed-shell.h"
+
#include "GlobalHistory.h"
#include "nsString.h"
@@ -28,7 +31,7 @@ NS_IMPL_ISUPPORTS2(MozGlobalHistory, nsIGlobalHistory, nsIBrowserHistory)
MozGlobalHistory::MozGlobalHistory ()
{
- mGlobalHistory = ephy_embed_shell_get_global_history (embed_shell);
+ mGlobalHistory = EPHY_HISTORY (ephy_embed_shell_get_global_history (embed_shell));
}
MozGlobalHistory::~MozGlobalHistory ()
diff --git a/embed/mozilla/mozilla-notifiers.cpp b/embed/mozilla/mozilla-notifiers.cpp
index b742a3bfe..fdf6529b1 100644
--- a/embed/mozilla/mozilla-notifiers.cpp
+++ b/embed/mozilla/mozilla-notifiers.cpp
@@ -1,5 +1,6 @@
/*
- * Copyright (C) 2000 Nate Case
+ * Copyright (C) 2000 Nate Case
+ * Copyright (C) 2003 Marco Pesenti Gritti
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -14,14 +15,16 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *
+ * $Id$
*/
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
-#include "ephy-embed-shell.h"
#include "ephy-embed-single.h"
+#include "ephy-embed-shell.h"
#include "mozilla-notifiers.h"
#include "eel-gconf-extensions.h"
#include "MozRegisterComponents.h"
@@ -36,6 +39,8 @@
#include <glib/gi18n.h>
#include <stdlib.h>
#include <gdk/gdkx.h>
+#include <gtk/gtksettings.h>
+
#include <nsCOMPtr.h>
#include <nsIPrefService.h>
#include <nsIServiceManager.h>