aboutsummaryrefslogtreecommitdiffstats
path: root/shell/e-shell-startup-wizard.c
diff options
context:
space:
mode:
authorEttore Perazzoli <ettore@src.gnome.org>2002-11-04 00:43:18 +0800
committerEttore Perazzoli <ettore@src.gnome.org>2002-11-04 00:43:18 +0800
commit8691f8584f1c892c93db43d0a2633a5746b28258 (patch)
tree9696e644f35c8788f175cd957f94845598a267c8 /shell/e-shell-startup-wizard.c
parent0ff7c1f97322f3e0f2c4c1bca6c9bef7cf9453c6 (diff)
downloadgsoc2013-evolution-8691f8584f1c892c93db43d0a2633a5746b28258.tar.gz
gsoc2013-evolution-8691f8584f1c892c93db43d0a2633a5746b28258.tar.zst
gsoc2013-evolution-8691f8584f1c892c93db43d0a2633a5746b28258.zip
Renamed from GNOME_Evolution_Shell.oaf.in.
* GNOME_Evolution_Shell.server.in: Renamed from GNOME_Evolution_Shell.oaf.in. * Makefile.am: Port from OAF to bonobo-activation. (INCLUDES): Define SYSCONFDIR, DATADIR, LIBDIR. * main.c (main): Use gnome_program_init(). * e-corba-storage-registry.c (e_corba_storage_registry_new): g_object_new(), not gtk_type_new(). (impl_finalize): New, ported over from destroy. (destroy): Removed. (class_init): Install finalize handler, not destroy handler, since we are not a GtkObject anymore. * e-corba-storage.c (e_corba_storage_new): g_object_new(), not gtk_type_new(). * e-shell.c (class_init): Override finalize, not destroy. (impl_finalize): Finalize implementation, basically the old destroy renamed. (e_shell_new): g_object_new(), not gtk_type_new(). (class_init): Use e_shell_marshal_NONE__INT for line_status_changed instead of using an ENUM. (e_shell_construct): Use g_signal_connect_object() instead of gtk_signal_connect_while_alive(). * e-setup.c (e_setup): Do not unref local_folder if NULL. * e-folder.c (init): Make not floating. (e_folder_construct): No need to make it floating here anymore. * e-shell.c (impl_Shell_selectUserFolder): For now don't set dialog parent from xid. * main.c (no_views_left_cb): Add missing GTK_SIGNAL_FUNC() cast. (new_view_created_callback): Likewise. (warning_dialog_clicked_callback): Update to use the EConfigListener from the shell instead of bonobo-conf. (show_development_warning): Likewise. (upgrade_from_1_0_if_needed): BONOBO_EX_ID -> BONOBO_EX_REPOID. (idle_cb): Use bonobo-activation and BONOBO_EX_REPOID(). (main): Cleaned up the various things that are unneeded in GNOME 2. (upgrade_from_1_0_if_needed): Use EConfigListener. * evolution-storage-set-view.h, evolution-storage-set-view.c: BonoboXObjectified. * e-storage.c (class_init): GLIB2-ified and made to use e-shell-marshal.h. (ES_CLASS): Use GTK_OBJECT_GET_CLASS(). (e_storage_new_folder): Added missing GTK_SIGNAL_FUNC() prototype. * e-storage-set.c (class_init): GLIB2-ified and made to use e-shell-marshal.h. * e-storage-set-view.c (popup_folder_menu): For now, do not add the pop-up since we lack bonobo_ui_container_get_win() and I am not sure how to work around it. (popup_folder_menu): Pass self as the for_widget arg to gnome_popup_menu_do_popup_modal(). (class_init): GLIB2-ified, and got to use e-shell-marshal.h. (marshal_NONE__GDKDRAGCONTEXT_STRING_STRING_STRING): Removed. (impl_tree_drag_data_get): Don't set the selection for now -- we have to fix the CORBA target stuff to match GTK 2. (e_storage_set_view_construct): Pass NULL as the opt_ev arg to bonobo_ui_component_set_container(). * e-splash.c: #include <libgnomecanvas/gnome-canvas-pixbuf.h> instead of <gdk-pixbuf/gnome-canvas-pixbuf.h>. (e_splash_new): Pass NULL as the error arg to gdk_pixbuf_new_from_file(). * e-shortcuts.c (class_init): GLIB2-ified. Also use the e-shell-marshal marshallers. (e_shortcuts_new_view): Add missing GTK_SIGNAL_FUNC() cast. * e-shortcuts-view.c: Use GTK_STOCK_* stuff instead of GNOME_STOCK_* stuff. (pop_up_right_click_menu_for_group): Pass self as the for_widget arg to gnome_popup_menu_do_popup_modal(). (pop_up_right_click_menu_for_shortcut): Likewise. (class_init): GLIB2-ified. * e-shell.c: Do not #include <gal/util/e-unicode-i18n.h> or #include <libgnome/gnome-defs.h>. (set_interactive): Use BONOBO_EX_REPOID(). (setup_local_storage): Use _() not U_(). (destroy): Use gtk_widget_destroy() instead of gtk_object_destroy() on priv->settings_dialog. (class_init): GLIB2-ized. (init): Initialize config_listener member. (get_icon_path_for_component_info): Port to bonobo-activation from OAF. (setup_components): Likewise. (destroy): Likewise. (e_shell_construct): Use e_setup_check_config(), not e_setup_check_db (). Use the e_config_listener instead of bonobo-conf. (save_settings_for_views): Likewise. (save_misc_settings): Likewise. (e_shell_restore_from_settings): Likewise. (parse_default_uri): Likewise. (e_shell_component_maybe_crashed): Pass NULL for opt_ev arg to bonobo_unkown_ping() (e_shell_component_maybe_crashed): Use bonobo_engine_deregister_dead_components() instead of bonobo_window_deregister_component_by_ref() which is no more. (e_shell_send_receive): BONOBO_EX_REPOID() instead of BONOBO_EX_ID(). (e_shell_get_config_listener): Return the config_listener. * e-shell-view.c (find_inbox_in_storage): Use _() instead of U_(). (load_images): Pass NULL as the error arg to gdk_pixbuf_new_from_file(). (load_images): Likewise. (find_inbox_in_storage): Work around the lack of g_utf8_strcasecmp() in glib-2.0. (class_init): GLIB2-ified. Also, use the marshallers in e-shell-marshal.h. (pop_up_folder_bar): Use gtk_window_move()/gtk_widget_show() instead gtk_widget_popup(). (unmerge_on_error): Work around the death of bonobo_ui_component_get_win() and bonobo_window_deregister_component_by_ref(). (e_shell_view_construct): Pass NULL as the uic arg to bonobo_window_construct(). Add missing GTK_SIGNAL_FUNC() cast. Match the new BonoboWindow behavior wrt the UIContainer and the new opt_ev args. (display_uri): Use bonobo_ui_engine_freeze() and bonobo_ui_engine_thaw() since bonobo_window_freeze() and bonobo_window_thaw() got axed [sigh]. (e_shell_view_save_settings): Use EConfigListener. (e_shell_view_load_settings): Likewise. (get_view_for_uri): Use bonobo_widget_new_control_from_objref() instead of e_bonobo_widget_new_control_from_objref(). * e-shell-view-menu.c (command_help_faq): Pass NULL for the error arg to gnome_url_show(). (command_about_box): Use GtkDialog instead of a GtkWindow of a type GTK_WINDOW_DIALOG [which does not exist anymore]. (command_xml_dump): Removed. (menu_do_misc): Do not add the corresponding verb. * e-shell-user-creatable-items-handler.c (execute_verb): Use BONOBO_EX_REPOID(). * e-shell-startup-wizard.c: Remove id member from SWData. Replace member db with config_listener. (e_shell_startup_wizard_create): Initialize config_listener. (make_mail_dialog_pages): Do not set the listener id here. (druid_event_notify_cb): Pass FALSE as the help_sensitive arg to gnome_druid_set_buttons_sensitive(). (e_shell_startup_wizard_create): Likewise. (make_mail_dialog_pages): Use bonobo-activation instead of OAF. (get_intelligent_importers): Likewise. (prepare_importer_page): Likewise. (start_importers): Do nothing here for now. (finish_func): Constify local variable displayname. (finish_func): Updated to use the config_listener instead of the bono-conf db. (prepare_importer_page): Do not actually run the importer yet. (e_shell_startup_wizard_create): Pass NULL as the domain arg to glade_xml_new(). Use the config_listener. * e-shell-shared-folder-picker-dialog.c (user_clicked): BONOBO_EX_REPOID() instead of BONOBO_EX_ID(). (setup_name_selector): Likewise. (setup_name_selector): Use bonobo-activation. (show_dialog): Pass NULL as the domain arg to glade_xml_new(). (setup_name_selector): Add a missing GTK_SIGNAL_FUNC() cast. * e-shell-settings-dialog.c: #include <bonobo-activation/bonobo-activation.h>. Use Bonobo_ActivationProperty instead of OAF_Property. (set_dialog_size): Use gtk_style_get_font() to get the font from the widget->style. (load_pages): Converted to use bonobo-activation instead of OAF. Pass NULL as the error arg to gdk_pixbuf_new_from_file(). * e-shell-offline-sync.c (sync_folder): BONOBO_EX_REPOID(), not BONOBO_EX_ID(). (e_shell_offline_sync_all_folders): For now, avoid doing anything [see changes to e-shell-config-offline.c below]. (setup_progress_listener): #if 0 for now. (setup_dialog): Likewise. (sync_folder): Likewise. (cleanup): Likewise. (progress_listener_servant_free): Likewise. (progress_listener_servant_new): Likewise. (impl_SyncFolderProgressListener_updateProgress): Likewise. (impl_SyncFolderProgressListener_reportSuccess): Likewise. (impl_SyncFolderProgressListener_reportFailure): Likewise. (progress_dialog_close_callback): Likewise. (progress_dialog_clicked_callback): Likewise. * e-shell-offline-handler.c (prepare_for_offline): Use BONOBO_EX_REPOID(). (pop_up_confirmation_dialog): Pass NULL as the domain arg to glade_xml_new(). (class_init): GLIB2-ified. * Makefile.am: Do not compile e-shell-importer.c, e-shell-importer.h for now. * e-shell-folder-title-bar.c (get_max_clipped_label_width): Use gtk_style_get_font() to retrieve the font. (class_init): GLIB2-ified. (e_shell_folder_title_bar_construct): Get {x,y}thickness from widget->style, not from widget->style->klass. * e-shell-folder-selection-dialog.c: #include <string.h>, <gtk/gtklabel.h> and <gtk/gtksignal.h>. (class_init): GLIB2-ified. * e-shell-folder-creation-dialog.c: No <libgnome/gnome-defs.h>, add some GTK includes. (e_shell_show_folder_creation_dialog): Pass NULL as the domain arg to glade_xml_new(). Added missing GTK_SIGNAL_FUNC() cast. * e-shell-folder-commands.c: Do not #include <libgnomeui/gnome-stock.h> and #include <bonobo-conf/Bonobo_Config.h>. * e-shell-config-default-folders.c: Replace member db in EvolutionDefaultFolderConfig with config_listener. (e_shell_config_default_folders_create_widget): Init here. (config_control_destroy_cb): Unref here. (config_control_apply_cb): Use EConfigListener instead of BonoboConf. (setup_folder_selector): Likewise. (e_shell_config_default_folders_create_widget): Pass NULL as the domain arg to glade_xml_new(). * e-shell-config-offline.c (config_control_apply_callback): For now, do not change the configuration. [Needs to be ported to EConfigListener or something, but we were storing a sequence using typecodes here and there is no trivial way to do that right now.] (init_storage_set_view_status_from_config): Likewise, do not retrieve the configuration here. svn path=/trunk/; revision=18510
Diffstat (limited to 'shell/e-shell-startup-wizard.c')
-rw-r--r--shell/e-shell-startup-wizard.c72
1 files changed, 32 insertions, 40 deletions
diff --git a/shell/e-shell-startup-wizard.c b/shell/e-shell-startup-wizard.c
index 3de62204dc..dacf62ead1 100644
--- a/shell/e-shell-startup-wizard.c
+++ b/shell/e-shell-startup-wizard.c
@@ -32,22 +32,21 @@
#include <gtk/gtk.h>
#include <gnome.h>
#include <glade/glade.h>
-#include <liboaf/liboaf.h>
#include <bonobo/bonobo-object.h>
#include <bonobo/bonobo-widget.h>
#include <bonobo/bonobo-exception.h>
#include <bonobo/bonobo-moniker-util.h>
-#include <bonobo-conf/bonobo-config-database.h>
+
+#include <bonobo-activation/bonobo-activation.h>
#include <gal/widgets/e-gui-utils.h>
#include <widgets/e-timezone-dialog/e-timezone-dialog.h>
-#include "importer/GNOME_Evolution_Importer.h"
-
#include "e-timezone-dialog/e-timezone-dialog.h"
#include "e-util/e-gtk-utils.h"
+#include "e-util/e-config-listener.h"
#include <evolution-wizard.h>
#include "Evolution.h"
@@ -96,9 +95,8 @@ typedef struct _SWData {
CORBA_Object mailer;
Bonobo_EventSource event_source;
BonoboListener *listener;
- int id;
- Bonobo_ConfigDatabase db;
+ EConfigListener *config_listener;
} SWData;
typedef struct _IntelligentImporterData {
@@ -134,7 +132,8 @@ druid_event_notify_cb (BonoboListener *listener,
gnome_druid_set_buttons_sensitive (GNOME_DRUID (data->druid),
(buttons & 4) >> 2,
(buttons & 2) >> 1,
- (buttons & 1));
+ (buttons & 1),
+ FALSE);
} else if (strcmp (name, EVOLUTION_WIZARD_SET_SHOW_FINISH) == 0) {
gnome_druid_set_show_finish (GNOME_DRUID (data->druid),
(gboolean) *((CORBA_boolean *) arg->_value));
@@ -153,7 +152,7 @@ make_mail_dialog_pages (SWData *data)
CORBA_Object object;
CORBA_exception_init (&ev);
- data->mailer = oaf_activate_from_id ("OAFIID:GNOME_Evolution_Mail_Wizard", 0, NULL, &ev);
+ data->mailer = bonobo_activation_activate_from_id ("OAFIID:GNOME_Evolution_Mail_Wizard", 0, NULL, &ev);
if (BONOBO_EX (&ev)) {
e_notice (NULL, GNOME_MESSAGE_BOX_ERROR,
_("Could not start the Evolution Mailer Assistant interface\n(%s)"), CORBA_exception_id (&ev));
@@ -177,8 +176,9 @@ make_mail_dialog_pages (SWData *data)
gtk_signal_connect (GTK_OBJECT (data->listener), "event-notify",
GTK_SIGNAL_FUNC (druid_event_notify_cb), data);
object = bonobo_object_corba_objref (BONOBO_OBJECT (data->listener));
+
CORBA_exception_init (&ev);
- data->id = Bonobo_EventSource_addListener (data->event_source, object, &ev);
+ Bonobo_EventSource_addListener (data->event_source, object, &ev);
CORBA_exception_free (&ev);
}
@@ -263,6 +263,7 @@ free_importers (SWData *data)
static void
start_importers (GList *p)
{
+#if 0
CORBA_Environment ev;
for (; p; p = p->next) {
@@ -276,6 +277,7 @@ start_importers (GList *p)
}
CORBA_exception_free (&ev);
}
+#endif
}
static void
@@ -335,7 +337,8 @@ finish_func (GnomeDruidPage *page,
SWData *data)
{
CORBA_Environment ev;
- char *displayname, *tz;
+ const char *displayname;
+ char *tz;
icaltimezone *zone;
/* Notify mailer */
@@ -344,7 +347,6 @@ finish_func (GnomeDruidPage *page,
CORBA_exception_free (&ev);
/* Set Timezone */
- CORBA_exception_init (&ev);
e_timezone_dialog_get_timezone (E_TIMEZONE_DIALOG (data->timezone_page->etd), &displayname);
/* We know it is a builtin timezone, as that is all the user can change
@@ -355,9 +357,8 @@ finish_func (GnomeDruidPage *page,
else
tz = g_strdup (icaltimezone_get_location (zone));
- bonobo_config_set_string (data->db, "/Calendar/Display/Timezone", tz, &ev);
+ e_config_listener_set_string (data->config_listener, "/Calendar/Display/Timezone", tz);
g_free (tz);
- CORBA_exception_free (&ev);
do_import (data);
@@ -598,17 +599,17 @@ make_timezone_page (SWData *data)
static GList *
get_intelligent_importers (void)
{
- OAF_ServerInfoList *info_list;
+ Bonobo_ServerInfoList *info_list;
GList *iids_ret = NULL;
CORBA_Environment ev;
int i;
CORBA_exception_init (&ev);
- info_list = oaf_query ("repo_ids.has ('IDL:GNOME/Evolution/IntelligentImporter:1.0')", NULL, &ev);
+ info_list = bonobo_activation_query ("repo_ids.has ('IDL:GNOME/Evolution/IntelligentImporter:1.0')", NULL, &ev);
CORBA_exception_free (&ev);
for (i = 0; i < info_list->_length; i++) {
- const OAF_ServerInfo *info;
+ const Bonobo_ServerInfo *info;
info = info_list->_buffer + i;
iids_ret = g_list_prepend (iids_ret, g_strdup (info->iid));
@@ -654,25 +655,27 @@ prepare_importer_page (GnomeDruidPage *page,
if (importers == NULL) {
/* No importers, go directly to finish, do not pass go
Do not collect $200 */
- gnome_druid_set_page (druid, GNOME_DRUID_PAGE (data->finish))
-;
+ gnome_druid_set_page (druid, GNOME_DRUID_PAGE (data->finish));
gtk_widget_destroy (dialog);
return TRUE;
}
table = gtk_table_new (g_list_length (importers), 2, FALSE);
for (l = importers; l; l = l->next) {
+#if 0
GtkWidget *label;
- IntelligentImporterData *id;
CORBA_Environment ev;
gboolean can_run;
char *str;
+#endif
+ IntelligentImporterData *id;
id = g_new0 (IntelligentImporterData, 1);
id->iid = g_strdup (l->data);
+#if 0 /* FIXME */
CORBA_exception_init (&ev);
- id->object = oaf_activate_from_id ((char *) id->iid, 0, NULL, &ev);
+ id->object = bonobo_activation_activate_from_id ((char *) id->iid, 0, NULL, &ev);
if (BONOBO_EX (&ev)) {
g_warning ("Could not start %s:%s", id->iid,
CORBA_exception_id (&ev));
@@ -775,6 +778,7 @@ prepare_importer_page (GnomeDruidPage *page,
gtk_box_pack_start (GTK_BOX (data->import_page->vbox), table,
FALSE, FALSE, 0);
+#endif
}
if (running == 0) {
@@ -838,31 +842,21 @@ gboolean
e_shell_startup_wizard_create (void)
{
SWData *data;
- CORBA_Environment ev;
int num_accounts;
data = g_new0 (SWData, 1);
- CORBA_exception_init (&ev);
- data->db = bonobo_get_object ("wombat:", "Bonobo/ConfigDatabase", &ev);
- if (BONOBO_EX (&ev) || data->db == CORBA_OBJECT_NIL) {
- g_warning ("Error starting wombat: (%s)", CORBA_exception_id (&ev));
- CORBA_exception_free (&ev);
- g_free (data);
-
- return FALSE;
- }
+ data->config_listener = e_config_listener_new();
- num_accounts = bonobo_config_get_long_with_default (data->db, "/Mail/Accounts/num", 0, NULL);
- CORBA_exception_free (&ev);
+ num_accounts = e_config_listener_get_long_with_default (data->config_listener, "/Mail/Accounts/num", 0, NULL);
if (num_accounts != 0) {
- bonobo_object_release_unref (data->db, NULL);
+ g_object_unref (data->config_listener);
g_free (data);
return TRUE;
}
- data->wizard = glade_xml_new (EVOLUTION_GLADEDIR "/evolution-startup-wizard.glade", NULL);
+ data->wizard = glade_xml_new (EVOLUTION_GLADEDIR "/evolution-startup-wizard.glade", NULL, NULL);
g_return_val_if_fail (data->wizard != NULL, FALSE);
data->dialog = glade_xml_get_widget (data->wizard, "startup-wizard");
g_return_val_if_fail (data->dialog != NULL, FALSE);
@@ -873,7 +867,7 @@ e_shell_startup_wizard_create (void)
data->druid = glade_xml_get_widget (data->wizard, "startup-druid");
g_return_val_if_fail (data->druid != NULL, FALSE);
gnome_druid_set_buttons_sensitive (GNOME_DRUID (data->druid),
- FALSE, TRUE, FALSE);
+ FALSE, TRUE, FALSE, FALSE);
gtk_signal_connect (GTK_OBJECT (data->druid), "cancel",
GTK_SIGNAL_FUNC (startup_wizard_cancel), data);
@@ -905,15 +899,13 @@ e_shell_startup_wizard_create (void)
g_return_val_if_fail (data->timezone_page != NULL, TRUE);
g_return_val_if_fail (data->import_page != NULL, TRUE);
- gnome_druid_set_buttons_sensitive (GNOME_DRUID (data->druid), FALSE, TRUE, TRUE);
+ gnome_druid_set_buttons_sensitive (GNOME_DRUID (data->druid), FALSE, TRUE, TRUE, FALSE);
gtk_widget_show_all (data->dialog);
gtk_main ();
- /* Sync database */
- Bonobo_ConfigDatabase_sync (data->db, &ev);
- bonobo_object_release_unref (data->db, NULL);
- CORBA_exception_free (&ev);
+ g_object_unref (data->config_listener);
+ data->config_listener = NULL;
return !data->cancel;
}