diff options
| author | Jeffrey Stedfast <fejj@ximian.com> | 2003-01-11 03:42:20 +0800 |
|---|---|---|
| committer | Jeffrey Stedfast <fejj@src.gnome.org> | 2003-01-11 03:42:20 +0800 |
| commit | 4a8c1c7323bbde12c2213228f272cdaf5f5039ab (patch) | |
| tree | 3da90373bdf525b624c7a232e8947327e6932e88 /mail/component-factory.c | |
| parent | 794ff9b52787ef07f2750481c3f4934bd07c5dd1 (diff) | |
| download | gsoc2013-evolution-4a8c1c7323bbde12c2213228f272cdaf5f5039ab.tar.gz gsoc2013-evolution-4a8c1c7323bbde12c2213228f272cdaf5f5039ab.tar.zst gsoc2013-evolution-4a8c1c7323bbde12c2213228f272cdaf5f5039ab.zip | |
Updated for function rename.
2003-01-10 Jeffrey Stedfast <fejj@ximian.com>
* component-factory.c (factory): Updated for function rename.
* mail-config-factory.c (mail_config_control_factory_cb):
Namespaced the function name.
* folder-browser-ui.c (folder_browser_ui_add_global): Don't add
the listener for show_preview here, it was moved into
folder-browser.c so we could detach the listener when the
folder-browser is destroyed. Also prevents a listener being added
multiple times (which was possible? before).
* folder-browser.c (folder_browser_destroy): Remove the gconf
notify handler for show_preview.
(show_preview_changed): Moved here from folder-browser-ui.c
svn path=/trunk/; revision=19408
Diffstat (limited to 'mail/component-factory.c')
| -rw-r--r-- | mail/component-factory.c | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/mail/component-factory.c b/mail/component-factory.c index dfc1e97f17..b78465c6a5 100644 --- a/mail/component-factory.c +++ b/mail/component-factory.c @@ -20,19 +20,23 @@ * Boston, MA 02111-1307, USA. */ + #ifdef HAVE_CONFIG_H #include <config.h> #endif #include <string.h> +#include <signal.h> #include <gconf/gconf.h> #include <gconf/gconf-client.h> +#include <camel/camel.h> + #include <bonobo/bonobo-generic-factory.h> -#include <gal/widgets/e-gui-utils.h> +#include <bonobo/bonobo-shlib-factory.h> -#include "camel.h" +#include <gal/widgets/e-gui-utils.h> #include "Evolution.h" #include "evolution-storage.h" @@ -46,6 +50,8 @@ #include "mail.h" #include "mail-config.h" #include "mail-config-factory.h" +#include "mail-preferences.h" +#include "mail-composer-prefs.h" #include "mail-tools.h" #include "mail-ops.h" #include "mail-offline-handler.h" @@ -1593,14 +1599,6 @@ mail_storages_foreach (GHFunc func, gpointer data) } - -#include <signal.h> - -#include <bonobo/bonobo-shlib-factory.h> -#include "folder-info.h" -#include "mail-preferences.h" -#include "mail-composer-prefs.h" - #define FACTORY_ID "OAFIID:GNOME_Evolution_Mail_ControlFactory" #define MAIL_CONFIG_IID "OAFIID:GNOME_Evolution_MailConfig" @@ -1630,7 +1628,7 @@ factory (BonoboGenericFactory *factory, || strcmp (component_id, MAIL_PREFERENCES_CONTROL_ID) == 0 || strcmp (component_id, MAIL_COMPOSER_PREFS_CONTROL_ID) == 0 || strcmp (component_id, MAIL_FONT_PREFS_CONTROL_ID) == 0) - return config_control_factory_cb(factory, component_id, evolution_shell_client_corba_objref (global_shell_client)); + return mail_config_control_factory_cb (factory, component_id, evolution_shell_client_corba_objref (global_shell_client)); g_warning (FACTORY_ID ": Don't know what to do with %s", component_id); return NULL; |