aboutsummaryrefslogtreecommitdiffstats
path: root/shell/e-setup.c
diff options
context:
space:
mode:
authorEttore Perazzoli <ettore@src.gnome.org>2002-11-02 16:25:03 +0800
committerEttore Perazzoli <ettore@src.gnome.org>2002-11-02 16:25:03 +0800
commit9c73777f2268b5bf2622f893e2a3ba7d0f720572 (patch)
treef81b79f19b87f84b4429d329b3fc0f9ff7946060 /shell/e-setup.c
parent236c15d106b4e740d4e3996e0649334ca8e13876 (diff)
downloadgsoc2013-evolution-9c73777f2268b5bf2622f893e2a3ba7d0f720572.tar.gz
gsoc2013-evolution-9c73777f2268b5bf2622f893e2a3ba7d0f720572.tar.zst
gsoc2013-evolution-9c73777f2268b5bf2622f893e2a3ba7d0f720572.zip
First big sync of my GNOME 2 porting work (incomplete, and still
pretty broken). Weeeeee! svn path=/trunk/; revision=18503
Diffstat (limited to 'shell/e-setup.c')
-rw-r--r--shell/e-setup.c31
1 files changed, 11 insertions, 20 deletions
diff --git a/shell/e-setup.c b/shell/e-setup.c
index ee5227f789..220f68b4d5 100644
--- a/shell/e-setup.c
+++ b/shell/e-setup.c
@@ -34,10 +34,8 @@
#include <unistd.h>
#include <gtk/gtklabel.h>
-#include <libgnome/gnome-defs.h>
#include <libgnome/gnome-i18n.h>
#include <libgnome/gnome-util.h>
-#include <libgnomeui/gnome-stock.h>
#include <gal/widgets/e-gui-utils.h>
#include "e-local-folder.h"
@@ -418,41 +416,34 @@ e_setup (const char *evolution_directory)
void
-e_setup_check_db (Bonobo_ConfigDatabase db, const char *evolution_directory)
+e_setup_check_config (EConfigListener *listener,
+ const char *evolution_directory)
{
char *uri;
- if (bonobo_config_get_string_with_default (db, "/DefaultFolders/mail_path", NULL, NULL) == NULL) {
- bonobo_config_set_string (db, "/DefaultFolders/mail_path",
- E_LOCAL_INBOX_URI, NULL);
+ if (e_config_listener_get_string_with_default (listener, "/DefaultFolders/mail_path", NULL, NULL) == NULL) {
+ e_config_listener_set_string (listener, "/DefaultFolders/mail_path", E_LOCAL_INBOX_URI);
uri = g_strconcat ("file://", evolution_directory, "/local",
strrchr (E_LOCAL_INBOX_URI, '/'), NULL);
- bonobo_config_set_string (db, "/DefaultFolders/mail_uri",
- uri, NULL);
+ e_config_listener_set_string (listener, "/DefaultFolders/mail_uri", uri);
g_free (uri);
- bonobo_config_set_string (db, "/DefaultFolders/contacts_path",
- E_LOCAL_CONTACTS_URI, NULL);
+ e_config_listener_set_string (listener, "/DefaultFolders/contacts_path", E_LOCAL_CONTACTS_URI);
uri = g_strconcat ("file://", evolution_directory, "/local",
strrchr (E_LOCAL_CONTACTS_URI, '/'), NULL);
- bonobo_config_set_string (db, "/DefaultFolders/contacts_uri",
- uri, NULL);
+ e_config_listener_set_string (listener, "/DefaultFolders/contacts_uri", uri);
g_free (uri);
- bonobo_config_set_string (db, "/DefaultFolders/calendar_path",
- E_LOCAL_CALENDAR_URI, NULL);
+ e_config_listener_set_string (listener, "/DefaultFolders/calendar_path", E_LOCAL_CALENDAR_URI);
uri = g_strconcat ("file://", evolution_directory, "/local",
strrchr (E_LOCAL_CALENDAR_URI, '/'), NULL);
- bonobo_config_set_string (db, "/DefaultFolders/calendar_uri",
- uri, NULL);
+ e_config_listener_set_string (listener, "/DefaultFolders/calendar_uri", uri);
g_free (uri);
- bonobo_config_set_string (db, "/DefaultFolders/tasks_path",
- E_LOCAL_TASKS_URI, NULL);
+ e_config_listener_set_string (listener, "/DefaultFolders/tasks_path", E_LOCAL_TASKS_URI);
uri = g_strconcat ("file://", evolution_directory, "/local",
strrchr (E_LOCAL_TASKS_URI, '/'), NULL);
- bonobo_config_set_string (db, "/DefaultFolders/tasks_uri",
- uri, NULL);
+ e_config_listener_set_string (listener, "/DefaultFolders/tasks_uri", uri);
g_free (uri);
}
}