aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Persch <chpe@cvs.gnome.org>2004-07-27 19:04:52 +0800
committerChristian Persch <chpe@src.gnome.org>2004-07-27 19:04:52 +0800
commit9cf0f14166323e37d435348837992f3b820f54ba (patch)
treebc6a20c73adbad30d36849ba8adc845981bf6967
parentca08f244b95de739b05b84a18a0c8a732c23814f (diff)
downloadgsoc2013-epiphany-9cf0f14166323e37d435348837992f3b820f54ba.tar
gsoc2013-epiphany-9cf0f14166323e37d435348837992f3b820f54ba.tar.gz
gsoc2013-epiphany-9cf0f14166323e37d435348837992f3b820f54ba.tar.bz2
gsoc2013-epiphany-9cf0f14166323e37d435348837992f3b820f54ba.tar.lz
gsoc2013-epiphany-9cf0f14166323e37d435348837992f3b820f54ba.tar.xz
gsoc2013-epiphany-9cf0f14166323e37d435348837992f3b820f54ba.tar.zst
gsoc2013-epiphany-9cf0f14166323e37d435348837992f3b820f54ba.zip
Remove load_proxy_autoconf() vfunc.
2004-07-27 Christian Persch <chpe@cvs.gnome.org> * embed/ephy-embed-single.h: Remove load_proxy_autoconf() vfunc. * embed/mozilla/mozilla-notifiers.cpp: Only include gnome-i18n.h here. Thanks to Crispin for noticing those buglets.
-rw-r--r--ChangeLog12
-rw-r--r--embed/ephy-embed-single.h2
-rw-r--r--embed/mozilla/mozilla-notifiers.cpp2
3 files changed, 13 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 5e0ed156d..ac455b44c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2004-07-27 Christian Persch <chpe@cvs.gnome.org>
+
+ * embed/ephy-embed-single.h:
+
+ Remove load_proxy_autoconf() vfunc.
+
+ * embed/mozilla/mozilla-notifiers.cpp:
+
+ Only include gnome-i18n.h here.
+
+ Thanks to Crispin for noticing those buglets.
+
2004-07-26 Christian Persch <chpe@cvs.gnome.org>
* lib/egg/egg-toolbars-model.c: (egg_toolbars_model_set_flags):
diff --git a/embed/ephy-embed-single.h b/embed/ephy-embed-single.h
index 68ea108fe..e0cbee8c1 100644
--- a/embed/ephy-embed-single.h
+++ b/embed/ephy-embed-single.h
@@ -59,8 +59,6 @@ struct _EphyEmbedSingleIface
void (* set_offline_mode) (EphyEmbedSingle *shell,
gboolean offline);
gboolean (* get_offline_mode) (EphyEmbedSingle *single);
- void (* load_proxy_autoconf) (EphyEmbedSingle *shell,
- const char* url);
GList * (* get_font_list) (EphyEmbedSingle *shell,
const char *langGroup);
};
diff --git a/embed/mozilla/mozilla-notifiers.cpp b/embed/mozilla/mozilla-notifiers.cpp
index 4c0c38293..474edc063 100644
--- a/embed/mozilla/mozilla-notifiers.cpp
+++ b/embed/mozilla/mozilla-notifiers.cpp
@@ -38,7 +38,6 @@
#include <stdio.h>
#include <string.h>
#include <locale.h>
-#include <glib/gi18n.h>
#include <stdlib.h>
#include <gdk/gdkx.h>
#include <gtk/gtksettings.h>
@@ -47,6 +46,7 @@
#include <nsEmbedString.h>
#include <nsIPrefService.h>
#include <nsIServiceManager.h>
+/* we don't use glib/gi18n.h here because we need gnome_i18n_get_language_list() */
#include <libgnome/gnome-i18n.h>
#ifdef ALLOW_PRIVATE_API