From c854f31db5a75af96de548314eae83434a8012fc Mon Sep 17 00:00:00 2001 From: Sergio Villar Senin Date: Tue, 27 Oct 2009 17:06:23 +0100 Subject: [PATCH] Moved connection specific smpt window to widgets --- src/hildon2/Makefile.am | 1 - .../modest-connection-specific-smtp-window.h | 84 -------------------- src/modest-ui-actions.c | 4 +- src/widgets/Makefile.am | 1 + .../modest-connection-specific-smtp-window.h | 84 ++++++++++++++++++++ 5 files changed, 87 insertions(+), 87 deletions(-) delete mode 100644 src/hildon2/modest-connection-specific-smtp-window.h create mode 100644 src/widgets/modest-connection-specific-smtp-window.h diff --git a/src/hildon2/Makefile.am b/src/hildon2/Makefile.am index ca85b2d..9dd557d 100644 --- a/src/hildon2/Makefile.am +++ b/src/hildon2/Makefile.am @@ -86,7 +86,6 @@ libmodest_ui_la_SOURCES= \ modest-maemo-utils.c \ modest-number-editor.c \ modest-number-editor.h \ - modest-connection-specific-smtp-window.h \ modest-connection-specific-smtp-window.c \ modest-connection-specific-smtp-edit-window.h \ modest-connection-specific-smtp-edit-window.c \ diff --git a/src/hildon2/modest-connection-specific-smtp-window.h b/src/hildon2/modest-connection-specific-smtp-window.h deleted file mode 100644 index 279681e..0000000 --- a/src/hildon2/modest-connection-specific-smtp-window.h +++ /dev/null @@ -1,84 +0,0 @@ -/* Copyright (c) 2006, Nokia Corporation - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are - * met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * * Neither the name of the Nokia Corporation nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS - * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED - * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A - * PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER - * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -#ifndef __MODEST_MAEMO_CONNECTION_SPECIFIC_SMTP_WINDOW -#define __MODEST_MAEMO_CONNECTION_SPECIFIC_SMTP_WINDOW - -#include -#include -#include -#include - -G_BEGIN_DECLS - -#define MODEST_TYPE_CONNECTION_SPECIFIC_SMTP_WINDOW modest_connection_specific_smtp_window_get_type() - -#define MODEST_CONNECTION_SPECIFIC_SMTP_WINDOW(obj) \ - (G_TYPE_CHECK_INSTANCE_CAST ((obj), \ - MODEST_TYPE_CONNECTION_SPECIFIC_SMTP_WINDOW, ModestConnectionSpecificSmtpWindow)) - -#define MODEST_CONNECTION_SPECIFIC_SMTP_WINDOW_CLASS(klass) \ - (G_TYPE_CHECK_CLASS_CAST ((klass), \ - MODEST_TYPE_CONNECTION_SPECIFIC_SMTP_WINDOW, ModestConnectionSpecificSmtpWindowClass)) - -#define MODEST_IS_CONNECTION_SPECIFIC_SMTP_WINDOW(obj) \ - (G_TYPE_CHECK_INSTANCE_TYPE ((obj), \ - MODEST_TYPE_CONNECTION_SPECIFIC_SMTP_WINDOW)) - -#define MODEST_IS_CONNECTION_SPECIFIC_SMTP_WINDOW_CLASS(klass) \ - (G_TYPE_CHECK_CLASS_TYPE ((klass), \ - MODEST_TYPE_CONNECTION_SPECIFIC_SMTP_WINDOW)) - -#define MODEST_CONNECTION_SPECIFIC_SMTP_WINDOW_GET_CLASS(obj) \ - (G_TYPE_INSTANCE_GET_CLASS ((obj), \ - MODEST_TYPE_CONNECTION_SPECIFIC_SMTP_WINDOW, ModestConnectionSpecificSmtpWindowClass)) - -typedef struct { - GtkDialog parent; - -} ModestConnectionSpecificSmtpWindow; - -typedef struct { - GtkDialogClass parent_class; -} ModestConnectionSpecificSmtpWindowClass; - -GType modest_connection_specific_smtp_window_get_type (void); - -ModestConnectionSpecificSmtpWindow* modest_connection_specific_smtp_window_new (void); - -void -modest_connection_specific_smtp_window_fill_with_connections (ModestConnectionSpecificSmtpWindow *self, - ModestAccountMgr *account_manager); - -gboolean -modest_connection_specific_smtp_window_save_server_accounts (ModestConnectionSpecificSmtpWindow *self); - -G_END_DECLS - -#endif /* __MODEST_MAEMO_CONNECTION_SPECIFIC_SMTP_WINDOW */ diff --git a/src/modest-ui-actions.c b/src/modest-ui-actions.c index ef69d9c..b79886c 100644 --- a/src/modest-ui-actions.c +++ b/src/modest-ui-actions.c @@ -58,8 +58,8 @@ #include #include #endif - -#include +#include "modest-utils.h" +#include "widgets/modest-connection-specific-smtp-window.h" #include "widgets/modest-ui-constants.h" #include #include diff --git a/src/widgets/Makefile.am b/src/widgets/Makefile.am index 659bbf6..55327e8 100644 --- a/src/widgets/Makefile.am +++ b/src/widgets/Makefile.am @@ -46,6 +46,7 @@ libmodest_widgets_la_SOURCES= \ modest-combo-box.h \ modest-compact-mail-header-view.c \ modest-compact-mail-header-view.h \ + modest-connection-specific-smtp-window.h \ modest-default-account-settings-dialog.h \ modest-dnd.c \ modest-dnd.h \ diff --git a/src/widgets/modest-connection-specific-smtp-window.h b/src/widgets/modest-connection-specific-smtp-window.h new file mode 100644 index 0000000..279681e --- /dev/null +++ b/src/widgets/modest-connection-specific-smtp-window.h @@ -0,0 +1,84 @@ +/* Copyright (c) 2006, Nokia Corporation + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are + * met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * * Neither the name of the Nokia Corporation nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS + * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED + * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A + * PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER + * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#ifndef __MODEST_MAEMO_CONNECTION_SPECIFIC_SMTP_WINDOW +#define __MODEST_MAEMO_CONNECTION_SPECIFIC_SMTP_WINDOW + +#include +#include +#include +#include + +G_BEGIN_DECLS + +#define MODEST_TYPE_CONNECTION_SPECIFIC_SMTP_WINDOW modest_connection_specific_smtp_window_get_type() + +#define MODEST_CONNECTION_SPECIFIC_SMTP_WINDOW(obj) \ + (G_TYPE_CHECK_INSTANCE_CAST ((obj), \ + MODEST_TYPE_CONNECTION_SPECIFIC_SMTP_WINDOW, ModestConnectionSpecificSmtpWindow)) + +#define MODEST_CONNECTION_SPECIFIC_SMTP_WINDOW_CLASS(klass) \ + (G_TYPE_CHECK_CLASS_CAST ((klass), \ + MODEST_TYPE_CONNECTION_SPECIFIC_SMTP_WINDOW, ModestConnectionSpecificSmtpWindowClass)) + +#define MODEST_IS_CONNECTION_SPECIFIC_SMTP_WINDOW(obj) \ + (G_TYPE_CHECK_INSTANCE_TYPE ((obj), \ + MODEST_TYPE_CONNECTION_SPECIFIC_SMTP_WINDOW)) + +#define MODEST_IS_CONNECTION_SPECIFIC_SMTP_WINDOW_CLASS(klass) \ + (G_TYPE_CHECK_CLASS_TYPE ((klass), \ + MODEST_TYPE_CONNECTION_SPECIFIC_SMTP_WINDOW)) + +#define MODEST_CONNECTION_SPECIFIC_SMTP_WINDOW_GET_CLASS(obj) \ + (G_TYPE_INSTANCE_GET_CLASS ((obj), \ + MODEST_TYPE_CONNECTION_SPECIFIC_SMTP_WINDOW, ModestConnectionSpecificSmtpWindowClass)) + +typedef struct { + GtkDialog parent; + +} ModestConnectionSpecificSmtpWindow; + +typedef struct { + GtkDialogClass parent_class; +} ModestConnectionSpecificSmtpWindowClass; + +GType modest_connection_specific_smtp_window_get_type (void); + +ModestConnectionSpecificSmtpWindow* modest_connection_specific_smtp_window_new (void); + +void +modest_connection_specific_smtp_window_fill_with_connections (ModestConnectionSpecificSmtpWindow *self, + ModestAccountMgr *account_manager); + +gboolean +modest_connection_specific_smtp_window_save_server_accounts (ModestConnectionSpecificSmtpWindow *self); + +G_END_DECLS + +#endif /* __MODEST_MAEMO_CONNECTION_SPECIFIC_SMTP_WINDOW */ -- 1.7.9.5