diff options
| author | JP Rosevear <jpr@helixcode.com> | 2000-08-04 22:58:43 +0800 |
|---|---|---|
| committer | JP Rosevear <jpr@src.gnome.org> | 2000-08-04 22:58:43 +0800 |
| commit | 09e1677c54c2620fe31cefcf18e869beaccba8f3 (patch) | |
| tree | efaf5fa560e8f3f3f4387cbe6311508862c427e3 /shell/main.c | |
| parent | 660a75cc995f416ecc018b6ee278582651240631 (diff) | |
| download | gsoc2013-evolution-09e1677c54c2620fe31cefcf18e869beaccba8f3.tar.gz gsoc2013-evolution-09e1677c54c2620fe31cefcf18e869beaccba8f3.tar.zst gsoc2013-evolution-09e1677c54c2620fe31cefcf18e869beaccba8f3.zip | |
Actually commit this - I though it went in already.
2000-08-03 JP Rosevear <jpr@helixcode.com>
* configure.in: Remove gconf check
2000-08-03 JP Rosevear <jpr@helixcode.com>
* mail-config.glade: Increase window size slightly, rename
"Transport" to "Mail Transport"
* mail-config.c (init_config): Remove gconf references
(clear_config): ditto
(read_config): ditto
(write_config): ditto
(mail_config): Null provider lists before filling them
(mail_config_druid): ditto
(identity_page_new): Increase spacing of vbox
(service_page_new): ditto
* Makefile.am: Remove gconf references.
2000-08-03 JP Rosevear <jpr@helixcode.com>
* e-shell.h: Remove gconf references
* e-shell-view.h: Remove gconf references
* main.c (idle_cb): Remove gconf references
* Makefile.am: Remove gconf cflags and libs
* e-shell-view.c (e_shell_view_load_settings): Change to use
gnome-config
(e_shell_view_save_settings): ditto
* e-shell.c (e_shell_restore_from_settings): Change to
use gnome_config
(save_settings_for_views): ditto
svn path=/trunk/; revision=4530
Diffstat (limited to 'shell/main.c')
| -rw-r--r-- | shell/main.c | 19 |
1 files changed, 2 insertions, 17 deletions
diff --git a/shell/main.c b/shell/main.c index 352773e45f..1e2d3c3cc2 100644 --- a/shell/main.c +++ b/shell/main.c @@ -109,18 +109,11 @@ static gint idle_cb (gpointer data) { GtkWidget *view; - GConfClient *gconf_client; char *evolution_directory; evolution_directory = (char *) data; -#ifdef HAVE_GCONF_CLIENT_GET_DEFAULT - gconf_client = gconf_client_get_default (); -#else - gconf_client = gconf_client_new (); -#endif - - shell = e_shell_new (evolution_directory, gconf_client); + shell = e_shell_new (evolution_directory); g_free (evolution_directory); if (shell == NULL) { @@ -140,15 +133,12 @@ idle_cb (gpointer data) if (!getenv ("EVOLVE_ME_HARDER")) development_warning (); - gtk_object_unref (GTK_OBJECT (gconf_client)); - return FALSE; } int main (int argc, char **argv) { - GConfError *err = NULL; char *evolution_directory; bindtextdomain (PACKAGE, EVOLUTION_LOCALEDIR); @@ -161,12 +151,6 @@ main (int argc, char **argv) gnome_window_icon_set_default_from_file (EVOLUTION_IMAGES "/evolution-inbox.png"); - if (! gconf_init (argc, argv, &err)) { - e_notice (NULL, GNOME_MESSAGE_BOX_ERROR, - _("Cannot initialize the configuration system.")); - exit (1); - } - if (! bonobo_init (CORBA_OBJECT_NIL, CORBA_OBJECT_NIL, CORBA_OBJECT_NIL)) { e_notice (NULL, GNOME_MESSAGE_BOX_ERROR, _("Cannot initialize the Bonobo component system.")); @@ -187,3 +171,4 @@ main (int argc, char **argv) return 0; } + |