summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaciej Stachowiak <mstachow@src.gnome.org>2001-01-23 12:08:41 +0000
committerMaciej Stachowiak <mstachow@src.gnome.org>2001-01-23 12:08:41 +0000
commit3e3deab1d3ca376c6f5ded2a6c10c92aef9a77e1 (patch)
tree7e0d7b8f1f69d6f95bbe0617351185baa7e8c14e
parenta01aa117c465fd00267361c29d6bb27d45ab5265 (diff)
downloadnautilus-3e3deab1d3ca376c6f5ded2a6c10c92aef9a77e1.tar.gz
reviewed by: Pavel Cisler <pavel@eazel.com>
Fixed bug 5943 (Throbber crashes on nautilus startup (crashing Nautilus) with some themes and configurations) * components/help/hyperbola-main.c: (main): * components/image-viewer/nautilus-image-view.c: (init_server_factory): * components/mozilla/main.c: (main): * components/music/main.c: (main): * components/notes/nautilus-notes.c: (main): * components/services/install/nautilus-view/main.c: (main): * components/services/login/nautilus-view/main.c: (main): * components/services/summary/nautilus-view/main.c: (main): * components/shell/shell.c: * components/text/main.c: (main): * components/throbber/main.c: (main): * components/tree/main.c: (main): * libnautilus/nautilus-view-standard-main.c: (nautilus_view_standard_main_multi): * nautilus-installer/src/main.c: (main): * src/nautilus-main.c: (main): Added gdk_rgb_init calls. The throbber one was causing a real 100% reproducible crash for me on Nautilus startup, the rest are pre-emptive.
Diffstat
-rw-r--r--ChangeLog27
-rw-r--r--components/help/hyperbola-main.c1
-rw-r--r--components/image-viewer/nautilus-image-view.c2
-rw-r--r--components/mozilla/main.c1
-rw-r--r--components/music/main.c1
-rw-r--r--components/notes/nautilus-notes.c5
-rw-r--r--components/services/install-view/main.c2
-rw-r--r--components/services/install/nautilus-view/main.c2
-rw-r--r--components/services/login/nautilus-view/main.c1
-rw-r--r--components/services/summary/main.c1
-rw-r--r--components/services/summary/nautilus-view/main.c1
-rw-r--r--components/shell/shell.c2
-rw-r--r--components/text/main.c1
-rw-r--r--components/throbber/main.c2
-rw-r--r--components/tree/main.c1
-rw-r--r--libnautilus/nautilus-view-standard-main.c1
-rw-r--r--nautilus-installer/src/main.c1
-rw-r--r--src/nautilus-main.c3
18 files changed, 50 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 2cbd02320..769e0d68b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,30 @@
+2001-01-23 Maciej Stachowiak <mjs@eazel.com>
+
+ reviewed by: Pavel Cisler <pavel@eazel.com>
+
+ Fixed bug 5943 (Throbber crashes on nautilus startup (crashing
+ Nautilus) with some themes and configurations)
+
+ * components/help/hyperbola-main.c: (main):
+ * components/image-viewer/nautilus-image-view.c:
+ (init_server_factory):
+ * components/mozilla/main.c: (main):
+ * components/music/main.c: (main):
+ * components/notes/nautilus-notes.c: (main):
+ * components/services/install/nautilus-view/main.c: (main):
+ * components/services/login/nautilus-view/main.c: (main):
+ * components/services/summary/nautilus-view/main.c: (main):
+ * components/shell/shell.c:
+ * components/text/main.c: (main):
+ * components/throbber/main.c: (main):
+ * components/tree/main.c: (main):
+ * libnautilus/nautilus-view-standard-main.c:
+ (nautilus_view_standard_main_multi):
+ * nautilus-installer/src/main.c: (main):
+ * src/nautilus-main.c: (main): Added gdk_rgb_init calls. The
+ throbber one was causing a real 100% reproducible crash for me on
+ Nautilus startup, the rest are pre-emptive.
+
2001-01-23 Robin * Slomkowski <rslomkow@eazel.com>
* nautilus.spec.in: changed mozilla required version
diff --git a/components/help/hyperbola-main.c b/components/help/hyperbola-main.c
index a38b75556..74d028f96 100644
--- a/components/help/hyperbola-main.c
+++ b/components/help/hyperbola-main.c
@@ -57,6 +57,7 @@ main(int argc, char *argv[])
argc, argv,
oaf_popt_options, 0, NULL);
+ gdk_rgb_init ();
orb = oaf_init (argc, argv);
bonobo_init(orb, CORBA_OBJECT_NIL, CORBA_OBJECT_NIL);
diff --git a/components/image-viewer/nautilus-image-view.c b/components/image-viewer/nautilus-image-view.c
index 29dde29bd..f6b7df3a2 100644
--- a/components/image-viewer/nautilus-image-view.c
+++ b/components/image-viewer/nautilus-image-view.c
@@ -823,6 +823,8 @@ init_server_factory (int argc, char **argv)
gnome_init_with_popt_table("bonobo-image-generic", VERSION,
argc, argv,
oaf_popt_options, 0, NULL);
+ gdk_rgb_init ();
+
oaf_init (argc, argv);
if (!bonobo_init (CORBA_OBJECT_NIL, CORBA_OBJECT_NIL, CORBA_OBJECT_NIL))
diff --git a/components/mozilla/main.c b/components/mozilla/main.c
index dac7f0951..ba2a41796 100644
--- a/components/mozilla/main.c
+++ b/components/mozilla/main.c
@@ -131,6 +131,7 @@ main (int argc, char *argv[])
gnome_init_with_popt_table ("nautilus-mozilla-content-view", VERSION,
argc, argv,
oaf_popt_options, 0, NULL);
+ gdk_rgb_init ();
orb = oaf_init (argc, argv);
diff --git a/components/music/main.c b/components/music/main.c
index 264ce7e47..d6d5ac107 100644
--- a/components/music/main.c
+++ b/components/music/main.c
@@ -103,6 +103,7 @@ main (int argc, char *argv[])
argc, argv,
oaf_popt_options, 0, NULL);
+ gdk_rgb_init ();
orb = oaf_init (argc, argv);
bonobo_init (orb, CORBA_OBJECT_NIL, CORBA_OBJECT_NIL);
diff --git a/components/notes/nautilus-notes.c b/components/notes/nautilus-notes.c
index 25172b8b3..275bbd375 100644
--- a/components/notes/nautilus-notes.c
+++ b/components/notes/nautilus-notes.c
@@ -241,8 +241,9 @@ main(int argc, char *argv[])
gnome_init_with_popt_table("nautilus-notes", VERSION,
argc, argv,
- oaf_popt_options, 0, NULL);
- orb = oaf_init (argc, argv);
+ oaf_popt_options, 0, NULL);
+ gdk_rgb_init ();
+ orb = oaf_init (argc, argv);
bonobo_init (orb, CORBA_OBJECT_NIL, CORBA_OBJECT_NIL);
diff --git a/components/services/install-view/main.c b/components/services/install-view/main.c
index ea12edf62..1064f8e75 100644
--- a/components/services/install-view/main.c
+++ b/components/services/install-view/main.c
@@ -77,9 +77,9 @@ main (int argc, char *argv[])
gnome_init_with_popt_table ("nautilus-service-install-view", VERSION,
argc, argv,
oaf_popt_options, 0, NULL);
+ gdk_rgb_init ();
orb = oaf_init (argc, argv);
-
bonobo_init (orb, CORBA_OBJECT_NIL, CORBA_OBJECT_NIL);
/* log to stderr, for now (but leave debug mode off) */
diff --git a/components/services/install/nautilus-view/main.c b/components/services/install/nautilus-view/main.c
index ea12edf62..1064f8e75 100644
--- a/components/services/install/nautilus-view/main.c
+++ b/components/services/install/nautilus-view/main.c
@@ -77,9 +77,9 @@ main (int argc, char *argv[])
gnome_init_with_popt_table ("nautilus-service-install-view", VERSION,
argc, argv,
oaf_popt_options, 0, NULL);
+ gdk_rgb_init ();
orb = oaf_init (argc, argv);
-
bonobo_init (orb, CORBA_OBJECT_NIL, CORBA_OBJECT_NIL);
/* log to stderr, for now (but leave debug mode off) */
diff --git a/components/services/login/nautilus-view/main.c b/components/services/login/nautilus-view/main.c
index f1a15be0a..b36eb01b1 100644
--- a/components/services/login/nautilus-view/main.c
+++ b/components/services/login/nautilus-view/main.c
@@ -84,6 +84,7 @@ main (int argc, char *argv[])
argc, argv,
oaf_popt_options, 0, NULL);
+ gdk_rgb_init ();
orb = oaf_init (argc, argv);
bonobo_init (orb, CORBA_OBJECT_NIL, CORBA_OBJECT_NIL);
diff --git a/components/services/summary/main.c b/components/services/summary/main.c
index e5bf07353..68ca3938b 100644
--- a/components/services/summary/main.c
+++ b/components/services/summary/main.c
@@ -86,6 +86,7 @@ main (int argc, char *argv[])
argc, argv,
oaf_popt_options, 0, NULL);
+ gdk_rgb_init ();
orb = oaf_init (argc, argv);
bonobo_init (orb, CORBA_OBJECT_NIL, CORBA_OBJECT_NIL);
diff --git a/components/services/summary/nautilus-view/main.c b/components/services/summary/nautilus-view/main.c
index e5bf07353..68ca3938b 100644
--- a/components/services/summary/nautilus-view/main.c
+++ b/components/services/summary/nautilus-view/main.c
@@ -86,6 +86,7 @@ main (int argc, char *argv[])
argc, argv,
oaf_popt_options, 0, NULL);
+ gdk_rgb_init ();
orb = oaf_init (argc, argv);
bonobo_init (orb, CORBA_OBJECT_NIL, CORBA_OBJECT_NIL);
diff --git a/components/shell/shell.c b/components/shell/shell.c
index a05788328..41272c7b8 100644
--- a/components/shell/shell.c
+++ b/components/shell/shell.c
@@ -56,6 +56,8 @@ init_bonobo (int argc, char **argv)
{
gnome_init_with_popt_table ("xterm-control-factory", "0.0",
argc, argv, oaf_popt_options, 0, NULL);
+ gdk_rgb_init ();
+
orb = oaf_init (argc, argv);
if (!bonobo_init (orb, NULL, NULL))
diff --git a/components/text/main.c b/components/text/main.c
index 2ab8883a3..cd2f09380 100644
--- a/components/text/main.c
+++ b/components/text/main.c
@@ -102,6 +102,7 @@ main (int argc, char *argv[])
gnome_init_with_popt_table("nautilus-text-view", VERSION,
argc, argv,
oaf_popt_options, 0, NULL);
+ gdk_rgb_init ();
orb = oaf_init (argc, argv);
diff --git a/components/throbber/main.c b/components/throbber/main.c
index 2d3b11040..9aab2cc03 100644
--- a/components/throbber/main.c
+++ b/components/throbber/main.c
@@ -98,6 +98,8 @@ main (int argc, char *argv[])
argc, argv,
oaf_popt_options, 0, NULL);
+ gdk_rgb_init ();
+
orb = oaf_init (argc, argv);
bonobo_init (orb, CORBA_OBJECT_NIL, CORBA_OBJECT_NIL);
diff --git a/components/tree/main.c b/components/tree/main.c
index 4f0a30302..5be759c8e 100644
--- a/components/tree/main.c
+++ b/components/tree/main.c
@@ -104,6 +104,7 @@ main (int argc, char *argv[])
gnome_init_with_popt_table("nautilus-tree-view", VERSION,
argc, argv,
oaf_popt_options, 0, NULL);
+ gdk_rgb_init ();
orb = oaf_init (argc, argv);
diff --git a/libnautilus/nautilus-view-standard-main.c b/libnautilus/nautilus-view-standard-main.c
index 6080f1638..b1be47ecf 100644
--- a/libnautilus/nautilus-view-standard-main.c
+++ b/libnautilus/nautilus-view-standard-main.c
@@ -114,6 +114,7 @@ nautilus_view_standard_main_multi (const char *executable_name,
gnome_init_with_popt_table (executable_name, version,
argc, argv,
oaf_popt_options, 0, NULL);
+ gdk_rgb_init ();
orb = oaf_init (argc, argv);
gnome_vfs_init ();
bonobo_init (orb, CORBA_OBJECT_NIL, CORBA_OBJECT_NIL);
diff --git a/nautilus-installer/src/main.c b/nautilus-installer/src/main.c
index f1651c0e0..2a68499f4 100644
--- a/nautilus-installer/src/main.c
+++ b/nautilus-installer/src/main.c
@@ -142,6 +142,7 @@ main (int argc, char *argv[])
}
gnome_init_with_popt_table ("eazel-installer", VERSION, argc, argv, options, 0, NULL);
+ gdk_rgb_init ();
if (installer_show_build) {
printf ("\nEazel Installer v%s (build %s)\n\n", VERSION, BUILD_DATE);
diff --git a/src/nautilus-main.c b/src/nautilus-main.c
index 9f62602be..6d2b7b3f4 100644
--- a/src/nautilus-main.c
+++ b/src/nautilus-main.c
@@ -198,7 +198,8 @@ main (int argc, char *argv[])
gnome_init_with_popt_table ("nautilus", VERSION,
argc, argv, options, 0,
&popt_context);
-
+ gdk_rgb_init ();
+
/* Check for argument consistency. */
args = poptGetArgs (popt_context);
if (perform_self_check && args != NULL) {
View Lorry Controller Status