mirror of
https://gitlab.gnome.org/GNOME/nautilus
synced 2024-11-05 16:04:31 +00:00
Fix a dumbass mistake. Take out some real code from inside an assert.
* src/ntl-main.c (main): Fix a dumbass mistake. Take out some real code from inside an assert.
This commit is contained in:
parent
8636bfa95c
commit
8078fc8daa
3 changed files with 15 additions and 6 deletions
|
@ -1,3 +1,8 @@
|
|||
2000-04-27 Ramiro Estrugo <ramiro@eazel.com>
|
||||
|
||||
* src/ntl-main.c (main): Fix a dumbass mistake. Take out some
|
||||
real code from inside an assert.
|
||||
|
||||
2000-04-28 Darin Adler <darin@eazel.com>
|
||||
|
||||
Some cleanup inspired by Maciej's check-in.
|
||||
|
|
|
@ -45,6 +45,7 @@ main(int argc, char *argv[])
|
|||
poptContext ctx;
|
||||
CORBA_Environment ev;
|
||||
CORBA_ORB orb;
|
||||
gboolean preferences_result;
|
||||
#if !defined (NAUTILUS_OMIT_SELF_CHECK)
|
||||
gboolean check = FALSE;
|
||||
#endif
|
||||
|
@ -76,11 +77,12 @@ main(int argc, char *argv[])
|
|||
options, 0, &ctx);
|
||||
orb = oaf_init (argc, argv);
|
||||
|
||||
preferences_result = nautilus_preferences_initialize (argc, argv);
|
||||
|
||||
/* FIXME bugzilla.eazel.com 672:
|
||||
* Need better error reporting if this fails. BUT, is it too
|
||||
* early to post a dialog here ? Also, shouldn't put non-debug
|
||||
* code inside an assert! */
|
||||
g_assert (nautilus_preferences_initialize (argc, argv));
|
||||
* early to post a dialog here ? */
|
||||
g_assert (preferences_result);
|
||||
|
||||
bonobo_init (orb, CORBA_OBJECT_NIL, CORBA_OBJECT_NIL);
|
||||
g_thread_init (NULL);
|
||||
|
|
|
@ -45,6 +45,7 @@ main(int argc, char *argv[])
|
|||
poptContext ctx;
|
||||
CORBA_Environment ev;
|
||||
CORBA_ORB orb;
|
||||
gboolean preferences_result;
|
||||
#if !defined (NAUTILUS_OMIT_SELF_CHECK)
|
||||
gboolean check = FALSE;
|
||||
#endif
|
||||
|
@ -76,11 +77,12 @@ main(int argc, char *argv[])
|
|||
options, 0, &ctx);
|
||||
orb = oaf_init (argc, argv);
|
||||
|
||||
preferences_result = nautilus_preferences_initialize (argc, argv);
|
||||
|
||||
/* FIXME bugzilla.eazel.com 672:
|
||||
* Need better error reporting if this fails. BUT, is it too
|
||||
* early to post a dialog here ? Also, shouldn't put non-debug
|
||||
* code inside an assert! */
|
||||
g_assert (nautilus_preferences_initialize (argc, argv));
|
||||
* early to post a dialog here ? */
|
||||
g_assert (preferences_result);
|
||||
|
||||
bonobo_init (orb, CORBA_OBJECT_NIL, CORBA_OBJECT_NIL);
|
||||
g_thread_init (NULL);
|
||||
|
|
Loading…
Reference in a new issue