diff options
Diffstat (limited to 'my-evolution')
| -rw-r--r-- | my-evolution/ChangeLog | 480 | ||||
| -rw-r--r-- | my-evolution/Locations | 65 | ||||
| -rw-r--r-- | my-evolution/e-summary-preferences.c | 614 |
3 files changed, 469 insertions, 690 deletions
diff --git a/my-evolution/ChangeLog b/my-evolution/ChangeLog index 89018b2a22..b9c19c7275 100644 --- a/my-evolution/ChangeLog +++ b/my-evolution/ChangeLog @@ -1,484 +1,14 @@ -2003-03-31 Larry Ewing <lewing@ximian.com> +2003-01-24 Ettore Perazzoli <ettore@ximian.com> - * e-summary-factory.c: make the verbs static so they don't enter - the global namespace. - -2003-03-27 Ettore Perazzoli <ettore@ximian.com> - - [#40358] - - * e-summary.c (e_summary_init): Likewise. - - * e-summary-weather.c (e_summary_weather_get_html): Likewise. - (weather_make_html): Likewise. - - * e-summary-mail.c (e_summary_mail_generate_html): Fix so it - handles the fact that the translated strings are already in UTF8. - * e-summary-rdf.c (tree_walk): Likewise. - (display_doc): Likewise. - -2003-03-27 Not Zed <NotZed@Ximian.com> - - ** see bug #40141 - - * e-summary-preferences.c (config_control_destroy_cb): Dont save - prefs here, but restore the last saved. - (config_control_apply_cb): save preferences here. - -2003-03-26 Ettore Perazzoli <ettore@ximian.com> - - * e-summary-mail.c: New member physical_uri in struct - ESummaryMailFolder. - (new_folder_cb): Set it. - (remove_folder_cb): Free it. - (make_pretty_foldername): Rewritten to honour the display_name. - [#7153] - - * e-summary.c (destroy): Only remove the source with ID - tomorrow_timeout_id if the ID is nonzero. - -2003-03-25 Dan Winship <danw@ximian.com> - - * e-summary.c: Update for e_notice move - (do_summary_print): Pass a parent_window to e_notice - -2003-03-19 Ettore Perazzoli <ettore@ximian.com> - - * e-summary-calendar.c (generate_html): Add a %P in the strftime - string for the case when the user wants am/pm format. [#19957] - -2003-03-13 Mike Kestner <mkestner@ximian.com> - - * e-summary-preferences.c (fill_rdf_etable): pass FALSE for - expand to e_summary_shown_add_node. - * e-summary-shown.c (make_table): ditto, set_expanded_default to FALSE. - (add_node): only call e_tree_node_set_expanded is expanded != default. - * e-summary-weather.c (*_fill_etable): pass FALSE for expand to - e_summary_shown_add_node. - -2003-03-13 Ettore Perazzoli <ettore@ximian.com> - - * e-summary-calendar.c (generate_html): Changed so its printf()s - are protected against default_uri being NULL. Also, no need to do - e_utf8_from_locale_string() anymore. - -2003-03-12 Dan Winship <danw@ximian.com> - - * e-summary-shown.c (e_summary_shown_freeze, - e_summary_shown_thaw): New, to free/thaw the ETree models. - (e_summary_shown_add_node): Don't freeze/thaw around the single - add here. That doesn't really help much. - - * e-summary-preferences.c (fill_rdf_etable): Freeze/thaw the - ESummaryShown while filling it in. - - * e-summary-weather.c (e_summary_weather_fill_etable): Likewise. - -2003-03-07 Ettore Perazzoli <ettore@ximian.com> - - * Locations (name): Add some escapes to the newly added locations - so they get split properly. - - * e-summary-weather.c (e_summary_weather_init_locations): Fetch - the Locations file from the right path. If you find an invalid - entry in the Locations file, complain with an informative - g_warning() instead of just returning FALSE. - (e_summary_weather_fill_etable): Do the same thing here. - -2003-03-06 Ettore Perazzoli <ettore@ximian.com> - - * e-summary-calendar.c (generate_html): Added the AM/PM part when - not in "wants24hr" mode; moved the date before the time instead of - vice versa. Also, do not check the boolean value against TRUE! - -2003-03-06 Ettore Perazzoli <ettore@ximian.com> - - * Locations: Added more Swedish locations, submitted by Marten - Woxberg. [See #5344] - -2003-03-06 Ettore Perazzoli <ettore@ximian.com> - - * e-summary-calendar.c (e_summary_calendar_protocol): Use - G_GNUC_FUNCTION instead of __FUNCTION__. - * e-summary-rdf.c (e_summary_rdf_update): Likewise. - * e-summary-tasks.c (e_summary_tasks_protocol): Likewise. - (e_summary_tasks_protocol): Likewise. - * e-summary-weather.c (e_summary_weather_update): Likewise. - ->>>>>>> 1.264 -2003-03-05 Ettore Perazzoli <ettore@ximian.com> - - * e-summary-weather.c (e_summary_weather_set_online): Likewise, - assume weather_refresh_time of zero means "never update the - weather". - (e_summary_weather_init): Likewise here. - (e_summary_weather_reconfigure): And here. - - * e-summary-rdf.c (e_summary_rdf_init): Don't add the news feeds - here -- it should be handled with a GConf schema. Also, assume - that prefs is always not NULL (as is the case with the current - code), and interpret a timeout value of zero as "never update - automatically". - (e_summary_rdf_reconfigure): Likewise here. If rdf->timeout is - zero, assume there is no pending timeout. - (e_summary_rdf_set_online): Likewise here. Sigh, so much - duplication in this code. - -2003-03-05 Not Zed <NotZed@Ximian.com> - - * component-factory.c (owner_unset_cb): dont call bonobo_main_quit - anymore now we're shlib'ised. - -2003-02-28 Dan Winship <danw@ximian.com> - - * e-summary.c (e_summary_init): Don't need to use libalarm to set - a timeout to change the date. We know how many seconds away it is, - so we can just set a timeout for then. - - * Makefile.am (summary_libs): Remove libalarm.a - -2003-02-21 Dan Winship <danw@ximian.com> - - * Makefile.am (summary_libs): clean up - -2003-02-20 Dan Winship <danw@ximian.com> - - * Makefile.am (summary_libs): - s/libemiscwidgets.a/libemiscwidgets.la/ - -2003-02-19 Dan Winship <danw@ximian.com> - - * e-summary-rdf.c: Declare xmlSubstituteEntitiesDefaultValue - extern. - (message_finished): And set its value here. Fixes a duplicate - symbol error on OS X. - -2003-02-10 Ettore Perazzoli <ettore@ximian.com> - - * Makefile.am: Split the IDL generated rules so ${ORBIT_IDL} - doesn't get invoked multiple times in parallel. - (BUILT_SOURCES): Added this. - (CLEANFILES): And this. - -2003-02-06 Dan Winship <danw@ximian.com> - - * Makefile.am (INCLUDES): Fix typo in previous commit - -2003-02-06 Dan Winship <danw@ximian.com> - - * Makefile.am: clean up, update, etc - - * component-factory.c: #include string.h - - * e-summary.c (e_pixmap_file): s/IMAGEDIR/IMAGESDIR/ - - * e-summary-rdf.c: Fix some warnings - -2003-02-05 Dan Winship <danw@ximian.com> - - * e-summary-offline-handler.c: s/BonoboXObject/BonoboObject/ - -2003-01-23 Ettore Perazzoli <ettore@ximian.com> - - * Makefile.am (componentdir): Removed definition; this is now - defined in configure.in. - -2003-01-22 Ettore Perazzoli <ettore@ximian.com> - - * e-summary-factory.c (control_activate): Get my-evolution.xml - from EVOLUTION_UI_DIRECTORY. - - * e-summary.c (e_pixmap_file): Use EVOLUTION_IMAGEDIR. - (e_pixmap_file): Use EVOLUTION_BUTTONSDIR. - - * e-summary-weather.c (e_summary_weather_init_locations): Use - LOCATIONDIR. - (e_summary_weather_fill_etable): Likewise. - - * Makefile.am (Locationdir): Version using $(BASE_VERSION). - (gladedir): Likewise. - (INCLUDES): Define EVOLUTION_IMAGEDIR. + * e-summary-preferences.c (config_control_apply_cb): + display_folders is a list of folders, not a list of strings, treat + accordingly. [#36557, patch from Harry Lu <harry.lu@sun.com>.] 2003-01-20 Ettore Perazzoli <ettore@ximian.com> - * Locations: Updated locations for EU_FI, contributed by Pekka + * Locations: Update locations for EU_FI, contributed by Pekka Pietikainen <Pekka.Pietikainen@nixu.com>. -2003-01-14 Ettore Perazzoli <ettore@ximian.com> - - * Makefile.am (EXTRA_DIST): Add $(schema_DATA). - -2003-01-13 Not Zed <NotZed@Ximian.com> - - * e-summary-preferences.c (e_summary_preferences_save): fix a - past-o with the physical_uri_list prepend. - -2003-01-10 Not Zed <NotZed@Ximian.com> - - * e-summary-mail.c (new_folder_cb): glist->gslist for - display_folders list - (mail_change_notify): " - (e_summary_mail_reconfigure): ", and also traverse the list - forwards, since we can't go backwards since its now an slist. - - * e-summary-preferences.c (e_summary_preferences_restore): append - new folder entries to the folders list. - (config_control_apply_cb): display_folders is a list of folders, - not a list of strings, treat accordingly. - -2003-01-09 Chris Toshok <toshok@ximian.com> - - * e-summary-preferences.c (e_summary_preferences_create_control): - change gtk_widget_show to gtk_widget_show_all so all the various - custom widgets are displayed. - -2003-01-08 Ettore Perazzoli <ettore@ximian.com> - - * e-summary.c (e_pixmap_file): Update to use - $(datadir)/evolution/images/ instead of - $(datadir)/images/evolution to fetch the icons. - -2002-12-16 Ettore Perazzoli <ettore@ximian.com> - - * e-summary-shown.c (make_table): Do not ref/sink the ETreeMemory - object. - -2002-12-11 Kevin Breit <mrproper@ximian.com> - - * Locations: Removed Marquette from the listing, it is no longer - listed by METAR. This is per bug 29693. - - * Locations.h: Removed Marquette from the listing, it is no longer - listed by METAR. - -2002-12-06 Ettore Perazzoli <ettore@ximian.com> - - * component-factory.c: Change description passed to - BONOBO_ACTIVATION_SHLIB_FACTORY to correctly say we are a factroy. - -2002-12-04 Ettore Perazzoli <ettore@ximian.com> - - * Makefile.am (componentdir): Install in $(COMPONENT_DIR), not in - ${prefix}/evolution/components. - -2002-12-04 Ettore Perazzoli <ettore@ximian.com> - - * GNOME_Evolution_Summary.server.in.in: Updated to be a shared - library. - - * main.c: Removed. - - * Makefile.am: Update to compile as a shared library. - - * component-factory.c: Changed to be a shared library factory, for - both the ShellComponent and the ConfigControl objects. - - * e-summary-preferences.c - (e_summary_preferences_init_config_control): Renamed from - e_summary_preferences_register_config_control_factory. - (e_summary_preferences_create_control): Renamed from factory_fn - and removed all args. - -2002-11-27 Not Zed <NotZed@Ximian.com> - - * e-summary-shown.c (e_summary_shown_init): GNOME_STOCK_*NEXT/PREV -> - GTK_STOCK_*GO_BACK/FORWARD. - - * e-summary.[ch]: ran fix.sh over this. - -2002-11-25 Ettore Perazzoli <ettore@ximian.com> - - * component-factory.c (component_destroy): Removed. - (create_component): Do not connect. - -2002-11-20 Ettore Perazzoli <ettore@ximian.com> - - * component-factory.c (owner_unset_cb): bonobo_main_quit() instead - of gtk_main_quit(). - (component_destroy): Likewise. - -2002-11-20 Ettore Perazzoli <ettore@ximian.com> - - * component-factory.c: Removed unused #define - COMPONENT_FACTORY_ID. - (component_factory_init): Removed unused variable. - - * GNOME_Evolution_Summary.server.in.in: Updated to not use a - factory, which is what the code actually expects. - -2002-11-20 Ettore Perazzoli <ettore@ximian.com> - - * e-summary.c (e_summary_init): Use GConf. - - * e-summary-tasks.c: Replaced member config_listener in - ESummaryTasks with a gconf_client. - (setup_gconf_client): Renamed from setup_config_listener(). Set - up the GConf client and invoke gconf_client_add_dir() on the - interesting namespaces. - (gconf_client_value_changed_cb): Renamed from - config_listener_value_changed_cb and changed prototype to match - that of the "value_changed" signal in GConfClient. - (setup_task_folder): Updated to use GConf. - - * e-summary-calendar.c: Replaced member config_listener with a - gconf_listener. - (setup_calendar): Use GConf. - (setup_gconf_client): Renamed from setup_config_listener. Set up - a GConf client and invoke gconf_client_add_dir() on the - interesting namespaces. - (gconf_client_value_changed_cb): Renamed from - config_listener_key_changed_cb() and changed prototype to match - that of the "value_changed" signal in GConfClient. - (locale_uses_24h_time_format): Removed. - (e_summary_calendar_free): g_object_unref() the gconf_client. - - * Makefile.am: Add rules to install the schemas. - - * apps_evolution_summary.schemas: New. - - * e-summary-preferences.c: Did a global GList -> GSList switch. - (e_summary_preferences_restore): Use GConfClient instead of - EConfigListener. - (vector_from_folder_list): Removed since GConf makes this useless. - (folder_list_from_vector): Likewise. - (str_list_from_vector): Likewise. - (vector_from_str_list): Likewise. - (make_initial_weather_list): Likewise. - (make_initial_rdf_list): Likewise. - (make_initial_mail_list): Likewise. - (e_summary_preferences_save): Use GConf. - (e_summary_preferences_init): No need to set up defaults here. - - * e-summary.h: Changed members display_folders, rdf_urls, stations - in ESummaryPrefs to be GSLists instead of GLists; updated all the - functions that use them accordingly. - -2002-11-14 Ettore Perazzoli <ettore@ximian.com> - - * Makefile.am: Added rule to generate - GNOME_Evolution_Summary.server.in from - GNOME_Evolution_Summary.server.in.in, substituting @LIBEXECDIR@. - Also, install evolution-executive-summary in $libexecdir instead - of $bindir. - - * GNOME_Evolution_Summary.server.in.in: Removed the @OAF_SHLIB_*@ - stuff and added @LIBEXECDIR@/ to the executable's name instead. - -2002-11-14 Ettore Perazzoli <ettore@ximian.com> - - * my-evolution.glade: Converted to Glade 2. - -2002-11-14 Ettore Perazzoli <ettore@ximian.com> - - * e-summary-calendar.c: Replaced all gtk_signal_connect() calls - with g_signal_connect() ones. - * e-summary-mail.c: Likewise. - * e-summary-offline-handler.c: Likewise. - * e-summary-preferences.c: Likewise. - * e-summary-shown.c: Likewise. - * e-summary-tasks.c: Likewise. - * e-summary.c: Likewise. - -2002-11-11 Ettore Perazzoli <ettore@ximian.com> - - * e-summary-factory.c (control_destroy_cb): gtk_widget_destroy() - instead of gtk_object_destroy(). - (e_summary_factory_new_control): Likewise. - - * e-summary-calendar.c: Use g_object_ref()/g_object_unref() - instead of gtk_object_ref()/gtk_object_unref(). - * e-summary-preferences.c: Likewise. - * e-summary-shown.c: Likewise. - * e-summary-table.c: Likewise. - * e-summary-tasks.c: Likewise. - * e-summary.c: Likewise. - - * e-summary-preferences.c (e_summary_preferences_make_mail_table): - g_object_set_data() instead of gtk_object_set_data(). - (make_property_dialog): g_object_get_data() instead of - gtk_object_get_data(). - (get_folders_from_view): Likewise. - - * component-factory.c (create_view): Use - evolution_shell_client_corba_objref() instead of - bonobo_object_corba_objref() on the EvolutionShellClient object. - Also, use g_object_get_data() instead of gtk_object_get_data(). - (owner_set_cb): Likewise. - (create_component): Use g_object_set_data() instead of - gtk_object_set_data(). - -2002-11-11 Ettore Perazzoli <ettore@ximian.com> - - * e-summary-rdf.c: Convert to use libxml2. - -2002-11-11 Ettore Perazzoli <ettore@ximian.com> - - * e-summary-offline-handler.c: Convert from GtkObject to GObject. - -2002-11-07 Ettore Perazzoli <ettore@ximian.com> - - * GNOME_Evolution_Summary.server.in.in: Renamed from - GNOME_Evolution_Summary.oaf.in.in. - - * Makefile.am: GNOME_Evolution_Summary.server instead of .oaf. - -2002-11-05 Ettore Perazzoli <ettore@ximian.com> - - * metar.c: #include <string.h>. - - * main.c (main): Use gnome_program_init(). - - * e-summary-tasks.c (e_summary_tasks_protocol): Use - bonobo-activation. - - * e-summary-table.c (set_value_at): Use g_signal_emit() instead of - gtk_signal_emit(). - - * e-summary-shown.c (e_summary_shown_class_init): GObjectified. - (construct_pixmap_button): Use gtk_image_new_from_stock() instead - of gnome_stock_pixmap_new(). - - * e-summary-preferences.c (e_summary_preferences_restore): Use - EConfigListener. - (add_dialog_clicked_cb): Add some missing consts. - (factory_fn): Pass NULL as the domain arg to glade_xml_new(). - (factory_fn): Add id arg. - (e_summary_preferences_register_config_control_factory): - - * e-summary-mail.c (e_summary_folder_init_folder_store): Use - bonobo-activation. - - * e-summary-factory.c (control_activate): Pass NULL ev arg to - bonobo functions that now need it. - (control_deactivate): Likewise. - (control_activate_cb): Likewise. - (e_summary_factory_new_control): Use g_signal_connect() instead of - gtk_signal_connect(). - - * e-summary-calendar.c (e_summary_calendar_protocol): Use - bonobo_activation. - - * e-summary.c: Update gnome-print #includes. Added some missing - #includes. - (e_summary_url_clicked): Pass NULL as the error arg to - gnome_url_show(). - (do_summary_print): Use GnomePrintConfig instead of GnomePrinter - et al. - - * e-cell-tri.h: Removed BEGIN_GNOME_DECLS/END_GNOME_DECLS. - - * e-summary.c: Removed #include <libgnome/gnome-defs.h>. Ported - to e-config-listener.c. - - * e-cell-tri.h: Removed #include <libgnome/gnome-defs.h>. - - * component-factory.c: #include <gtk/gtkmain.h>. - (create_component): Use g_signal_connect. Match prototype with - the one required by bonobo_generic_factory(). - - * Makefile.am: Add @INTLTOOL_SERVER_RULE@. - ($(MAIL_GENERATED)): Update with new ORBit rules. - 2002-10-25 Ettore Perazzoli <ettore@ximian.com> * e-cell-tri.c (set_value): Removed debugging message. diff --git a/my-evolution/Locations b/my-evolution/Locations index c7d42f2298..6b904fc78a 100644 --- a/my-evolution/Locations +++ b/my-evolution/Locations @@ -1063,18 +1063,19 @@ loc17=Jackson KJXN MIZ074 dtw loc18=Kalamazoo KAZO MIZ072 045 loc19=Lansing KLAN MIZ066 --- loc20=Manistee KMBL MIZ031 --- -loc21=Menominee KMNM MIZ012 --- -loc22=Mount\\ Clemens KMTC MIZ070 --- -loc23=Muskegon KMKG MIZ050 --- -loc24=Oscoda KOSC MIZ036 --- -loc25=Pellston KPLN MIZ016 --- -loc26=Pontiac KPTK MIZ069 --- -loc27=Saginaw KMBS MIZ053 --- -loc28=Sault\\ Ste\\ Marie KSSM MIZ008 --- -loc29=Sawyer\\ AFB KSAW MIZ077 --- -loc30=Seul\\ Choix\\ Pt KP75 ------ --- -loc31=Traverse\\ City KTVC MIZ020 --- -loc32=Ypsilanti KYIP MIZ075 dtw +loc21=Marquette KMQT MIZ005 --- +loc22=Menominee KMNM MIZ012 --- +loc23=Mount\\ Clemens KMTC MIZ070 --- +loc24=Muskegon KMKG MIZ050 --- +loc25=Oscoda KOSC MIZ036 --- +loc26=Pellston KPLN MIZ016 --- +loc27=Pontiac KPTK MIZ069 --- +loc28=Saginaw KMBS MIZ053 --- +loc29=Sault\\ Ste\\ Marie KSSM MIZ008 --- +loc30=Sawyer\\ AFB KSAW MIZ077 --- +loc31=Seul\\ Choix\\ Pt KP75 ------ --- +loc32=Traverse\\ City KTVC MIZ020 --- +loc33=Ypsilanti KYIP MIZ075 dtw [US_MN] name=Minnesota @@ -1944,32 +1945,20 @@ loc2=Portoroz LJPZ ------ --- [EU_SE] name=Sweden -loc0=Borlange ESSD ------ -- -loc1=Gavle\\ Sandviken ESSK ------ -- -loc2=Gallivare ESNG ------ -- -loc3=Goteborg\\ (Landvetter) ESGG ------ -- -loc4=Goteborg\\ (Save) ESGP ------ -- -loc5=Hagshult ESMV ------ -- -loc6=Halmstad\\ (Swedish\\ Air\\ Force\\ Base) ESMT ------ -- -loc7=Hultsfred\\ (Swedish\\ Air\\ Force\\ Base) ESSF ------ -- -loc8=Jonkoping ESGJ ------ --- -loc9=Kiruna ESNQ ------ --- -loc10=Linkoping\\ (Malmen) ESCF ------ -- -loc11=Linkoping\\ (Saab) ESSL ------ -- -loc12=Lulea\\ (Kallax) ESPA ------ -- -loc13=Malmo\\ (Sturup) ESMS ------ -- -loc14=Norrkoping ESSP ------ --- -loc15=Ronneby ESDF ------ --- -loc16=Stockholm\\ (Arlanda) ESSA ------ -- -loc17=Stockholm\\ (Bromma) ESSB ------ -- -loc18=Sundsvall-Harnosand ESNN ------ -- -loc19=Umea ESNU ------ --- -loc20=Vasteras ESOW ------ --- -loc21=Vaxjo ESMX ------ --- -loc22=Visby ESSV ------ -- -loc23=Angelholm ESDB ------ -- -loc24=Ornskoldsvik ESNO ------ -- -loc25=Ostersund\\ (Froson) ESPC ------ -- +loc0=Goteborg\\ (Landvetter) ESGG ------ --- +loc1=Goteborg\\ (Save) ESGP ------ --- +loc2=Jonkoping ESGJ ------ --- +loc3=Kiruna ESNQ ------ --- +loc4=Malmo/Sturup ESMS ------ --- +loc5=Norrkoping ESSP ------ --- +loc6=Ronneby ESDF ------ --- +loc7=Stockholm\\ (Arlanda) ESSA ------ --- +loc8=Stockholm\\ (Bromma) ESSB ------ --- +loc9=Sundsvall-Harnosand ESNN ------ --- +loc10=Umea ESNU ------ --- +loc11=Vasteras ESOW ------ --- +loc12=Vaxjo ESMX ------ --- +loc13=Visby ESSV ------ --- [EU_CH] name=Switzerland diff --git a/my-evolution/e-summary-preferences.c b/my-evolution/e-summary-preferences.c index c99069c0d2..692ba16a5e 100644 --- a/my-evolution/e-summary-preferences.c +++ b/my-evolution/e-summary-preferences.c @@ -1,7 +1,7 @@ /* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */ /* e-summary-preferences.c * - * Copyright (C) 2001, 2002 Ximian, Inc. + * Copyright (C) 2001 Ximian, Inc. * * This program is free software; you can redistribute it and/or * modify it under the terms of version 2 of the GNU General Public @@ -26,11 +26,13 @@ #include <gtk/gtk.h> +#include <libgnome/gnome-defs.h> #include <libgnome/gnome-util.h> #include <libgnome/gnome-i18n.h> #include <libgnome/gnome-config.h> #include <libgnomeui/gnome-propertybox.h> +#include <libgnomeui/gnome-stock.h> #include <glade/glade.h> #include <stdio.h> @@ -42,12 +44,10 @@ #include <bonobo/bonobo-control.h> #include <bonobo/bonobo-widget.h> -#include <gconf/gconf-client.h> +#include <bonobo-conf/bonobo-config-database.h> #include <shell/evolution-storage-set-view-listener.h> -#include <string.h> - #include "e-summary.h" #include "e-summary-preferences.h" #include "e-summary-table.h" @@ -55,125 +55,335 @@ #include "evolution-config-control.h" +#define FACTORY_ID "OAFIID:GNOME_Evolution_Summary_ConfigControlFactory" + static ESummaryPrefs *global_preferences = NULL; static GNOME_Evolution_Shell global_shell = NULL; -gboolean -e_summary_preferences_restore (ESummaryPrefs *prefs) +static char *default_folders[2] = { + "/local/Inbox", "/local/Outbox" +}; + +static void +make_initial_mail_list (ESummaryPrefs *prefs) { - GConfClient *gconf_client; - GSList *path_list; - GSList *uri_list; - GSList *p, *q; + char *evolution_dir; + GList *folders = NULL; + int i; + + evolution_dir = gnome_util_prepend_user_home ("evolution"); + for (i = 0; i < 2; i++) { + ESummaryPrefsFolder *folder; - g_return_val_if_fail (prefs != NULL, FALSE); + folder = g_new (ESummaryPrefsFolder, 1); + folder->evolution_uri = g_strconcat ("evolution:", default_folders[i], NULL); + folder->physical_uri = g_strconcat ("file://", evolution_dir, default_folders[i], NULL); + + folders = g_list_append (folders, folder); + } + + g_free (evolution_dir); + prefs->display_folders = folders; +} + +static void +make_initial_rdf_list (ESummaryPrefs *prefs) +{ + GList *rdfs; + + rdfs = g_list_prepend (NULL, g_strdup ("http://linuxtoday.com/backend/my-netscape.rdf")); + rdfs = g_list_append (rdfs, g_strdup ("http://www.salon.com/feed/RDF/salon_use.rdf")); + + prefs->rdf_urls = rdfs; +} + +static void +make_initial_weather_list (ESummaryPrefs *prefs) +{ + /* translators: Put a list of codes for locations you want to see in + My Evolution by default here. You can find the list of all + stations and their codes in Evolution sources. + (evolution/my-evolution/Locations) + Codes are seperated with : eg. "KBOS:EGAA"*/ + char *default_stations = _("KBOS"), **stations_v, **p; + GList *stations = NULL; + + stations_v = g_strsplit (default_stations, ":", 0); + g_assert (stations_v != NULL); + for (p = stations_v; *p != NULL; p++) { + stations = g_list_prepend (stations, *p); + } + g_free (stations_v); + + prefs->stations = g_list_reverse (stations); +} + +/* Load the prefs off disk */ + +static char * +vector_from_str_list (GList *strlist) +{ + char *vector; + GString *str; + + if (strlist == NULL) { + return g_strdup (""); + } + + str = g_string_new (""); + for (; strlist; strlist = strlist->next) { + g_string_append (str, strlist->data); + + /* No space at end */ + if (strlist->next) { + g_string_append (str, " !<-->! "); + } + } + + vector = str->str; + g_string_free (str, FALSE); + + return vector; +} + +static GList * +str_list_from_vector (const char *vector) +{ + GList *strlist = NULL; + char **tokens, **t; + + t = tokens = g_strsplit (vector, " !<-->! ", 8196); + + if (tokens == NULL) { + return NULL; + } - gconf_client = gconf_client_get_default (); + for (; *tokens; tokens++) { + strlist = g_list_prepend (strlist, g_strdup (*tokens)); + } - path_list = gconf_client_get_list (gconf_client, "/apps/evolution/summary/mail/folder_evolution_uris", - GCONF_VALUE_STRING, NULL); - uri_list = gconf_client_get_list (gconf_client, "/apps/evolution/summary/mail/folder_physical_uris", - GCONF_VALUE_STRING, NULL); + g_strfreev (t); + + strlist = g_list_reverse (strlist); + return strlist; +} - prefs->display_folders = NULL; - for (p = path_list, q = uri_list; p != NULL && q != NULL; p = p->next, q = q->next) { +static GList * +folder_list_from_vector (const char *vector) +{ + GList *flist = NULL; + char **tokens, **t; + + t = tokens = g_strsplit (vector, " !<-->! ", 8196); + if (tokens == NULL) { + return NULL; + } + + for (tokens = t; *tokens; tokens += 2) { ESummaryPrefsFolder *folder; + const char *evolution_uri; + const char *physical_uri; + + evolution_uri = *tokens; + if (evolution_uri == NULL || strncmp (evolution_uri, "evolution:", 10) != 0) + break; + + physical_uri = *(tokens + 1); + if (physical_uri == NULL) + break; folder = g_new (ESummaryPrefsFolder, 1); - folder->evolution_uri = p->data; - folder->physical_uri = q->data; - prefs->display_folders = g_slist_append(prefs->display_folders, folder); + folder->evolution_uri = g_strdup (evolution_uri); + folder->physical_uri = g_strdup (physical_uri); + + flist = g_list_prepend (flist, folder); + } + + g_strfreev (t); + + flist = g_list_reverse (flist); + return flist; +} + +static char * +vector_from_folder_list (GList *flist) +{ + char *vector; + GString *string; + + if (flist == NULL) { + return g_strdup (""); + } + + string = g_string_new (""); + for (; flist; flist = flist->next) { + ESummaryPrefsFolder *folder; + + folder = flist->data; + string = g_string_append (string, folder->evolution_uri); + string = g_string_append (string, " !<-->! "); + string = g_string_append (string, folder->physical_uri); + + if (flist->next != NULL) { + string = g_string_append (string, " !<-->! "); + } } - g_slist_free (path_list); - g_slist_free (uri_list); + vector = string->str; + g_string_free (string, FALSE); - prefs->show_full_path = gconf_client_get_bool (gconf_client, "/apps/evolution/summary/mail/show_full_paths", NULL); + return vector; +} - prefs->rdf_urls = gconf_client_get_list (gconf_client, "/apps/evolution/summary/rdf/uris", - GCONF_VALUE_STRING, NULL); +gboolean +e_summary_preferences_restore (ESummaryPrefs *prefs) +{ + Bonobo_ConfigDatabase db; + CORBA_Environment ev; + char *vector; - prefs->rdf_refresh_time = gconf_client_get_int (gconf_client, "/apps/evolution/summary/rdf/refresh_time", NULL); + g_return_val_if_fail (prefs != NULL, FALSE); + + CORBA_exception_init (&ev); + db = bonobo_get_object ("wombat:", "Bonobo/ConfigDatabase", &ev); + if (BONOBO_EX (&ev) || db == CORBA_OBJECT_NIL) { + g_warning ("Error getting Wombat. Using defaults"); + CORBA_exception_free (&ev); + return FALSE; + } - prefs->limit = gconf_client_get_int (gconf_client, "/apps/evolution/summary/rdf/max_items", NULL); + CORBA_exception_free (&ev); + vector = bonobo_config_get_string (db, "My-Evolution/Mail/display_folders-1.2", &ev); + if (BONOBO_EX (&ev)) { + g_warning ("Error getting Mail/display_folders. Using defaults"); + CORBA_exception_free (&ev); + make_initial_mail_list (prefs); + } else { + prefs->display_folders = folder_list_from_vector (vector); + g_free (vector); + } - prefs->stations = gconf_client_get_list (gconf_client, "/apps/evolution/summary/weather/stations", - GCONF_VALUE_STRING, NULL); + prefs->show_full_path = bonobo_config_get_boolean (db, "My-Evolution/Mail/show_full_path", &ev); + if (BONOBO_EX (&ev) || db == CORBA_OBJECT_NIL) { + g_warning ("Error getting Mail/show_full_path. Using defaults"); + bonobo_object_release_unref (db, NULL); + CORBA_exception_free (&ev); + return FALSE; + } - if (gconf_client_get_bool (gconf_client, "/apps/evolution/summary/weather/use_metric", NULL)) - prefs->units = UNITS_METRIC; - else - prefs->units = UNITS_IMPERIAL; - prefs->weather_refresh_time = gconf_client_get_int (gconf_client, "/apps/evolution/summary/weather/refresh_time", - NULL); + vector = bonobo_config_get_string (db, "My-Evolution/RDF/rdf_urls", &ev); + if (BONOBO_EX (&ev)) { + g_warning ("Error getting RDF/rdf_urls"); + CORBA_exception_free (&ev); + bonobo_object_release_unref (db, NULL); + return FALSE; + } + prefs->rdf_urls = str_list_from_vector (vector); + g_free (vector); + + prefs->rdf_refresh_time = bonobo_config_get_long_with_default (db, "My-Evolution/RDF/rdf_refresh_time", 600, NULL); + + prefs->limit = bonobo_config_get_long_with_default (db, "My-Evolution/RDF/limit", 10, NULL); + + vector = bonobo_config_get_string (db, "My-Evolution/Weather/stations", &ev); + if (BONOBO_EX (&ev)) { + g_warning ("Error getting Weather/stations"); + CORBA_exception_free (&ev); + bonobo_object_release_unref (db, NULL); + return FALSE; + } + prefs->stations = str_list_from_vector (vector); + g_free (vector); + + prefs->units = bonobo_config_get_long (db, "My-Evolution/Weather/units", &ev); + if (BONOBO_EX (&ev) || db == CORBA_OBJECT_NIL) { + g_warning ("Error getting Weather/units. Using defaults"); + bonobo_object_release_unref (db, NULL); + CORBA_exception_free (&ev); + return FALSE; + } + + prefs->weather_refresh_time = bonobo_config_get_long (db, "My-Evolution/Weather/weather_refresh_time", &ev); + if (BONOBO_EX (&ev) || db == CORBA_OBJECT_NIL) { + g_warning ("Error getting Weather/weather_refresh_time. Using defaults"); + bonobo_object_release_unref (db, NULL); + CORBA_exception_free (&ev); + return FALSE; + } + - prefs->days = gconf_client_get_int (gconf_client, "/apps/evolution/summary/calendar/days_shown", NULL); - if (gconf_client_get_bool (gconf_client, "/apps/evolution/summary/tasks/show_all", NULL)) - prefs->show_tasks = E_SUMMARY_CALENDAR_ALL_TASKS; - else - prefs->show_tasks = E_SUMMARY_CALENDAR_ONE_DAY; + prefs->days = bonobo_config_get_long (db, "My-Evolution/Schedule/days", &ev); + if (BONOBO_EX (&ev) || db == CORBA_OBJECT_NIL) { + g_warning ("Error getting Schedule/days. Using defaults"); + bonobo_object_release_unref (db, NULL); + CORBA_exception_free (&ev); + return FALSE; + } + + prefs->show_tasks = bonobo_config_get_long (db, "My-Evolution/Schedule/show_tasks", &ev); + if (BONOBO_EX (&ev) || db == CORBA_OBJECT_NIL) { + g_warning ("Error getting Schedule/show_tasks. Using defaults"); + bonobo_object_release_unref (db, NULL); + CORBA_exception_free (&ev); + return FALSE; + } - g_object_unref (gconf_client); + bonobo_object_release_unref (db, NULL); return TRUE; } +/* Write prefs to disk */ void e_summary_preferences_save (ESummaryPrefs *prefs) { - GConfClient *gconf_client; - GSList *evolution_uri_list, *physical_uri_list; - GSList *p; - - gconf_client = gconf_client_get_default (); + Bonobo_ConfigDatabase db; + CORBA_Environment ev; + char *vector; - evolution_uri_list = NULL; - physical_uri_list = NULL; - for (p = prefs->display_folders; p != NULL; p = p->next) { - const ESummaryPrefsFolder *folder; + g_return_if_fail (prefs != NULL); - folder = (const ESummaryPrefsFolder *) p->data; - evolution_uri_list = g_slist_prepend (evolution_uri_list, folder->evolution_uri); - physical_uri_list = g_slist_prepend (physical_uri_list, folder->physical_uri); + CORBA_exception_init (&ev); + db = bonobo_get_object ("wombat:", "Bonobo/ConfigDatabase", &ev); + if (BONOBO_EX (&ev) || db == CORBA_OBJECT_NIL) { + g_warning ("Cannot save preferences"); + CORBA_exception_free (&ev); + return; } - evolution_uri_list = g_slist_reverse (evolution_uri_list); - physical_uri_list = g_slist_reverse (physical_uri_list); - - gconf_client_set_list (gconf_client, "/apps/evolution/summary/mail/folder_evolution_uris", - GCONF_VALUE_STRING, evolution_uri_list, NULL); - gconf_client_set_list (gconf_client, "/apps/evolution/summary/mail/folder_physical_uris", - GCONF_VALUE_STRING, physical_uri_list, NULL); + CORBA_exception_free (&ev); - g_slist_free (evolution_uri_list); - g_slist_free (physical_uri_list); + vector = vector_from_folder_list (prefs->display_folders); + bonobo_config_set_string (db, "My-Evolution/Mail/display_folders-1.2", vector, NULL); + g_free (vector); - gconf_client_set_bool (gconf_client, "/apps/evolution/summary/mail/show_full_paths", prefs->show_full_path, NULL); + bonobo_config_set_boolean (db, "My-Evolution/Mail/show_full_path", prefs->show_full_path, NULL); - gconf_client_set_list (gconf_client, "/apps/evolution/summary/rdf/uris", - GCONF_VALUE_STRING, prefs->rdf_urls, NULL); + vector = vector_from_str_list (prefs->rdf_urls); + bonobo_config_set_string (db, "My-Evolution/RDF/rdf_urls", vector, NULL); + g_free (vector); - gconf_client_set_int (gconf_client, "/apps/evolution/summary/rdf/refresh_time", prefs->rdf_refresh_time, NULL); - gconf_client_set_int (gconf_client, "/apps/evolution/summary/rdf/max_items", prefs->limit, NULL); + bonobo_config_set_long (db, "My-Evolution/RDF/rdf_refresh_time", prefs->rdf_refresh_time, NULL); + bonobo_config_set_long (db, "My-Evolution/RDF/limit", prefs->limit, NULL); - gconf_client_set_list (gconf_client, "/apps/evolution/summary/weather/stations", - GCONF_VALUE_STRING, prefs->stations, NULL); + vector = vector_from_str_list (prefs->stations); + bonobo_config_set_string (db, "My-Evolution/Weather/stations", vector, NULL); + g_free (vector); - gconf_client_set_bool (gconf_client, "/apps/evolution/summary/weather/use_metric", - prefs->units == UNITS_METRIC, NULL); - gconf_client_set_int (gconf_client, "/apps/evolution/summary/weather/refresh_time", - prefs->weather_refresh_time, NULL); + bonobo_config_set_long (db, "My-Evolution/Weather/units", prefs->units, NULL); + bonobo_config_set_long (db, "My-Evolution/Weather/weather_refresh_time", prefs->weather_refresh_time, NULL); - gconf_client_set_int (gconf_client, "/apps/evolution/summary/calendar/days_shown", - prefs->days, NULL); + bonobo_config_set_long (db, "My-Evolution/Schedule/days", prefs->days, NULL); + bonobo_config_set_long (db, "My-Evolution/Schedule/show_tasks", prefs->show_tasks, NULL); - gconf_client_set_bool (gconf_client, "/apps/evolution/summary/tasks/show_all", - prefs->show_tasks == E_SUMMARY_CALENDAR_ALL_TASKS, NULL); + CORBA_exception_init (&ev); + Bonobo_ConfigDatabase_sync (db, &ev); + CORBA_exception_free (&ev); - g_object_unref (gconf_client); + bonobo_object_release_unref (db, NULL); } static void -free_str_list (GSList *list) +free_str_list (GList *list) { for (; list; list = list->next) { g_free (list->data); @@ -181,7 +391,7 @@ free_str_list (GSList *list) } static void -free_folder_list (GSList *list) +free_folder_list (GList *list) { for (; list; list = list->next) { ESummaryPrefsFolder *f = list->data; @@ -197,39 +407,39 @@ e_summary_preferences_free (ESummaryPrefs *prefs) { if (prefs->display_folders) { free_folder_list (prefs->display_folders); - g_slist_free (prefs->display_folders); + g_list_free (prefs->display_folders); } if (prefs->rdf_urls) { free_str_list (prefs->rdf_urls); - g_slist_free (prefs->rdf_urls); + g_list_free (prefs->rdf_urls); } if (prefs->stations) { free_str_list (prefs->stations); - g_slist_free (prefs->stations); + g_list_free (prefs->stations); } g_free (prefs); } -static GSList * -copy_str_list (GSList *list) +static GList * +copy_str_list (GList *list) { - GSList *list_copy = NULL; + GList *list_copy = NULL; for (; list; list = list->next) { - list_copy = g_slist_prepend (list_copy, g_strdup (list->data)); + list_copy = g_list_prepend (list_copy, g_strdup (list->data)); } - list_copy = g_slist_reverse (list_copy); + list_copy = g_list_reverse (list_copy); return list_copy; } -static GSList * -copy_folder_list (GSList *list) +static GList * +copy_folder_list (GList *list) { - GSList *list_copy = NULL; + GList *list_copy = NULL; for (; list; list = list->next) { ESummaryPrefsFolder *f1, *f2; @@ -239,10 +449,10 @@ copy_folder_list (GSList *list) f2->evolution_uri = g_strdup (f1->evolution_uri); f2->physical_uri = g_strdup (f1->physical_uri); - list_copy = g_slist_prepend (list_copy, f2); + list_copy = g_list_prepend (list_copy, f2); } - list_copy = g_slist_reverse (list_copy); + list_copy = g_list_reverse (list_copy); return list_copy; } @@ -282,7 +492,27 @@ e_summary_preferences_init (void) prefs = g_new0 (ESummaryPrefs, 1); global_preferences = prefs; - e_summary_preferences_restore (prefs); + if (e_summary_preferences_restore (prefs) == TRUE) { + return prefs; + } + + /* Defaults */ + + /* Mail */ + make_initial_mail_list (prefs); + + /* RDF */ + make_initial_rdf_list (prefs); + prefs->rdf_refresh_time = 600; + prefs->limit = 10; + + /* Weather */ + make_initial_weather_list (prefs); + prefs->units = UNITS_METRIC; + prefs->weather_refresh_time = 600; + + prefs->days = E_SUMMARY_CALENDAR_ONE_DAY; + prefs->show_tasks = E_SUMMARY_CALENDAR_ALL_TASKS; return prefs; } @@ -290,8 +520,6 @@ e_summary_preferences_init (void) ESummaryPrefs * e_summary_preferences_get_global (void) { - g_assert(global_preferences); - return global_preferences; } @@ -302,7 +530,7 @@ struct _MailPage { GtkWidget *add, *remove; GHashTable *model; - GSList *tmp_list; + GList *tmp_list; }; struct _RDFPage { @@ -311,7 +539,7 @@ struct _RDFPage { GtkWidget *new_button, *delete_url; GHashTable *default_hash, *model; - GSList *known, *tmp_list; + GList *known, *tmp_list; }; struct _WeatherPage { @@ -320,7 +548,7 @@ struct _WeatherPage { GtkWidget *add, *remove; GHashTable *model; - GSList *tmp_list; + GList *tmp_list; }; struct _CalendarPage { @@ -381,7 +609,7 @@ static struct _RDFInfo rdfs[] = { }; static void -save_known_rdfs (GSList *rdfs) +save_known_rdfs (GList *rdfs) { FILE *handle; char *rdf_file; @@ -417,7 +645,7 @@ static gboolean rdf_is_shown (PropertyData *pd, const char *url) { - GSList *p; + GList *p; for (p = global_preferences->rdf_urls; p; p = p->next) { if (strcmp (p->data, url) == 0) { @@ -443,7 +671,6 @@ fill_rdf_etable (GtkWidget *widget, } ess = E_SUMMARY_SHOWN (widget); - e_summary_shown_freeze (ess); /* Fill the defaults first */ for (i = 0; rdfs[i].url; i++) { @@ -453,7 +680,7 @@ fill_rdf_etable (GtkWidget *widget, entry->showable = TRUE; entry->data = &rdfs[i]; - e_summary_shown_add_node (ess, TRUE, entry, NULL, FALSE, NULL); + e_summary_shown_add_node (ess, TRUE, entry, NULL, TRUE, NULL); if (rdf_is_shown (pd, rdfs[i].url) == TRUE) { entry = g_new (ESummaryShownModelEntry, 1); @@ -462,10 +689,10 @@ fill_rdf_etable (GtkWidget *widget, entry->showable = TRUE; entry->data = &rdfs[i]; - e_summary_shown_add_node (ess, FALSE, entry, NULL, FALSE, NULL); + e_summary_shown_add_node (ess, FALSE, entry, NULL, TRUE, NULL); } - pd->rdf->known = g_slist_append (pd->rdf->known, &rdfs[i]); + pd->rdf->known = g_list_append (pd->rdf->known, &rdfs[i]); g_hash_table_insert (pd->rdf->default_hash, rdfs[i].url, &rdfs[i]); } @@ -483,7 +710,6 @@ fill_rdf_etable (GtkWidget *widget, } if (handle == NULL) { - e_summary_shown_thaw (ess); return; } @@ -512,7 +738,7 @@ fill_rdf_etable (GtkWidget *widget, info->name = g_strdup (tokens[1]); info->custom = TRUE; - pd->rdf->known = g_slist_append (pd->rdf->known, info); + pd->rdf->known = g_list_append (pd->rdf->known, info); entry = g_new (ESummaryShownModelEntry, 1); entry->location = g_strdup (info->url); @@ -520,7 +746,7 @@ fill_rdf_etable (GtkWidget *widget, entry->showable = TRUE; entry->data = info; - e_summary_shown_add_node (ess, TRUE, entry, NULL, FALSE, NULL); + e_summary_shown_add_node (ess, TRUE, entry, NULL, TRUE, NULL); if (rdf_is_shown (pd, tokens[0]) == TRUE) { entry = g_new (ESummaryShownModelEntry, 1); @@ -529,14 +755,13 @@ fill_rdf_etable (GtkWidget *widget, entry->showable = TRUE; entry->data = info; - e_summary_shown_add_node (ess, FALSE, entry, NULL, FALSE, NULL); + e_summary_shown_add_node (ess, FALSE, entry, NULL, TRUE, NULL); } g_strfreev (tokens); } fclose (handle); - e_summary_shown_thaw (ess); } static void @@ -561,8 +786,8 @@ add_dialog_clicked_cb (GtkWidget *widget, PropertyData *pd) { if (button == 0) { - const char *url; - const char *name; + char *url; + char *name; name = gtk_entry_get_text (GTK_ENTRY (pd->new_name_entry)); url = gtk_entry_get_text (GTK_ENTRY (pd->new_url_entry)); @@ -577,7 +802,7 @@ add_dialog_clicked_cb (GtkWidget *widget, info->name = g_strdup (name); info->custom = TRUE; - pd->rdf->known = g_slist_append (pd->rdf->known, info); + pd->rdf->known = g_list_append (pd->rdf->known, info); entry = g_new (ESummaryShownModelEntry, 1); entry->location = g_strdup (info->url); @@ -586,7 +811,7 @@ add_dialog_clicked_cb (GtkWidget *widget, entry->data = info; e_summary_shown_add_node (E_SUMMARY_SHOWN (pd->rdf->etable), TRUE, - entry, NULL, FALSE, NULL); + entry, NULL, TRUE, NULL); /* Should we add to shown? */ @@ -615,8 +840,10 @@ rdf_new_url_clicked_cb (GtkButton *button, add_dialog = gnome_dialog_new (_("Add a news feed"), GNOME_STOCK_BUTTON_OK, GNOME_STOCK_BUTTON_CANCEL, NULL); - g_signal_connect (add_dialog, "clicked", G_CALLBACK (add_dialog_clicked_cb), pd); - g_signal_connect (add_dialog, "destroy", G_CALLBACK (gtk_widget_destroyed), &add_dialog); + gtk_signal_connect (GTK_OBJECT (add_dialog), "clicked", + GTK_SIGNAL_FUNC (add_dialog_clicked_cb), pd); + gtk_signal_connect (GTK_OBJECT (add_dialog), "destroy", + GTK_SIGNAL_FUNC (gtk_widget_destroyed), &add_dialog); label = gtk_label_new (_("Enter the URL of the news feed you wish to add")); gtk_box_pack_start (GTK_BOX (GNOME_DIALOG (add_dialog)->vbox), label, @@ -658,7 +885,7 @@ rdf_delete_url_cb (GtkButton *button, } e_summary_shown_remove_node (E_SUMMARY_SHOWN (pd->rdf->etable), TRUE, entry); - pd->rdf->known = g_slist_remove (pd->rdf->known, entry->data); + pd->rdf->known = g_list_remove (pd->rdf->known, entry->data); /* FIXME: Remove from shown side as well */ } @@ -861,45 +1088,52 @@ make_property_dialog (PropertyData *pd) mail->storage_set_view = glade_xml_get_widget (pd->xml, "mail-custom"); g_return_val_if_fail (mail->storage_set_view != NULL, FALSE); - listener = g_object_get_data (G_OBJECT (mail->storage_set_view), "listener"); - g_signal_connect (listener, "folder-toggled", G_CALLBACK (storage_set_changed), pd); + listener = gtk_object_get_data (GTK_OBJECT (mail->storage_set_view), + "listener"); + gtk_signal_connect (GTK_OBJECT (listener), "folder-toggled", + GTK_SIGNAL_FUNC (storage_set_changed), pd); mail->fullpath = glade_xml_get_widget (pd->xml, "checkbutton1"); g_return_val_if_fail (mail->fullpath != NULL, FALSE); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (mail->fullpath), global_preferences->show_full_path); - g_signal_connect (mail->fullpath, "toggled", G_CALLBACK (mail_show_full_path_toggled_cb), pd); + gtk_signal_connect (GTK_OBJECT (mail->fullpath), "toggled", + GTK_SIGNAL_FUNC (mail_show_full_path_toggled_cb), pd); /* RDF */ rdf = pd->rdf = g_new0 (struct _RDFPage, 1); rdf->etable = glade_xml_get_widget (pd->xml, "rdf-custom"); g_return_val_if_fail (rdf->etable != NULL, FALSE); - g_signal_connect (rdf->etable, "item-changed", G_CALLBACK (rdf_etable_item_changed_cb), pd); - g_signal_connect (rdf->etable, "selection-changed", G_CALLBACK (rdf_etable_selection_cb), pd); + gtk_signal_connect (GTK_OBJECT (rdf->etable), "item-changed", + GTK_SIGNAL_FUNC (rdf_etable_item_changed_cb), pd); + gtk_signal_connect (GTK_OBJECT (rdf->etable), "selection-changed", + GTK_SIGNAL_FUNC (rdf_etable_selection_cb), pd); fill_rdf_etable (rdf->etable, pd); rdf->refresh = glade_xml_get_widget (pd->xml, "spinbutton1"); g_return_val_if_fail (rdf->refresh != NULL, FALSE); gtk_spin_button_set_value (GTK_SPIN_BUTTON (rdf->refresh), (float) global_preferences->rdf_refresh_time); - g_signal_connect (GTK_SPIN_BUTTON (rdf->refresh)->adjustment, "value_changed", - G_CALLBACK (rdf_refresh_value_changed_cb), pd); + gtk_signal_connect (GTK_OBJECT (GTK_SPIN_BUTTON (rdf->refresh)->adjustment), "value_changed", + GTK_SIGNAL_FUNC (rdf_refresh_value_changed_cb), pd); rdf->limit = glade_xml_get_widget (pd->xml, "spinbutton4"); g_return_val_if_fail (rdf->limit != NULL, FALSE); gtk_spin_button_set_value (GTK_SPIN_BUTTON (rdf->limit), (float) global_preferences->limit); - g_signal_connect (GTK_SPIN_BUTTON (rdf->limit)->adjustment, "value_changed", - G_CALLBACK (rdf_limit_value_changed_cb), pd); + gtk_signal_connect (GTK_OBJECT (GTK_SPIN_BUTTON (rdf->limit)->adjustment), "value_changed", + GTK_SIGNAL_FUNC (rdf_limit_value_changed_cb), pd); rdf->new_button = glade_xml_get_widget (pd->xml, "button11"); g_return_val_if_fail (rdf->limit != NULL, FALSE); - g_signal_connect (rdf->new_button, "clicked", G_CALLBACK (rdf_new_url_clicked_cb), pd); + gtk_signal_connect (GTK_OBJECT (rdf->new_button), "clicked", + GTK_SIGNAL_FUNC (rdf_new_url_clicked_cb), pd); rdf->delete_url = glade_xml_get_widget (pd->xml, "delete-button"); g_return_val_if_fail (rdf->delete_url != NULL, FALSE); - g_signal_connect (rdf->delete_url, "clicked", G_CALLBACK (rdf_delete_url_cb), pd); + gtk_signal_connect (GTK_OBJECT (rdf->delete_url), "clicked", + GTK_SIGNAL_FUNC (rdf_delete_url_cb), pd); /* Weather */ weather = pd->weather = g_new (struct _WeatherPage, 1); @@ -908,7 +1142,9 @@ make_property_dialog (PropertyData *pd) weather->etable = glade_xml_get_widget (pd->xml, "weather-custom"); g_return_val_if_fail (weather->etable != NULL, FALSE); - g_signal_connect (weather->etable, "item-changed", G_CALLBACK (weather_etable_item_changed_cb), pd); + gtk_signal_connect (GTK_OBJECT (weather->etable), "item-changed", + GTK_SIGNAL_FUNC (weather_etable_item_changed_cb), + pd); fill_weather_etable (E_SUMMARY_SHOWN (weather->etable), pd); @@ -916,20 +1152,24 @@ make_property_dialog (PropertyData *pd) g_return_val_if_fail (weather->refresh != NULL, FALSE); gtk_spin_button_set_value (GTK_SPIN_BUTTON (weather->refresh), (float) global_preferences->weather_refresh_time); - g_signal_connect (GTK_SPIN_BUTTON (weather->refresh)->adjustment, "value-changed", - G_CALLBACK (weather_refresh_value_changed_cb), pd); + gtk_signal_connect (GTK_OBJECT (GTK_SPIN_BUTTON (weather->refresh)->adjustment), + "value-changed", + GTK_SIGNAL_FUNC (weather_refresh_value_changed_cb), + pd); weather->metric = glade_xml_get_widget (pd->xml, "radiobutton7"); g_return_val_if_fail (weather->metric != NULL, FALSE); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (weather->metric), (global_preferences->units == UNITS_METRIC)); - g_signal_connect (weather->metric, "toggled", G_CALLBACK (weather_metric_toggled_cb), pd); + gtk_signal_connect (GTK_OBJECT (weather->metric), "toggled", + GTK_SIGNAL_FUNC (weather_metric_toggled_cb), pd); weather->imperial = glade_xml_get_widget (pd->xml, "radiobutton8"); g_return_val_if_fail (weather->imperial != NULL, FALSE); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (weather->imperial), (global_preferences->units == UNITS_IMPERIAL)); - g_signal_connect (weather->imperial, "toggled", G_CALLBACK (weather_imperial_toggled_cb), pd); + gtk_signal_connect (GTK_OBJECT (weather->imperial), "toggled", + GTK_SIGNAL_FUNC (weather_imperial_toggled_cb), pd); /* Calendar */ calendar = pd->calendar = g_new (struct _CalendarPage, 1); @@ -937,37 +1177,43 @@ make_property_dialog (PropertyData *pd) g_return_val_if_fail (calendar->one != NULL, FALSE); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (calendar->one), (global_preferences->days == E_SUMMARY_CALENDAR_ONE_DAY)); - g_signal_connect (calendar->one, "toggled", G_CALLBACK (calendar_one_toggled_cb), pd); + gtk_signal_connect (GTK_OBJECT (calendar->one), "toggled", + GTK_SIGNAL_FUNC (calendar_one_toggled_cb), pd); calendar->five = glade_xml_get_widget (pd->xml, "radiobutton4"); g_return_val_if_fail (calendar->five != NULL, FALSE); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (calendar->five), (global_preferences->days == E_SUMMARY_CALENDAR_FIVE_DAYS)); - g_signal_connect (calendar->five, "toggled", G_CALLBACK (calendar_five_toggled_cb), pd); + gtk_signal_connect (GTK_OBJECT (calendar->five), "toggled", + GTK_SIGNAL_FUNC (calendar_five_toggled_cb), pd); calendar->week = glade_xml_get_widget (pd->xml, "radiobutton5"); g_return_val_if_fail (calendar->week != NULL, FALSE); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (calendar->week), (global_preferences->days == E_SUMMARY_CALENDAR_ONE_WEEK)); - g_signal_connect (calendar->week, "toggled", G_CALLBACK (calendar_week_toggled_cb), pd); + gtk_signal_connect (GTK_OBJECT (calendar->week), "toggled", + GTK_SIGNAL_FUNC (calendar_week_toggled_cb), pd); calendar->month = glade_xml_get_widget (pd->xml, "radiobutton6"); g_return_val_if_fail (calendar->month != NULL, FALSE); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (calendar->month), (global_preferences->days == E_SUMMARY_CALENDAR_ONE_MONTH)); - g_signal_connect (calendar->month, "toggled", G_CALLBACK (calendar_month_toggled_cb), pd); + gtk_signal_connect (GTK_OBJECT (calendar->month), "toggled", + GTK_SIGNAL_FUNC (calendar_month_toggled_cb), pd); calendar->all = glade_xml_get_widget (pd->xml, "radiobutton1"); g_return_val_if_fail (calendar->all != NULL, FALSE); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (calendar->all), (global_preferences->show_tasks == E_SUMMARY_CALENDAR_ALL_TASKS)); - g_signal_connect (calendar->all, "toggled", G_CALLBACK (calendar_all_toggled_cb), pd); + gtk_signal_connect (GTK_OBJECT (calendar->all), "toggled", + GTK_SIGNAL_FUNC (calendar_all_toggled_cb), pd); calendar->today = glade_xml_get_widget (pd->xml, "radiobutton2"); g_return_val_if_fail (calendar->today != NULL, FALSE); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (calendar->today), (global_preferences->show_tasks == E_SUMMARY_CALENDAR_TODAYS_TASKS)); - g_signal_connect (calendar->today, "toggled", G_CALLBACK (calendar_today_toggled_cb), pd); + gtk_signal_connect (GTK_OBJECT(calendar->today), "toggled", + GTK_SIGNAL_FUNC (calendar_today_toggled_cb), pd); return TRUE; } @@ -976,28 +1222,29 @@ static void free_property_dialog (PropertyData *pd) { if (pd->rdf) { - g_slist_free (pd->rdf->known); + g_list_free (pd->rdf->known); free_str_list (pd->rdf->tmp_list); - g_slist_free (pd->rdf->tmp_list); + g_list_free (pd->rdf->tmp_list); g_free (pd->rdf); } if (pd->mail) { free_str_list (pd->mail->tmp_list); - g_slist_free (pd->mail->tmp_list); + g_list_free (pd->mail->tmp_list); g_free (pd->mail); } if (pd->weather) { free_str_list (pd->weather->tmp_list); - g_slist_free (pd->weather->tmp_list); + g_list_free (pd->weather->tmp_list); g_free (pd->weather); } if (pd->calendar) { g_free (pd->calendar); } - if (pd->xml) - g_object_unref (pd->xml); + if (pd->xml) { + gtk_object_unref (GTK_OBJECT (pd->xml)); + } g_free (pd); } @@ -1013,7 +1260,7 @@ set_selected_folders (GNOME_Evolution_StorageSetView view) { GNOME_Evolution_FolderList *list; CORBA_Environment ev; - GSList *l; + GList *l; int i, count; for (count = 0, l = global_preferences->display_folders; l; @@ -1090,8 +1337,8 @@ e_summary_preferences_make_mail_table (PropertyData *pd) CORBA_exception_free (&ev); widget = bonobo_widget_new_control_from_objref (control, CORBA_OBJECT_NIL); - g_object_set_data (G_OBJECT (widget), "listener", listener); - g_object_set_data (G_OBJECT (widget), "corba_view", view); + gtk_object_set_data (GTK_OBJECT (widget), "listener", listener); + gtk_object_set_data (GTK_OBJECT (widget), "corba_view", view); set_selected_folders (view); return widget; @@ -1118,24 +1365,24 @@ add_shown_to_list (gpointer key, gpointer data) { ESummaryShownModelEntry *item; - GSList **list; + GList **list; item = (ESummaryShownModelEntry *) value; - list = (GSList **) data; + list = (GList **) data; - *list = g_slist_prepend (*list, g_strdup (item->location)); + *list = g_list_prepend (*list, g_strdup (item->location)); } -static GSList * +static GList * get_folders_from_view (GtkWidget *view) { GNOME_Evolution_StorageSetView set_view; GNOME_Evolution_FolderList *list; CORBA_Environment ev; - GSList *out_list = NULL; + GList *out_list = NULL; int i; - set_view = g_object_get_data (G_OBJECT (view), "corba_view"); + set_view = gtk_object_get_data (GTK_OBJECT (view), "corba_view"); CORBA_exception_init (&ev); list = GNOME_Evolution_StorageSetView__get_checkedFolders (set_view, &ev); @@ -1155,7 +1402,7 @@ get_folders_from_view (GtkWidget *view) f = g_new (ESummaryPrefsFolder, 1); f->evolution_uri = g_strdup (folder.evolutionUri); f->physical_uri = g_strdup (folder.physicalUri); - out_list = g_slist_append (out_list, f); + out_list = g_list_append (out_list, f); } return out_list; @@ -1171,7 +1418,7 @@ config_control_apply_cb (EvolutionConfigControl *control, if (pd->rdf->tmp_list) { free_str_list (pd->rdf->tmp_list); - g_slist_free (pd->rdf->tmp_list); + g_list_free (pd->rdf->tmp_list); pd->rdf->tmp_list = NULL; } /* Take each news feed which is on and add it @@ -1181,7 +1428,7 @@ config_control_apply_cb (EvolutionConfigControl *control, if (global_preferences->rdf_urls) { free_str_list (global_preferences->rdf_urls); - g_slist_free (global_preferences->rdf_urls); + g_list_free (global_preferences->rdf_urls); } global_preferences->rdf_urls = copy_str_list (pd->rdf->tmp_list); @@ -1189,7 +1436,7 @@ config_control_apply_cb (EvolutionConfigControl *control, /* Weather */ if (pd->weather->tmp_list) { free_str_list (pd->weather->tmp_list); - g_slist_free (pd->weather->tmp_list); + g_list_free (pd->weather->tmp_list); pd->weather->tmp_list = NULL; } @@ -1197,44 +1444,51 @@ config_control_apply_cb (EvolutionConfigControl *control, add_shown_to_list, &pd->weather->tmp_list); if (global_preferences->stations) { free_str_list (global_preferences->stations); - g_slist_free (global_preferences->stations); + g_list_free (global_preferences->stations); } global_preferences->stations = copy_str_list (pd->weather->tmp_list); /* Folders */ if (pd->mail->tmp_list) { free_str_list (pd->mail->tmp_list); - g_slist_free (pd->mail->tmp_list); + g_list_free (pd->mail->tmp_list); pd->mail->tmp_list = NULL; } +#if 0 + g_hash_table_foreach (pd->mail->model, maybe_add_to_shown, &pd->mail->tmp_list); +#endif if (global_preferences->display_folders) { free_folder_list (global_preferences->display_folders); - g_slist_free (global_preferences->display_folders); + g_list_free (global_preferences->display_folders); } - global_preferences->display_folders = get_folders_from_view(pd->mail->storage_set_view); - - e_summary_preferences_save (global_preferences); + global_preferences->display_folders = get_folders_from_view (pd->mail->storage_set_view); e_summary_reconfigure_all (); } static void -config_control_destroy_cb (EvolutionConfigControl *config_control, void *data) +config_control_destroy_cb (EvolutionConfigControl *config_control, + void *data) { - e_summary_preferences_restore(global_preferences); - free_property_dialog ((PropertyData *)data); + PropertyData *pd; + + pd = (PropertyData *) data; + + e_summary_preferences_save (global_preferences); + free_property_dialog (pd); } -BonoboObject * -e_summary_preferences_create_control (void) +static BonoboObject * +factory_fn (BonoboGenericFactory *generic_factory, + void *data) { PropertyData *pd; GtkWidget *widget; pd = g_new0 (PropertyData, 1); - pd->xml = glade_xml_new (EVOLUTION_GLADEDIR "/my-evolution.glade", NULL, NULL); + pd->xml = glade_xml_new (EVOLUTION_GLADEDIR "/my-evolution.glade", NULL); g_return_val_if_fail (pd->xml != NULL, NULL); widget = glade_xml_get_widget (pd->xml, "notebook"); @@ -1247,20 +1501,26 @@ e_summary_preferences_create_control (void) gtk_widget_ref (widget); gtk_container_remove (GTK_CONTAINER (widget->parent), widget); - gtk_widget_show_all (widget); + gtk_widget_show (widget); pd->config_control = evolution_config_control_new (widget); gtk_widget_unref (widget); - g_signal_connect (pd->config_control, "apply", G_CALLBACK (config_control_apply_cb), pd); - g_signal_connect (pd->config_control, "destroy", G_CALLBACK (config_control_destroy_cb), pd); + gtk_signal_connect (GTK_OBJECT (pd->config_control), "apply", + GTK_SIGNAL_FUNC (config_control_apply_cb), pd); + gtk_signal_connect (GTK_OBJECT (pd->config_control), "destroy", + GTK_SIGNAL_FUNC (config_control_destroy_cb), pd); return BONOBO_OBJECT (pd->config_control); } -/* FIXME this kinda sucks. */ -void -e_summary_preferences_init_control (GNOME_Evolution_Shell corba_shell) +gboolean +e_summary_preferences_register_config_control_factory (GNOME_Evolution_Shell corba_shell) { + if (bonobo_generic_factory_new (FACTORY_ID, factory_fn, NULL) == NULL) + return FALSE; + global_shell = corba_shell; + + return TRUE; } |