aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Persch <chpe@cvs.gnome.org>2005-02-02 04:25:18 +0800
committerChristian Persch <chpe@src.gnome.org>2005-02-02 04:25:18 +0800
commitca38b66c43d6bc8d5658109cd7d4b47e59242ac8 (patch)
treefc8b2347effe2c586a46044c0254234382e6b9d7
parent551c3257365e4410049cd0c2efe01fe8c703bd03 (diff)
downloadgsoc2013-epiphany-ca38b66c43d6bc8d5658109cd7d4b47e59242ac8.tar
gsoc2013-epiphany-ca38b66c43d6bc8d5658109cd7d4b47e59242ac8.tar.gz
gsoc2013-epiphany-ca38b66c43d6bc8d5658109cd7d4b47e59242ac8.tar.bz2
gsoc2013-epiphany-ca38b66c43d6bc8d5658109cd7d4b47e59242ac8.tar.lz
gsoc2013-epiphany-ca38b66c43d6bc8d5658109cd7d4b47e59242ac8.tar.xz
gsoc2013-epiphany-ca38b66c43d6bc8d5658109cd7d4b47e59242ac8.tar.zst
gsoc2013-epiphany-ca38b66c43d6bc8d5658109cd7d4b47e59242ac8.zip
Don't assign to ephy_shell global variable, that's already done in its
2005-02-01 Christian Persch <chpe@cvs.gnome.org> * src/ephy-main.c: (main): Don't assign to ephy_shell global variable, that's already done in its constructor.
-rw-r--r--ChangeLog7
-rw-r--r--src/ephy-main.c3
2 files changed, 9 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index e1e5a449a..8c3d72492 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
2005-02-01 Christian Persch <chpe@cvs.gnome.org>
+ * src/ephy-main.c: (main):
+
+ Don't assign to ephy_shell global variable, that's already done
+ in its constructor.
+
+2005-02-01 Christian Persch <chpe@cvs.gnome.org>
+
* src/ephy-window.c: (update_print_actions):
Don't disable print preview if print setup is locked down.
diff --git a/src/ephy-main.c b/src/ephy-main.c
index de6350cf7..042fd1f27 100644
--- a/src/ephy-main.c
+++ b/src/ephy-main.c
@@ -195,7 +195,8 @@ main (int argc, char *argv[])
bonobo_activate ();
- ephy_shell = ephy_shell_new ();
+ ephy_shell_new ();
+ g_assert (ephy_shell != NULL);
new_instance = ephy_shell_startup (ephy_shell, startup_flags,
args, string_arg, &err);