From 3adac597cff883050c09e765cb1c8e3cde05e3c9 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 15 Jun 2009 14:15:10 +0200 Subject: Leak a bit less. Use proper function prototype. The first is for mail, the second for publish-calendar plugin. --- plugins/publish-calendar/publish-calendar.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'plugins') diff --git a/plugins/publish-calendar/publish-calendar.c b/plugins/publish-calendar/publish-calendar.c index 43e093eff2..e1818d7bac 100644 --- a/plugins/publish-calendar/publish-calendar.c +++ b/plugins/publish-calendar/publish-calendar.c @@ -776,7 +776,7 @@ action_publish (EPlugin *ep, ECalMenuTargetSelect *t) error_queue_add (g_strdup (_("Could not create publish thread.")), error); } -static void +static gpointer publish_uris_set_timeout (GSList *uris) { GSList *l; @@ -804,6 +804,8 @@ publish_uris_set_timeout (GSList *uris) } g_slist_foreach (uris, (GFunc) g_free, NULL); g_slist_free (uris); + + return NULL; } gint -- cgit From b1f79dd4754409ed6ef310121bf4dc86e5fc781e Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Thu, 18 Jun 2009 15:21:37 +0200 Subject: Bug #586251 - Let the SSL checkbox for Google calendar work User is supposed to re-edit his Google calendar account to let this work (and restart whole Evolution too). --- plugins/google-account-setup/google-source.c | 130 +++++++++++++++------------ 1 file changed, 75 insertions(+), 55 deletions(-) (limited to 'plugins') diff --git a/plugins/google-account-setup/google-source.c b/plugins/google-account-setup/google-source.c index d475bf8036..45d21ba762 100644 --- a/plugins/google-account-setup/google-source.c +++ b/plugins/google-account-setup/google-source.c @@ -49,9 +49,9 @@ #include "google-contacts-source.h" -#define CALENDAR_LOCATION "http://www.google.com/calendar/feeds/" +#define CALENDAR_LOCATION "://www.google.com/calendar/feeds/" #define CALENDAR_DEFAULT_PATH "/private/full" -#define URL_GET_SUBSCRIBED_CALENDARS "http://www.google.com/calendar/feeds/default/allcalendars/full" +#define URL_GET_SUBSCRIBED_CALENDARS "://www.google.com/calendar/feeds/default/allcalendars/full" #define d(x) @@ -99,19 +99,6 @@ e_plugin_lib_enable (EPluginLib *ep, gint enable) /********************************************************************************************************************/ -#if 0 - -FIXME: Not sure why this function is declared but called no where. This needs fixing. - -static void -ssl_changed (GtkToggleButton *button, ESource *source) -{ - e_source_set_property(source, "ssl", - gtk_toggle_button_get_active(button) ? "1" : "0"); -} - -#endif - static gboolean is_email (const gchar *address) @@ -149,12 +136,12 @@ sanitize_user_mail (const gchar *user) } static gchar * -construct_default_uri (const gchar *username) +construct_default_uri (const gchar *username, gboolean is_ssl) { gchar *user, *uri; user = sanitize_user_mail (username); - uri = g_strconcat (CALENDAR_LOCATION, user, CALENDAR_DEFAULT_PATH, NULL); + uri = g_strconcat (is_ssl ? "https" : "http", CALENDAR_LOCATION, user, CALENDAR_DEFAULT_PATH, NULL); g_free (user); return uri; @@ -165,40 +152,43 @@ static gboolean is_default_uri (const gchar *given_uri, const gchar *username) { gchar *uri, *at; - gint ats; - gboolean res; + gint ats, i; + gboolean res = FALSE; if (!given_uri) return TRUE; - uri = construct_default_uri (username); + for (i = 0; !res && i < 2; i++) { + /* try both versions here, with and without ssl */ + uri = construct_default_uri (username, i == 0); - /* count number of '@' in given_uri to know how much memory will be required */ - ats = 0; - for (at = strchr (given_uri, '@'); at; at = strchr (at + 1, '@')) { - ats++; - } - - if (!ats) - res = g_ascii_strcasecmp (given_uri, uri) == 0; - else { - const gchar *last; - gchar *tmp = g_malloc0 (sizeof (gchar) * (1 + strlen (given_uri) + (2 * ats))); - - last = given_uri; - for (at = strchr (last, '@'); at; at = strchr (at + 1, '@')) { - strncat (tmp, last, at - last); - strcat (tmp, "%40"); - last = at + 1; + /* count number of '@' in given_uri to know how much memory will be required */ + ats = 0; + for (at = strchr (given_uri, '@'); at; at = strchr (at + 1, '@')) { + ats++; } - strcat (tmp, last); - res = g_ascii_strcasecmp (tmp, uri) == 0; + if (!ats) + res = g_ascii_strcasecmp (given_uri, uri) == 0; + else { + const gchar *last; + gchar *tmp = g_malloc0 (sizeof (gchar) * (1 + strlen (given_uri) + (2 * ats))); + + last = given_uri; + for (at = strchr (last, '@'); at; at = strchr (at + 1, '@')) { + strncat (tmp, last, at - last); + strcat (tmp, "%40"); + last = at + 1; + } + strcat (tmp, last); - g_free (tmp); - } + res = g_ascii_strcasecmp (tmp, uri) == 0; - g_free (uri); + g_free (tmp); + } + + g_free (uri); + } return res; } @@ -209,15 +199,16 @@ static void user_changed (GtkEntry *editable, ESource *source) { gchar *uri; - const gchar *user; + const gchar *user, *ssl; /* two reasons why set readonly to FALSE: a) the e_source_set_relative_uri does nothing for readonly sources b) we are going to set default uri, which should be always writeable */ e_source_set_readonly (source, FALSE); + ssl = e_source_get_property (source, "ssl"); user = gtk_entry_get_text (GTK_ENTRY (editable)); - uri = construct_default_uri (user); + uri = construct_default_uri (user, !ssl || g_str_equal (ssl, "1")); e_source_set_relative_uri (source, uri); g_free (uri); @@ -360,8 +351,10 @@ cal_combo_changed (GtkComboBox *combo, ESource *source) gtk_tree_model_get (GTK_TREE_MODEL (store), &iter, COL_TITLE, &title, COL_URL_PATH, &uri, COL_READ_ONLY, &readonly, -1); - if (!uri) - uri = construct_default_uri (e_source_get_property (source, "username")); + if (!uri) { + const gchar *ssl = e_source_get_property (source, "ssl"); + uri = construct_default_uri (e_source_get_property (source, "username"), !ssl || g_str_equal (ssl, "1")); + } if (is_default_uri (uri, e_source_get_property (source, "username"))) { /* do not store title when we use default uri */ @@ -404,7 +397,8 @@ retrieve_list_clicked (GtkButton *button, GtkComboBox *combo) GDataGoogleService *service; GDataFeed *feed; gchar *password, *tmp; - const gchar *username; + const gchar *username, *ssl; + gchar *get_subscribed_url; GError *error = NULL; GtkWindow *parent; @@ -434,7 +428,10 @@ retrieve_list_clicked (GtkButton *button, GtkComboBox *combo) memset (password, 0, strlen (password)); g_free (password); - feed = gdata_service_get_feed (GDATA_SERVICE (service), URL_GET_SUBSCRIBED_CALENDARS, &error); + ssl = e_source_get_property (source, "ssl"); + get_subscribed_url = g_strconcat ((!ssl || g_str_equal (ssl, "1")) ? "https" : "http", URL_GET_SUBSCRIBED_CALENDARS, NULL); + feed = gdata_service_get_feed (GDATA_SERVICE (service), get_subscribed_url, &error); + g_free (get_subscribed_url); if (feed) { GSList *l; @@ -544,6 +541,20 @@ retrieve_list_sensitize (GtkEntry *username_entry, gtk_widget_set_sensitive (button, sensitive); } +static void +ssl_toggled (GtkToggleButton *check, ESource *source) +{ + g_return_if_fail (check != NULL); + g_return_if_fail (source != NULL); + + if (gtk_toggle_button_get_active (check)) + e_source_set_property (source, "ssl", "1"); + else + e_source_set_property (source, "ssl", "0"); + + user_changed (GTK_ENTRY (g_object_get_data (G_OBJECT (check), "username")), source); +} + GtkWidget * plugin_google (EPlugin *epl, EConfigHookItemFactoryData *data) @@ -585,19 +596,27 @@ plugin_google (EPlugin *epl, return NULL; } + e_uri_free (euri); + username = e_source_get_property (source, "username"); - g_free (euri->user); - euri->user = NULL; - uri = e_uri_to_string (euri, FALSE); ssl_prop = e_source_get_property (source, "ssl"); - if (ssl_prop && ssl_prop[0] == '1') { + if (!ssl_prop || g_str_equal (ssl_prop, "1")) { ssl_enabled = TRUE; } else { ssl_enabled = FALSE; } - e_source_set_property (source, "ssl", "1"); + if (!ssl_prop) { + e_source_set_property (source, "ssl", "1"); + } else if (ssl_enabled) { + const gchar *rel_uri = e_source_peek_relative_uri (source); + + if (rel_uri && g_str_has_prefix (rel_uri, "http://")) { + ssl_enabled = FALSE; + e_source_set_property (source, "ssl", "0"); + } + } /* Build up the UI */ parent = data->parent; @@ -664,13 +683,14 @@ plugin_google (EPlugin *epl, gtk_table_attach (GTK_TABLE (parent), hbox, 1, 2, row + 2, row + 3, GTK_EXPAND | GTK_FILL, 0, 0, 0); + g_object_set_data (G_OBJECT (cssl), "username", user); + g_signal_connect (cssl, "toggled", G_CALLBACK (ssl_toggled), source); + g_signal_connect (G_OBJECT (user), "changed", G_CALLBACK (user_changed), source); - g_free (uri); - label = gtk_label_new_with_mnemonic (_("Cal_endar:")); gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); gtk_widget_show (label); -- cgit From 67159043da2de9df576f6a4eaa245e0c3926f004 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Thu, 18 Jun 2009 12:56:51 -0400 Subject: Use G_BEGIN_DECLS / G_END_DECLS macros. --- plugins/exchange-operations/exchange-change-password.h | 9 ++------- plugins/exchange-operations/exchange-config-listener.h | 9 ++------- plugins/exchange-operations/exchange-delegates-user.h | 9 ++------- plugins/exchange-operations/exchange-delegates.h | 9 ++------- plugins/exchange-operations/exchange-folder-size-display.h | 9 ++------- plugins/exchange-operations/exchange-operations.h | 9 ++------- plugins/exchange-operations/exchange-permissions-dialog.h | 9 ++------- plugins/groupwise-features/junk-settings.h | 9 ++------- plugins/groupwise-features/share-folder.h | 9 ++------- 9 files changed, 18 insertions(+), 63 deletions(-) (limited to 'plugins') diff --git a/plugins/exchange-operations/exchange-change-password.h b/plugins/exchange-operations/exchange-change-password.h index 389922f1b3..c33a887c50 100644 --- a/plugins/exchange-operations/exchange-change-password.h +++ b/plugins/exchange-operations/exchange-change-password.h @@ -23,16 +23,11 @@ #include -#ifdef __cplusplus -extern "C" { -#pragma } -#endif /* __cplusplus */ +G_BEGIN_DECLS gchar *exchange_get_new_password (const gchar *existing_password, gboolean voluntary); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* __EXCHANGE_CHANGE_PASSWORD_H__ */ diff --git a/plugins/exchange-operations/exchange-config-listener.h b/plugins/exchange-operations/exchange-config-listener.h index c079b7eac7..07051bcecc 100644 --- a/plugins/exchange-operations/exchange-config-listener.h +++ b/plugins/exchange-operations/exchange-config-listener.h @@ -29,10 +29,7 @@ #include #include -#ifdef __cplusplus -extern "C" { -#pragma } -#endif /* __cplusplus */ +G_BEGIN_DECLS typedef enum { CONFIG_LISTENER_STATUS_OK, @@ -82,8 +79,6 @@ void exchange_config_listener_modify_esource_group_name (ExchangeConfigListener ExchangeAccountResult exchange_config_listener_authenticate (ExchangeConfigListener *excl, ExchangeAccount *account); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* __EXCHANGE_CONFIG_LISTENER_H__ */ diff --git a/plugins/exchange-operations/exchange-delegates-user.h b/plugins/exchange-operations/exchange-delegates-user.h index d1a38ca876..deb5b04152 100644 --- a/plugins/exchange-operations/exchange-delegates-user.h +++ b/plugins/exchange-operations/exchange-delegates-user.h @@ -25,10 +25,7 @@ #include #include -#ifdef __cplusplus -extern "C" { -#pragma } -#endif /* __cplusplus */ +G_BEGIN_DECLS #define EXCHANGE_TYPE_DELEGATES_USER (exchange_delegates_user_get_type ()) #define EXCHANGE_DELEGATES_USER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), EXCHANGE_TYPE_DELEGATES_USER, ExchangeDelegatesUser)) @@ -81,8 +78,6 @@ gboolean exchange_delegates_user_edit (ExchangeAccount *account, ExchangeDeleg -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* __EXCHANGE_DELEGATES_USER_H__ */ diff --git a/plugins/exchange-operations/exchange-delegates.h b/plugins/exchange-operations/exchange-delegates.h index 5defd27f9a..ae890479d6 100644 --- a/plugins/exchange-operations/exchange-delegates.h +++ b/plugins/exchange-operations/exchange-delegates.h @@ -24,16 +24,11 @@ #include #include -#ifdef __cplusplus -extern "C" { -#pragma } -#endif /* __cplusplus */ +G_BEGIN_DECLS void exchange_delegates (ExchangeAccount *account, GtkWidget *parent); const gchar *email_look_up (const gchar *delegate_legacy, ExchangeAccount *account); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* __EXCHANGE_DELEGATES_CONTROL_H__ */ diff --git a/plugins/exchange-operations/exchange-folder-size-display.h b/plugins/exchange-operations/exchange-folder-size-display.h index 08f22c7114..13d112c9ef 100644 --- a/plugins/exchange-operations/exchange-folder-size-display.h +++ b/plugins/exchange-operations/exchange-folder-size-display.h @@ -23,16 +23,11 @@ #include -#ifdef __cplusplus -extern "C" { -#pragma } -#endif /* __cplusplus */ +G_BEGIN_DECLS void exchange_folder_size_display (GtkListStore *model, GtkWidget *parent); gchar * exchange_folder_size_get_val (GtkListStore *model, const gchar *folder_name); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* __EXCHANGE_FOLDER_SIZE_DISPLAY_H__ */ diff --git a/plugins/exchange-operations/exchange-operations.h b/plugins/exchange-operations/exchange-operations.h index 3b4518f5fa..d735ff8ce8 100644 --- a/plugins/exchange-operations/exchange-operations.h +++ b/plugins/exchange-operations/exchange-operations.h @@ -29,10 +29,7 @@ #include "exchange-config-listener.h" #include -#ifdef __cplusplus -extern "C" { -#pragma } -#endif /* __cplusplus */ +G_BEGIN_DECLS #define ERROR_DOMAIN "org-gnome-exchange-operations" @@ -54,8 +51,6 @@ void exchange_operations_update_child_esources (ESource *source, const gchar *ol gboolean is_exchange_personal_folder (ExchangeAccount *account, gchar *uri); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif diff --git a/plugins/exchange-operations/exchange-permissions-dialog.h b/plugins/exchange-operations/exchange-permissions-dialog.h index 18bdcd4371..ad2f47de4e 100644 --- a/plugins/exchange-operations/exchange-permissions-dialog.h +++ b/plugins/exchange-operations/exchange-permissions-dialog.h @@ -26,10 +26,7 @@ #include "e-folder.h" #include "exchange-types.h" -#ifdef __cplusplus -extern "C" { -#pragma } -#endif /* __cplusplus */ +G_BEGIN_DECLS #define EXCHANGE_TYPE_PERMISSIONS_DIALOG (exchange_permissions_dialog_get_type ()) #define EXCHANGE_PERMISSIONS_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), EXCHANGE_TYPE_PERMISSIONS_DIALOG, ExchangePermissionsDialog)) @@ -54,8 +51,6 @@ void exchange_permissions_dialog_new (ExchangeAccount *account, EFolder *folder, GtkWidget *parent); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* __EXCHANGE_PERMISSIONS_DIALOG_H__ */ diff --git a/plugins/groupwise-features/junk-settings.h b/plugins/groupwise-features/junk-settings.h index 13e8a25c9b..fd728cbb21 100644 --- a/plugins/groupwise-features/junk-settings.h +++ b/plugins/groupwise-features/junk-settings.h @@ -24,10 +24,7 @@ #ifndef __JUNK_SETTINGS_H__ #define __JUNK_SETTINGS_H__ -#ifdef __cplusplus -extern "C" { -#pragma } -#endif /* __cplusplus */ +G_BEGIN_DECLS #include #include @@ -95,8 +92,6 @@ GType junk_settings_get_type (void); struct _JunkSettings * junk_settings_new (EGwConnection *ccnc); void commit_changes (JunkSettings *js); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* __JUNK_SETTINGS_H__ */ diff --git a/plugins/groupwise-features/share-folder.h b/plugins/groupwise-features/share-folder.h index 8ff4ec3521..d95d9732a4 100644 --- a/plugins/groupwise-features/share-folder.h +++ b/plugins/groupwise-features/share-folder.h @@ -24,10 +24,7 @@ #ifndef __SHARE_FOLDER_H__ #define __SHARE_FOLDER_H__ -#ifdef __cplusplus -extern "C" { -#pragma } -#endif /* __cplusplus */ +G_BEGIN_DECLS #include #include @@ -112,8 +109,6 @@ void share_folder(struct _ShareFolder *sf); gchar * get_container_id (EGwConnection *cnc, const gchar *fname); EGwConnection * get_cnc (CamelStore *store); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* __SHARE_FOLDER_H__ */ -- cgit From 547e123d2777bd3beba36e74e018efb590ed44d4 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Thu, 18 Jun 2009 15:26:21 -0400 Subject: Stop abusing forward declarations. --- plugins/addressbook-file/addressbook-file.c | 4 +- .../groupwise-account-setup/camel-gw-listener.h | 1 + plugins/groupwise-features/junk-settings.h | 44 +++++++------------ plugins/groupwise-features/share-folder.h | 50 ++++++++-------------- plugins/hula-account-setup/camel-hula-listener.h | 1 + plugins/mail-account-disable/Makefile.am | 1 + plugins/mail-notification/Makefile.am | 1 + plugins/mail-to-task/Makefile.am | 1 + plugins/mail-to-task/mail-to-task.c | 4 +- plugins/publish-calendar/Makefile.am | 1 + plugins/save-calendar/Makefile.am | 1 + plugins/select-one-source/Makefile.am | 1 + 12 files changed, 45 insertions(+), 65 deletions(-) (limited to 'plugins') diff --git a/plugins/addressbook-file/addressbook-file.c b/plugins/addressbook-file/addressbook-file.c index d651ad4a56..960c844aa4 100644 --- a/plugins/addressbook-file/addressbook-file.c +++ b/plugins/addressbook-file/addressbook-file.c @@ -25,9 +25,9 @@ #include #include -struct _GtkWidget *e_book_file_dummy (EPlugin *epl, EConfigHookItemFactoryData *data); +GtkWidget *e_book_file_dummy (EPlugin *epl, EConfigHookItemFactoryData *data); -struct _GtkWidget * +GtkWidget * e_book_file_dummy (EPlugin *epl, EConfigHookItemFactoryData *data) { EABConfigTargetSource *t = (EABConfigTargetSource *) data->target; diff --git a/plugins/groupwise-account-setup/camel-gw-listener.h b/plugins/groupwise-account-setup/camel-gw-listener.h index 9682a6877b..1c4cedbe5a 100644 --- a/plugins/groupwise-account-setup/camel-gw-listener.h +++ b/plugins/groupwise-account-setup/camel-gw-listener.h @@ -40,6 +40,7 @@ G_BEGIN_DECLS typedef struct _CamelGwListener CamelGwListener; typedef struct _CamelGwListenerClass CamelGwListenerClass; typedef struct _CamelGwListenerPrivate CamelGwListenerPrivate; + struct _CamelGwListener { GObject parent; diff --git a/plugins/groupwise-features/junk-settings.h b/plugins/groupwise-features/junk-settings.h index fd728cbb21..3216ed9d9b 100644 --- a/plugins/groupwise-features/junk-settings.h +++ b/plugins/groupwise-features/junk-settings.h @@ -39,41 +39,27 @@ G_BEGIN_DECLS typedef struct _JunkSettings JunkSettings; typedef struct _JunkSettingsClass JunkSettingsClass; -struct _GtkWidget; -struct _GladeXML; -struct _GtkButton; -struct _GtkTreeView; -struct _GtkLabel; -struct _GtkEntry; -struct _GtkWindow; -struct _GtkRadioButton; -struct _GtkListStore; -struct _GtkCellRenderer; -struct _GtkTreeViewColumn; -struct _GtkFrame; -struct _GtkVBox; - struct _JunkSettings { GtkVBox parent_object; - struct _GladeXML *xml; + GladeXML *xml; /* General tab */ /* Default Behavior */ - struct _GtkTreeView *entry_list; - struct _GtkButton *add_button; - struct _GtkButton *remove; - struct _GtkEntry *entry; - struct _GtkRadioButton *enable; - struct _GtkRadioButton *disable; - struct _GtkWidget *scrolled_window; - struct _GtkListStore *model; - struct _GtkCellRenderer *cell; - struct _GtkTreeViewColumn *column; - struct _GtkVBox *vbox; - struct _GtkVBox *table; - struct _GtkWidget *window; + GtkTreeView *entry_list; + GtkButton *add_button; + GtkButton *remove; + GtkEntry *entry; + GtkRadioButton *enable; + GtkRadioButton *disable; + GtkWidget *scrolled_window; + GtkListStore *model; + GtkCellRenderer *cell; + GtkTreeViewColumn *column; + GtkVBox *vbox; + GtkVBox *table; + GtkWidget *window; GList *junk_list; gint users; @@ -89,7 +75,7 @@ struct _JunkSettingsClass { }; GType junk_settings_get_type (void); -struct _JunkSettings * junk_settings_new (EGwConnection *ccnc); +JunkSettings * junk_settings_new (EGwConnection *ccnc); void commit_changes (JunkSettings *js); G_END_DECLS diff --git a/plugins/groupwise-features/share-folder.h b/plugins/groupwise-features/share-folder.h index d95d9732a4..5108d02c19 100644 --- a/plugins/groupwise-features/share-folder.h +++ b/plugins/groupwise-features/share-folder.h @@ -40,45 +40,31 @@ G_BEGIN_DECLS typedef struct _ShareFolder ShareFolder; typedef struct _ShareFolderClass ShareFolderClass; -struct _GtkWidget; -struct _GladeXML; -struct _GtkButton; -struct _GtkTreeView; -struct _GtkLabel; -struct _GtkEntry; -struct _GtkWindow; -struct _GtkRadioButton; -struct _GtkListStore; -struct _GtkCellRenderer; -struct _GtkTreeViewColumn; -struct _GtkFrame; -struct _GtkVBox; - struct _ShareFolder { GtkVBox parent_object; - struct _GladeXML *xml; + GladeXML *xml; /* General tab */ /* Default Behavior */ - struct _GtkTreeView *user_list; - struct _GtkTextView *message; - struct _GtkButton *add_button; - struct _GtkButton *remove; - struct _GtkButton *add_book; - struct _GtkButton *notification; - struct _GtkEntry *name; - struct _GtkEntry *subject; - struct _GtkRadioButton *shared; - struct _GtkRadioButton *not_shared; - struct _GtkWidget *scrolled_window; - struct _GtkListStore *model; - struct _GtkCellRenderer *cell; - struct _GtkTreeViewColumn *column; - struct _GtkVBox *vbox; - struct _GtkVBox *table; - struct _GtkWidget *window; + GtkTreeView *user_list; + GtkTextView *message; + GtkButton *add_button; + GtkButton *remove; + GtkButton *add_book; + GtkButton *notification; + GtkEntry *name; + GtkEntry *subject; + GtkRadioButton *shared; + GtkRadioButton *not_shared; + GtkWidget *scrolled_window; + GtkListStore *model; + GtkCellRenderer *cell; + GtkTreeViewColumn *column; + GtkVBox *vbox; + GtkVBox *table; + GtkWidget *window; GList *users_list; EGwContainer *gcontainer; diff --git a/plugins/hula-account-setup/camel-hula-listener.h b/plugins/hula-account-setup/camel-hula-listener.h index 9a0c3642eb..97c1b33919 100644 --- a/plugins/hula-account-setup/camel-hula-listener.h +++ b/plugins/hula-account-setup/camel-hula-listener.h @@ -40,6 +40,7 @@ G_BEGIN_DECLS typedef struct _CamelHulaListener CamelHulaListener; typedef struct _CamelHulaListenerClass CamelHulaListenerClass; typedef struct _CamelHulaListenerPrivate CamelHulaListenerPrivate; + struct _CamelHulaListener { GObject parent; diff --git a/plugins/mail-account-disable/Makefile.am b/plugins/mail-account-disable/Makefile.am index 5616f273ea..d10638d90a 100644 --- a/plugins/mail-account-disable/Makefile.am +++ b/plugins/mail-account-disable/Makefile.am @@ -1,5 +1,6 @@ INCLUDES = \ -I$(top_srcdir) \ + -I$(top_srcdir)/widgets \ -I$(top_builddir)/mail \ $(EVOLUTION_MAIL_CFLAGS) \ -DEVOLUTION_GLADEDIR=\""$(gladedir)"\" diff --git a/plugins/mail-notification/Makefile.am b/plugins/mail-notification/Makefile.am index 4228a90be5..f3434fd4e8 100644 --- a/plugins/mail-notification/Makefile.am +++ b/plugins/mail-notification/Makefile.am @@ -7,6 +7,7 @@ endif INCLUDES = \ -I$(top_srcdir) \ + -I$(top_srcdir)/widgets \ $(EVOLUTION_MAIL_CFLAGS) \ $(LIBNOTIFY_CFLAGS) diff --git a/plugins/mail-to-task/Makefile.am b/plugins/mail-to-task/Makefile.am index 9a3749d676..5261fbcf97 100644 --- a/plugins/mail-to-task/Makefile.am +++ b/plugins/mail-to-task/Makefile.am @@ -1,5 +1,6 @@ INCLUDES = \ -I$(top_srcdir) \ + -I$(top_srcdir)/widgets \ $(EVOLUTION_CALENDAR_CFLAGS) \ $(EVOLUTION_MAIL_CFLAGS) diff --git a/plugins/mail-to-task/mail-to-task.c b/plugins/mail-to-task/mail-to-task.c index 78fd37b999..e7fa727ff1 100644 --- a/plugins/mail-to-task/mail-to-task.c +++ b/plugins/mail-to-task/mail-to-task.c @@ -323,7 +323,7 @@ report_error_idle (const gchar *format, const gchar *param) typedef struct { ECal *client; - struct _CamelFolder *folder; + CamelFolder *folder; GPtrArray *uids; gchar *selected_text; gboolean with_attendees; @@ -333,7 +333,7 @@ static gboolean do_mail_to_event (AsyncData *data) { ECal *client = data->client; - struct _CamelFolder *folder = data->folder; + CamelFolder *folder = data->folder; GPtrArray *uids = data->uids; GError *err = NULL; gboolean readonly = FALSE; diff --git a/plugins/publish-calendar/Makefile.am b/plugins/publish-calendar/Makefile.am index 3c794393b2..c8119f48bb 100644 --- a/plugins/publish-calendar/Makefile.am +++ b/plugins/publish-calendar/Makefile.am @@ -1,5 +1,6 @@ INCLUDES = \ -I$(top_srcdir) \ + -I$(top_srcdir)/widgets \ -I$(top_builddir)/shell \ $(EVOLUTION_CALENDAR_CFLAGS) \ -DEVOLUTION_PLUGINDIR="\"$(plugindir)\"" \ diff --git a/plugins/save-calendar/Makefile.am b/plugins/save-calendar/Makefile.am index 6894e6b21e..8336dd12ec 100644 --- a/plugins/save-calendar/Makefile.am +++ b/plugins/save-calendar/Makefile.am @@ -1,5 +1,6 @@ INCLUDES = \ -I$(top_srcdir) \ + -I$(top_srcdir)/widgets \ $(EVOLUTION_CALENDAR_CFLAGS) @EVO_PLUGIN_RULE@ diff --git a/plugins/select-one-source/Makefile.am b/plugins/select-one-source/Makefile.am index 8c872f23a5..ec90904e70 100644 --- a/plugins/select-one-source/Makefile.am +++ b/plugins/select-one-source/Makefile.am @@ -1,5 +1,6 @@ INCLUDES = \ -I$(top_srcdir) \ + -I$(top_srcdir)/widgets \ $(EVOLUTION_CALENDAR_CFLAGS) @EVO_PLUGIN_RULE@ -- cgit From d5f9b1cad71656bbf79e70038e3c3d13a04d3be5 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Thu, 18 Jun 2009 23:43:10 -0400 Subject: Bug 586332 - Build error (long gint) --- plugins/mono/mono-plugin.c | 2 +- plugins/profiler/profiler.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'plugins') diff --git a/plugins/mono/mono-plugin.c b/plugins/mono/mono-plugin.c index 76b1e42da1..ae5f199c46 100644 --- a/plugins/mono/mono-plugin.c +++ b/plugins/mono/mono-plugin.c @@ -159,7 +159,7 @@ epm_invoke(EPlugin *ep, const gchar *name, gpointer data) if (res) { gpointer *p = mono_object_unbox(res); - d(printf("mono method returned '%p' %ld\n", *p, (long gint)*p)); + d(printf("mono method returned '%p' %ld\n", *p, (glong)*p)); return *p; } else return NULL; diff --git a/plugins/profiler/profiler.c b/plugins/profiler/profiler.c index 49e1dffda4..c6843d349b 100644 --- a/plugins/profiler/profiler.c +++ b/plugins/profiler/profiler.c @@ -40,7 +40,7 @@ org_gnome_evolution_profiler_event(EPlugin *ep, EProfileEventTarget *t) if (!fp) { gchar *name; - name = g_strdup_printf("eprofile.%ld", (long gint)getpid()); + name = g_strdup_printf("eprofile.%ld", (glong)getpid()); fp = fopen(name, "w"); if (fp) fprintf(stderr, "Generating profiling data in `%s'\n", name); -- cgit From b3471557bbf63250f6362858cde319ec27080dea Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Fri, 19 Jun 2009 12:32:33 +0200 Subject: ipod-sync - include also 'widgets' directory --- plugins/ipod-sync/Makefile.am | 1 + 1 file changed, 1 insertion(+) (limited to 'plugins') diff --git a/plugins/ipod-sync/Makefile.am b/plugins/ipod-sync/Makefile.am index 570683442e..1ad1d0a4ee 100644 --- a/plugins/ipod-sync/Makefile.am +++ b/plugins/ipod-sync/Makefile.am @@ -1,5 +1,6 @@ INCLUDES = \ -I$(top_srcdir) \ + -I$(top_srcdir)/widgets \ $(EVOLUTION_CALENDAR_CFLAGS) \ -DDBUS_API_SUBJECT_TO_CHANGE -- cgit From 4a2d5ee3455556cc5d61dac2f7fe87045a00b2b2 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Fri, 19 Jun 2009 16:21:08 +0200 Subject: Bug #346146 - Appointments in Sent folder should not display actions --- plugins/itip-formatter/itip-formatter.c | 28 ++++++++++++++++++++++++---- 1 file changed, 24 insertions(+), 4 deletions(-) (limited to 'plugins') diff --git a/plugins/itip-formatter/itip-formatter.c b/plugins/itip-formatter/itip-formatter.c index ed406d9bd2..558d514f86 100644 --- a/plugins/itip-formatter/itip-formatter.c +++ b/plugins/itip-formatter/itip-formatter.c @@ -35,6 +35,7 @@ #include #include #include +#include #include #include #include @@ -48,6 +49,7 @@ #include #include #include +#include #include #include #include @@ -2019,6 +2021,7 @@ static gboolean in_proper_folder (CamelFolder *folder) { gboolean res = TRUE; + gint flags = 0; gchar *uri; if (!folder) @@ -2026,10 +2029,27 @@ in_proper_folder (CamelFolder *folder) uri = mail_tools_folder_to_url (folder); - res = !(folder->folder_flags & CAMEL_FOLDER_IS_TRASH) && - !em_utils_folder_is_sent (folder, uri) && - !em_utils_folder_is_outbox (folder, uri) && - !em_utils_folder_is_drafts (folder, uri); + if (mail_folder_cache_get_folder_info_flags (folder, &flags)) { + /* it should be neither trash nor junk folder, */ + res = ((flags & CAMEL_FOLDER_TYPE_TRASH) != CAMEL_FOLDER_TYPE_TRASH && + (flags & CAMEL_FOLDER_TYPE_JUNK) != CAMEL_FOLDER_TYPE_JUNK && + /* it can be Inbox */ + ( (flags & CAMEL_FOLDER_TYPE_INBOX) == CAMEL_FOLDER_TYPE_INBOX || + /* or any other virtual folder */ + CAMEL_IS_VEE_FOLDER (folder) || + /* or anything else except of sent, outbox or drafts folder */ + (!em_utils_folder_is_sent (folder, uri) && + !em_utils_folder_is_outbox (folder, uri) && + !em_utils_folder_is_drafts (folder, uri)) + )); + } else { + /* cannot check for Inbox folder here */ + res = (folder->folder_flags & (CAMEL_FOLDER_IS_TRASH | CAMEL_FOLDER_IS_JUNK)) == 0 && ( + (CAMEL_IS_VEE_FOLDER (folder)) || ( + !em_utils_folder_is_sent (folder, uri) && + !em_utils_folder_is_outbox (folder, uri) && + !em_utils_folder_is_drafts (folder, uri))); + } g_free (uri); -- cgit From d38e8b65dbbcf20ccbdc9ffd73830fd1725f91c6 Mon Sep 17 00:00:00 2001 From: Bharath Acharya Date: Mon, 22 Jun 2009 11:12:21 +0530 Subject: Fix build issue for pst-import plugin --- plugins/pst-import/Makefile.am | 1 + 1 file changed, 1 insertion(+) (limited to 'plugins') diff --git a/plugins/pst-import/Makefile.am b/plugins/pst-import/Makefile.am index 0bb5fe43e1..1103a669c6 100644 --- a/plugins/pst-import/Makefile.am +++ b/plugins/pst-import/Makefile.am @@ -9,6 +9,7 @@ endif INCLUDES = \ -I$(EVOLUTION_SOURCE) \ -I$(top_srcdir) \ + -I$(top_srcdir)/widgets \ -DGETTEXT_PACKAGE="\"$(GETTEXT_PACKAGE)\"" \ -DLOCALEDIR="\"$(LOCALEDIR)\"" \ $(EVOLUTION_CFLAGS) \ -- cgit From 7a9ab4f23b918dbf4fd0790f002924dc7c18a0cf Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 22 Jun 2009 17:09:21 +0200 Subject: Bug #566369 - backup-restore - recognize broken archive --- plugins/backup-restore/backup-restore.c | 8 ++-- plugins/backup-restore/backup.c | 76 ++++++++++++++++++++++++++------- 2 files changed, 64 insertions(+), 20 deletions(-) (limited to 'plugins') diff --git a/plugins/backup-restore/backup-restore.c b/plugins/backup-restore/backup-restore.c index e550851762..b4f0d98011 100644 --- a/plugins/backup-restore/backup-restore.c +++ b/plugins/backup-restore/backup-restore.c @@ -55,18 +55,18 @@ static void backup (const gchar *filename, gboolean restart) { if (restart) - execl (EVOLUTION_TOOLSDIR "/evolution-backup", "evolution-backup", "--gui", "--backup", "--restart", filename, NULL); + execl (EVOLUTION_TOOLSDIR "/evolution-backup", "evolution-backup", "--gui", "--backup", "--restart", filename, (char *)NULL); else - execl (EVOLUTION_TOOLSDIR "/evolution-backup", "evolution-backup", "--gui", "--backup", filename, NULL); + execl (EVOLUTION_TOOLSDIR "/evolution-backup", "evolution-backup", "--gui", "--backup", filename, (char *)NULL); } static void restore (const gchar *filename, gboolean restart) { if (restart) - execl (EVOLUTION_TOOLSDIR "/evolution-backup", "evolution-backup", "--gui", "--restore", "--restart", filename, NULL); + execl (EVOLUTION_TOOLSDIR "/evolution-backup", "evolution-backup", "--gui", "--restore", "--restart", filename, (char *)NULL); else - execl (EVOLUTION_TOOLSDIR "/evolution-backup", "evolution-backup", "--gui", "--restore", filename, NULL); + execl (EVOLUTION_TOOLSDIR "/evolution-backup", "evolution-backup", "--gui", "--restore", filename, (char *)NULL); } static gboolean diff --git a/plugins/backup-restore/backup.c b/plugins/backup-restore/backup.c index 92adb2d7a4..7842606a72 100644 --- a/plugins/backup-restore/backup.c +++ b/plugins/backup-restore/backup.c @@ -51,11 +51,11 @@ static gchar *chk_file = NULL; static gboolean restart_arg = FALSE; static gboolean gui_arg = FALSE; static gchar **opt_remaining = NULL; -static gint result=0; +static gint result = 0; static GtkWidget *progress_dialog; static GtkWidget *pbar; static gchar *txt = NULL; -gboolean complete = FALSE; +static gboolean complete = FALSE; static GOptionEntry options[] = { { "backup", '\0', 0, G_OPTION_ARG_NONE, &backup_op, @@ -76,9 +76,11 @@ static GOptionEntry options[] = { #define d(x) #define print_and_run(x) G_STMT_START { g_message ("%s", x); system (x); } G_STMT_END - #define CANCEL(x) if (x) return; +static gboolean check (const gchar *filename); + + static GString * replace_string (const gchar *text, const gchar *find, const gchar *replace) { @@ -228,6 +230,20 @@ restore (const gchar *filename) gchar *quotedfname; g_return_if_fail (filename && *filename); + + if (!check (filename)) { + g_message ("Cannot restore from an incorrect archive '%s'.", filename); + + if (restart_arg) { + CANCEL (complete); + txt = _("Restarting Evolution"); + complete=TRUE; + run_cmd (EVOLUTION); + } + + return; + } + quotedfname = g_shell_quote(filename); /* FIXME Will the versioned setting always work? */ @@ -273,38 +289,51 @@ restore (const gchar *filename) } -static void +static gboolean check (const gchar *filename) { gchar *command; gchar *quotedfname; - g_return_if_fail (filename && *filename); + g_return_val_if_fail (filename && *filename, FALSE); quotedfname = g_shell_quote(filename); - command = g_strdup_printf ("tar ztf %s | grep -e \"^\\.evolution/$\"", quotedfname); + command = g_strdup_printf ("tar ztf %s 1>/dev/null", quotedfname); result = system (command); g_free (command); g_message ("First result %d", result); - if (result) - exit (result); + if (result) { + g_free (quotedfname); + return FALSE; + } + + command = g_strdup_printf ("tar ztf %s | grep -e \"^\\.evolution/$\"", quotedfname); + result = system (command); + g_free (command); + + g_message ("Second result %d", result); + if (result) { + g_free (quotedfname); + return FALSE; + } command = g_strdup_printf ("tar ztf %s | grep -e \"^\\.evolution/%s$\"", quotedfname, GCONF_DUMP_FILE); result = system (command); g_free (command); g_free (quotedfname); - g_message ("Second result %d", result); + g_message ("Third result %d", result); + return result != 0; } static gboolean -pbar_update() +pbar_update (gpointer data) { if (!complete) { - gtk_progress_bar_pulse ((GtkProgressBar *)pbar); - gtk_progress_bar_set_text ((GtkProgressBar *)pbar, txt); + gtk_progress_bar_pulse ((GtkProgressBar *)pbar); + gtk_progress_bar_set_text ((GtkProgressBar *)pbar, txt); return TRUE; } @@ -334,7 +363,7 @@ idle_cb(gpointer data) if (gui_arg) { /* Show progress dialog */ - gtk_progress_bar_pulse ((GtkProgressBar *)pbar); + gtk_progress_bar_pulse ((GtkProgressBar *)pbar); g_timeout_add (50, pbar_update, NULL); } @@ -356,6 +385,21 @@ dlg_response (GtkWidget *dlg, gint response, gpointer data) /* We will kill just the tar operation. Rest of the them will be just a second of microseconds.*/ run_cmd ("pkill tar"); + if (bk_file && backup_op && response == GTK_RESPONSE_REJECT) { + /* backup was canceled, delete the backup file as it is not needed now */ + gchar *cmd, *filename; + + g_message ("Backup cancelled, removing partial backup file."); + + filename = g_shell_quote (bk_file); + cmd = g_strconcat ("rm ", filename, NULL); + + run_cmd (cmd); + + g_free (cmd); + g_free (filename); + } + gtk_main_quit (); } @@ -495,9 +539,9 @@ main (gint argc, gchar **argv) g_signal_connect (progress_dialog, "response", G_CALLBACK(dlg_response), NULL); gtk_widget_show_all (progress_dialog); } else if (check_op) { - /* For sanity we don't need gui */ - check (chk_file); - exit (result); + /* For sanity we don't need gui */ + check (chk_file); + exit (result == 0 ? 0 : 1); } g_idle_add (idle_cb, NULL); -- cgit From f7b884584a5aa62ae96987ee01f1b853ae9f147f Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 22 Jun 2009 17:41:15 +0200 Subject: Bug #566369 - fix string typo "cancelled" => "canceled" --- plugins/backup-restore/backup.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'plugins') diff --git a/plugins/backup-restore/backup.c b/plugins/backup-restore/backup.c index 7842606a72..1ca9a52dc2 100644 --- a/plugins/backup-restore/backup.c +++ b/plugins/backup-restore/backup.c @@ -389,7 +389,7 @@ dlg_response (GtkWidget *dlg, gint response, gpointer data) /* backup was canceled, delete the backup file as it is not needed now */ gchar *cmd, *filename; - g_message ("Backup cancelled, removing partial backup file."); + g_message ("Backup canceled, removing partial backup file."); filename = g_shell_quote (bk_file); cmd = g_strconcat ("rm ", filename, NULL); -- cgit From 42e75c9162402078ac629740821c3533925ee342 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Tue, 30 Jun 2009 17:18:36 -0400 Subject: Use AM_CPPFLAGS instead of INCLUDE in all Makefile.am. --- plugins/addressbook-file/Makefile.am | 2 +- plugins/attachment-reminder/Makefile.am | 2 +- plugins/audio-inline/Makefile.am | 2 +- plugins/backup-restore/Makefile.am | 2 +- plugins/bbdb/Makefile.am | 2 +- plugins/bogo-junk-plugin/Makefile.am | 2 +- plugins/caldav/Makefile.am | 2 +- plugins/calendar-file/Makefile.am | 2 +- plugins/calendar-http/Makefile.am | 2 +- plugins/calendar-weather/Makefile.am | 2 +- plugins/copy-tool/Makefile.am | 2 +- plugins/default-mailer/Makefile.am | 2 +- plugins/default-source/Makefile.am | 2 +- plugins/email-custom-header/Makefile.am | 2 +- plugins/exchange-operations/Makefile.am | 2 +- plugins/external-editor/Makefile.am | 2 +- plugins/face/Makefile.am | 2 +- plugins/folder-unsubscribe/Makefile.am | 2 +- plugins/google-account-setup/Makefile.am | 2 +- plugins/groupwise-account-setup/Makefile.am | 2 +- plugins/groupwise-features/Makefile.am | 2 +- plugins/hula-account-setup/Makefile.am | 2 +- plugins/imap-features/Makefile.am | 2 +- plugins/ipod-sync/Makefile.am | 2 +- plugins/itip-formatter/Makefile.am | 2 +- plugins/mail-account-disable/Makefile.am | 2 +- plugins/mail-notification/Makefile.am | 4 ++-- plugins/mail-to-task/Makefile.am | 2 +- plugins/mailing-list-actions/Makefile.am | 2 +- plugins/mark-all-read/Makefile.am | 2 +- plugins/mono/Makefile.am | 2 +- plugins/plugin-manager/Makefile.am | 2 +- plugins/prefer-plain/Makefile.am | 2 +- plugins/profiler/Makefile.am | 2 +- plugins/pst-import/Makefile.am | 2 +- plugins/publish-calendar/Makefile.am | 2 +- plugins/python/Makefile.am | 2 +- plugins/python/example/Makefile.am | 2 +- plugins/sa-junk-plugin/Makefile.am | 2 +- plugins/save-calendar/Makefile.am | 2 +- plugins/select-one-source/Makefile.am | 2 +- plugins/startup-wizard/Makefile.am | 2 +- plugins/subject-thread/Makefile.am | 2 +- plugins/templates/Makefile.am | 2 +- plugins/tnef-attachments/Makefile.am | 2 +- plugins/vcard-inline/Makefile.am | 2 +- plugins/webdav-account-setup/Makefile.am | 2 +- 47 files changed, 48 insertions(+), 48 deletions(-) (limited to 'plugins') diff --git a/plugins/addressbook-file/Makefile.am b/plugins/addressbook-file/Makefile.am index b195514b66..013e453635 100644 --- a/plugins/addressbook-file/Makefile.am +++ b/plugins/addressbook-file/Makefile.am @@ -1,4 +1,4 @@ -INCLUDES = \ +AM_CPPFLAGS = \ -I$(top_srcdir) \ $(EVOLUTION_ADDRESSBOOK_CFLAGS) diff --git a/plugins/attachment-reminder/Makefile.am b/plugins/attachment-reminder/Makefile.am index 97e1abc696..6d207ef839 100644 --- a/plugins/attachment-reminder/Makefile.am +++ b/plugins/attachment-reminder/Makefile.am @@ -1,4 +1,4 @@ -INCLUDES = \ +AM_CPPFLAGS = \ -I$(top_builddir)/composer \ -I$(top_srcdir) \ -I$(top_srcdir)/widgets \ diff --git a/plugins/audio-inline/Makefile.am b/plugins/audio-inline/Makefile.am index 006b39f3c8..b9ee89f93b 100644 --- a/plugins/audio-inline/Makefile.am +++ b/plugins/audio-inline/Makefile.am @@ -5,7 +5,7 @@ NO_UNDEFINED_REQUIRED_LIBS = \ $(GNOME_PLATFORM_LIBS) endif -INCLUDES = \ +AM_CPPFLAGS = \ -I$(top_srcdir) \ $(EVOLUTION_MAIL_CFLAGS) \ $(GSTREAMER_CFLAGS) diff --git a/plugins/backup-restore/Makefile.am b/plugins/backup-restore/Makefile.am index 1db60cd625..c1792abb64 100644 --- a/plugins/backup-restore/Makefile.am +++ b/plugins/backup-restore/Makefile.am @@ -1,4 +1,4 @@ -INCLUDES = \ +AM_CPPFLAGS = \ -DEVOLUTION_LOCALEDIR=\""$(localedir)"\" \ -DEVOLUTION_TOOLSDIR=\""$(privlibexecdir)"\" \ -DPREFIX=\""$(prefix)"\" \ diff --git a/plugins/bbdb/Makefile.am b/plugins/bbdb/Makefile.am index 481d465887..182c1e808b 100644 --- a/plugins/bbdb/Makefile.am +++ b/plugins/bbdb/Makefile.am @@ -5,7 +5,7 @@ NO_UNDEFINED_REQUIRED_LIBS = \ $(GNOME_PLATFORM_LIBS) endif -INCLUDES = \ +AM_CPPFLAGS = \ -I$(top_builddir)/composer \ -I$(top_srcdir) \ -I$(top_srcdir)/widgets \ diff --git a/plugins/bogo-junk-plugin/Makefile.am b/plugins/bogo-junk-plugin/Makefile.am index 5dc0cc626c..f488ddf0f7 100644 --- a/plugins/bogo-junk-plugin/Makefile.am +++ b/plugins/bogo-junk-plugin/Makefile.am @@ -1,4 +1,4 @@ -INCLUDES = \ +AM_CPPFLAGS = \ -I$(top_srcdir) \ -DWELCOME_MESSAGE=\""$(privdatadir)/default/C/mail/local/Inbox"\" \ $(EVOLUTION_MAIL_CFLAGS) diff --git a/plugins/caldav/Makefile.am b/plugins/caldav/Makefile.am index cb18c5b0be..243338e243 100644 --- a/plugins/caldav/Makefile.am +++ b/plugins/caldav/Makefile.am @@ -1,4 +1,4 @@ -INCLUDES = \ +AM_CPPFLAGS = \ -I . \ -I$(top_srcdir) \ -DCALDAV_GLADEDIR=\""$(gladedir)"\" \ diff --git a/plugins/calendar-file/Makefile.am b/plugins/calendar-file/Makefile.am index 7d40192c6f..aadb4b5927 100644 --- a/plugins/calendar-file/Makefile.am +++ b/plugins/calendar-file/Makefile.am @@ -1,4 +1,4 @@ -INCLUDES = \ +AM_CPPFLAGS = \ -I$(top_srcdir) \ $(EVOLUTION_CALENDAR_CFLAGS) \ $(SOURCE_SEL_CFLAGS) diff --git a/plugins/calendar-http/Makefile.am b/plugins/calendar-http/Makefile.am index 4edd28c8a0..89c17be4af 100644 --- a/plugins/calendar-http/Makefile.am +++ b/plugins/calendar-http/Makefile.am @@ -1,4 +1,4 @@ -INCLUDES = \ +AM_CPPFLAGS = \ -I$(top_srcdir) \ $(EVOLUTION_CALENDAR_CFLAGS) \ $(SOURCE_SEL_CFLAGS) diff --git a/plugins/calendar-weather/Makefile.am b/plugins/calendar-weather/Makefile.am index 0e43fa1717..f90d26e7e3 100644 --- a/plugins/calendar-weather/Makefile.am +++ b/plugins/calendar-weather/Makefile.am @@ -1,7 +1,7 @@ eds_datadir = `pkg-config --variable=privdatadir evolution-data-server-1.2` weatherdatadir = $(datadir)/evolution/$(BASE_VERSION)/weather -INCLUDES = \ +AM_CPPFLAGS = \ -I$(top_srcdir) \ -I$(top_builddir)/shell \ $(EVOLUTION_CALENDAR_CFLAGS) \ diff --git a/plugins/copy-tool/Makefile.am b/plugins/copy-tool/Makefile.am index 5f9e3bb463..87d1dff454 100644 --- a/plugins/copy-tool/Makefile.am +++ b/plugins/copy-tool/Makefile.am @@ -1,4 +1,4 @@ -INCLUDES = \ +AM_CPPFLAGS = \ -I$(top_srcdir) \ $(EVOLUTION_MAIL_CFLAGS) diff --git a/plugins/default-mailer/Makefile.am b/plugins/default-mailer/Makefile.am index 78766909c5..94d3436f0e 100644 --- a/plugins/default-mailer/Makefile.am +++ b/plugins/default-mailer/Makefile.am @@ -1,4 +1,4 @@ -INCLUDES = \ +AM_CPPFLAGS = \ -I$(top_srcdir) \ -I$(top_builddir)/shell \ $(EVOLUTION_MAIL_CFLAGS) diff --git a/plugins/default-source/Makefile.am b/plugins/default-source/Makefile.am index 235f615251..dda1edfa9a 100644 --- a/plugins/default-source/Makefile.am +++ b/plugins/default-source/Makefile.am @@ -1,4 +1,4 @@ -INCLUDES = \ +AM_CPPFLAGS = \ -I$(top_srcdir) \ $(EVOLUTION_CALENDAR_CFLAGS) \ $(EVOLUTION_ADDRESSBOOK_CFLAGS) \ diff --git a/plugins/email-custom-header/Makefile.am b/plugins/email-custom-header/Makefile.am index 6d3b6b8967..efd46a5435 100644 --- a/plugins/email-custom-header/Makefile.am +++ b/plugins/email-custom-header/Makefile.am @@ -1,4 +1,4 @@ -INCLUDES = -I. \ +AM_CPPFLAGS = -I. \ -I$(top_srcdir) \ -I$(top_srcdir)/widgets \ -I$(top_srcdir)/widgets/misc \ diff --git a/plugins/exchange-operations/Makefile.am b/plugins/exchange-operations/Makefile.am index 2e4a825771..933da521a1 100644 --- a/plugins/exchange-operations/Makefile.am +++ b/plugins/exchange-operations/Makefile.am @@ -1,4 +1,4 @@ -INCLUDES = -I . \ +AM_CPPFLAGS = -I . \ -I$(top_srcdir) \ -I$(top_srcdir)/widgets \ -I$(top_srcdir)/calendar \ diff --git a/plugins/external-editor/Makefile.am b/plugins/external-editor/Makefile.am index 4373b81ee5..05457efd17 100644 --- a/plugins/external-editor/Makefile.am +++ b/plugins/external-editor/Makefile.am @@ -6,7 +6,7 @@ NO_UNDEFINED_REQUIRED_LIBS = \ $(top_builddir)/mail/libevolution-mail.la endif -INCLUDES = \ +AM_CPPFLAGS = \ -DEVOLUTION_LOCALEDIR=\""$(localedir)"\" \ -DEVOLUTION_TOOLSDIR=\""$(privlibexecdir)"\" \ -DPREFIX=\""$(prefix)"\" \ diff --git a/plugins/face/Makefile.am b/plugins/face/Makefile.am index 59cf66e93e..86a522a2d0 100644 --- a/plugins/face/Makefile.am +++ b/plugins/face/Makefile.am @@ -1,4 +1,4 @@ -INCLUDES = -I. \ +AM_CPPFLAGS = -I. \ -I$(top_srcdir) \ -I$(top_srcdir)/widgets \ -I$(top_srcdir)/widgets/misc \ diff --git a/plugins/folder-unsubscribe/Makefile.am b/plugins/folder-unsubscribe/Makefile.am index b3f1ba12bf..242d911ed0 100644 --- a/plugins/folder-unsubscribe/Makefile.am +++ b/plugins/folder-unsubscribe/Makefile.am @@ -1,4 +1,4 @@ -INCLUDES = \ +AM_CPPFLAGS = \ -I$(top_srcdir) \ $(EVOLUTION_MAIL_CFLAGS) diff --git a/plugins/google-account-setup/Makefile.am b/plugins/google-account-setup/Makefile.am index d8153a9c5b..ed452c0bc7 100644 --- a/plugins/google-account-setup/Makefile.am +++ b/plugins/google-account-setup/Makefile.am @@ -1,4 +1,4 @@ -INCLUDES = \ +AM_CPPFLAGS = \ -I . \ -I$(top_srcdir) \ -DCALDAV_GLADEDIR=\""$(gladedir)"\" \ diff --git a/plugins/groupwise-account-setup/Makefile.am b/plugins/groupwise-account-setup/Makefile.am index 9770782d69..ddf3161f8b 100644 --- a/plugins/groupwise-account-setup/Makefile.am +++ b/plugins/groupwise-account-setup/Makefile.am @@ -1,4 +1,4 @@ -INCLUDES = \ +AM_CPPFLAGS = \ -I$(top_srcdir) \ $(EVOLUTION_MAIL_CFLAGS) \ $(EVOLUTION_CALENDAR_CFLAGS) \ diff --git a/plugins/groupwise-features/Makefile.am b/plugins/groupwise-features/Makefile.am index c72cc89850..1af407dcd7 100644 --- a/plugins/groupwise-features/Makefile.am +++ b/plugins/groupwise-features/Makefile.am @@ -2,7 +2,7 @@ if OS_WIN32 NO_UNDEFINED_REQUIRED_LIBS = $(top_builddir)/mail/libevolution-mail.la endif -INCLUDES = \ +AM_CPPFLAGS = \ -I$(top_srcdir) \ -I$(top_srcdir)/widgets \ -I$(top_srcdir)/widgets/misc \ diff --git a/plugins/hula-account-setup/Makefile.am b/plugins/hula-account-setup/Makefile.am index 205a3a7d30..e0d89ce407 100644 --- a/plugins/hula-account-setup/Makefile.am +++ b/plugins/hula-account-setup/Makefile.am @@ -1,4 +1,4 @@ -INCLUDES = \ +AM_CPPFLAGS = \ -I$(top_srcdir) \ $(EVOLUTION_MAIL_CFLAGS) \ $(EVOLUTION_CALENDAR_CFLAGS) \ diff --git a/plugins/imap-features/Makefile.am b/plugins/imap-features/Makefile.am index 69b94ffbb1..c539a70cb2 100644 --- a/plugins/imap-features/Makefile.am +++ b/plugins/imap-features/Makefile.am @@ -2,7 +2,7 @@ if OS_WIN32 NO_UNDEFINED_REQUIRED_LIBS = $(top_builddir)/mail/libevolution-mail.la endif -INCLUDES = \ +AM_CPPFLAGS = \ -I$(top_srcdir) \ -I$(top_srcdir)/mail \ $(EVOLUTION_MAIL_CFLAGS) \ diff --git a/plugins/ipod-sync/Makefile.am b/plugins/ipod-sync/Makefile.am index 1ad1d0a4ee..a55fc83a4e 100644 --- a/plugins/ipod-sync/Makefile.am +++ b/plugins/ipod-sync/Makefile.am @@ -1,4 +1,4 @@ -INCLUDES = \ +AM_CPPFLAGS = \ -I$(top_srcdir) \ -I$(top_srcdir)/widgets \ $(EVOLUTION_CALENDAR_CFLAGS) \ diff --git a/plugins/itip-formatter/Makefile.am b/plugins/itip-formatter/Makefile.am index cbbc061833..80b70cc6c9 100644 --- a/plugins/itip-formatter/Makefile.am +++ b/plugins/itip-formatter/Makefile.am @@ -1,4 +1,4 @@ -INCLUDES = \ +AM_CPPFLAGS = \ -I$(top_srcdir) \ $(EVOLUTION_MAIL_CFLAGS) \ $(EVOLUTION_CALENDAR_CFLAGS) diff --git a/plugins/mail-account-disable/Makefile.am b/plugins/mail-account-disable/Makefile.am index d10638d90a..7793f851d7 100644 --- a/plugins/mail-account-disable/Makefile.am +++ b/plugins/mail-account-disable/Makefile.am @@ -1,4 +1,4 @@ -INCLUDES = \ +AM_CPPFLAGS = \ -I$(top_srcdir) \ -I$(top_srcdir)/widgets \ -I$(top_builddir)/mail \ diff --git a/plugins/mail-notification/Makefile.am b/plugins/mail-notification/Makefile.am index f3434fd4e8..ec91117eb8 100644 --- a/plugins/mail-notification/Makefile.am +++ b/plugins/mail-notification/Makefile.am @@ -5,14 +5,14 @@ NO_UNDEFINED_REQUIRED_LIBS = \ $(GNOME_PLATFORM_LIBS) endif -INCLUDES = \ +AM_CPPFLAGS = \ -I$(top_srcdir) \ -I$(top_srcdir)/widgets \ $(EVOLUTION_MAIL_CFLAGS) \ $(LIBNOTIFY_CFLAGS) if ENABLE_DBUS -INCLUDES += -DDBUS_API_SUBJECT_TO_CHANGE=1 \ +AM_CPPFLAGS += -DDBUS_API_SUBJECT_TO_CHANGE=1 \ -DFOUND_DBUS_VERSION=$(FOUND_DBUS_VERSION) \ $(NMN_CFLAGS) endif diff --git a/plugins/mail-to-task/Makefile.am b/plugins/mail-to-task/Makefile.am index 5261fbcf97..dc63da7a8c 100644 --- a/plugins/mail-to-task/Makefile.am +++ b/plugins/mail-to-task/Makefile.am @@ -1,4 +1,4 @@ -INCLUDES = \ +AM_CPPFLAGS = \ -I$(top_srcdir) \ -I$(top_srcdir)/widgets \ $(EVOLUTION_CALENDAR_CFLAGS) \ diff --git a/plugins/mailing-list-actions/Makefile.am b/plugins/mailing-list-actions/Makefile.am index e90c608a5b..80dc122e40 100644 --- a/plugins/mailing-list-actions/Makefile.am +++ b/plugins/mailing-list-actions/Makefile.am @@ -1,4 +1,4 @@ -INCLUDES = \ +AM_CPPFLAGS = \ -I$(top_srcdir) \ -I$(top_srcdir)/widgets \ -I$(top_builddir)/composer \ diff --git a/plugins/mark-all-read/Makefile.am b/plugins/mark-all-read/Makefile.am index 724277826c..b653e8c1f7 100644 --- a/plugins/mark-all-read/Makefile.am +++ b/plugins/mark-all-read/Makefile.am @@ -1,4 +1,4 @@ -INCLUDES = \ +AM_CPPFLAGS = \ -I$(top_srcdir)\ $(EVOLUTION_MAIL_CFLAGS) diff --git a/plugins/mono/Makefile.am b/plugins/mono/Makefile.am index f98e8be2ab..6121bd7f85 100644 --- a/plugins/mono/Makefile.am +++ b/plugins/mono/Makefile.am @@ -1,4 +1,4 @@ -INCLUDES = \ +AM_CPPFLAGS = \ -I$(top_srcdir) \ $(E_UTIL_CFLAGS) \ $(MONO_CFLAGS) diff --git a/plugins/plugin-manager/Makefile.am b/plugins/plugin-manager/Makefile.am index 645581e11d..eb8126c398 100644 --- a/plugins/plugin-manager/Makefile.am +++ b/plugins/plugin-manager/Makefile.am @@ -1,4 +1,4 @@ -INCLUDES = \ +AM_CPPFLAGS = \ -I$(top_srcdir) \ $(EVOLUTION_MAIL_CFLAGS) diff --git a/plugins/prefer-plain/Makefile.am b/plugins/prefer-plain/Makefile.am index 37a49a38e7..baee242074 100644 --- a/plugins/prefer-plain/Makefile.am +++ b/plugins/prefer-plain/Makefile.am @@ -1,4 +1,4 @@ -INCLUDES = \ +AM_CPPFLAGS = \ -I$(top_srcdir) \ $(EVOLUTION_MAIL_CFLAGS) diff --git a/plugins/profiler/Makefile.am b/plugins/profiler/Makefile.am index 037219c5ed..b276c41296 100644 --- a/plugins/profiler/Makefile.am +++ b/plugins/profiler/Makefile.am @@ -1,4 +1,4 @@ -INCLUDES = \ +AM_CPPFLAGS = \ -I$(top_srcdir) \ $(SHELL_CFLAGS) diff --git a/plugins/pst-import/Makefile.am b/plugins/pst-import/Makefile.am index 1103a669c6..3cf631a4ed 100644 --- a/plugins/pst-import/Makefile.am +++ b/plugins/pst-import/Makefile.am @@ -6,7 +6,7 @@ NO_UNDEFINED_REQUIRED_LIBS = \ $(EVOLUTION_MAIL_LIBS) endif -INCLUDES = \ +AM_CPPFLAGS = \ -I$(EVOLUTION_SOURCE) \ -I$(top_srcdir) \ -I$(top_srcdir)/widgets \ diff --git a/plugins/publish-calendar/Makefile.am b/plugins/publish-calendar/Makefile.am index c8119f48bb..274c14f290 100644 --- a/plugins/publish-calendar/Makefile.am +++ b/plugins/publish-calendar/Makefile.am @@ -1,4 +1,4 @@ -INCLUDES = \ +AM_CPPFLAGS = \ -I$(top_srcdir) \ -I$(top_srcdir)/widgets \ -I$(top_builddir)/shell \ diff --git a/plugins/python/Makefile.am b/plugins/python/Makefile.am index 77441e0e9b..f6a48ac727 100644 --- a/plugins/python/Makefile.am +++ b/plugins/python/Makefile.am @@ -1,4 +1,4 @@ -INCLUDES = \ +AM_CPPFLAGS = \ -I$(top_srcdir) \ $(E_UTIL_CFLAGS) \ $(PY_INCLUDES) diff --git a/plugins/python/example/Makefile.am b/plugins/python/example/Makefile.am index b3530d841c..8e5ddd49fd 100644 --- a/plugins/python/example/Makefile.am +++ b/plugins/python/example/Makefile.am @@ -1,4 +1,4 @@ -INCLUDES = \ +AM_CPPFLAGS = \ -DEVOLUTION_GLADEDIR=\""$(gladedir)"\" \ -DEVOLUTION_IMAGESDIR=\""$(imagesdir)"\" diff --git a/plugins/sa-junk-plugin/Makefile.am b/plugins/sa-junk-plugin/Makefile.am index 4e44fa5c3b..eebfdf0c26 100644 --- a/plugins/sa-junk-plugin/Makefile.am +++ b/plugins/sa-junk-plugin/Makefile.am @@ -1,4 +1,4 @@ -INCLUDES = \ +AM_CPPFLAGS = \ -I$(top_srcdir) \ $(EVOLUTION_MAIL_CFLAGS) diff --git a/plugins/save-calendar/Makefile.am b/plugins/save-calendar/Makefile.am index 8336dd12ec..1ed1654350 100644 --- a/plugins/save-calendar/Makefile.am +++ b/plugins/save-calendar/Makefile.am @@ -1,4 +1,4 @@ -INCLUDES = \ +AM_CPPFLAGS = \ -I$(top_srcdir) \ -I$(top_srcdir)/widgets \ $(EVOLUTION_CALENDAR_CFLAGS) diff --git a/plugins/select-one-source/Makefile.am b/plugins/select-one-source/Makefile.am index ec90904e70..3788fd30fa 100644 --- a/plugins/select-one-source/Makefile.am +++ b/plugins/select-one-source/Makefile.am @@ -1,4 +1,4 @@ -INCLUDES = \ +AM_CPPFLAGS = \ -I$(top_srcdir) \ -I$(top_srcdir)/widgets \ $(EVOLUTION_CALENDAR_CFLAGS) diff --git a/plugins/startup-wizard/Makefile.am b/plugins/startup-wizard/Makefile.am index fea7f7232f..81c75776d9 100644 --- a/plugins/startup-wizard/Makefile.am +++ b/plugins/startup-wizard/Makefile.am @@ -1,4 +1,4 @@ -INCLUDES = -I . \ +AM_CPPFLAGS = -I . \ -I$(top_srcdir) \ -I$(top_builddir)/shell \ $(EVOLUTION_CALENDAR_CFLAGS) \ diff --git a/plugins/subject-thread/Makefile.am b/plugins/subject-thread/Makefile.am index 751e0eee15..e27b08bfbe 100644 --- a/plugins/subject-thread/Makefile.am +++ b/plugins/subject-thread/Makefile.am @@ -1,4 +1,4 @@ -INCLUDES = \ +AM_CPPFLAGS = \ -I$(top_srcdir) \ $(EVOLUTION_MAIL_CFLAGS) diff --git a/plugins/templates/Makefile.am b/plugins/templates/Makefile.am index 3c1ff2052e..b2be91f2ed 100644 --- a/plugins/templates/Makefile.am +++ b/plugins/templates/Makefile.am @@ -1,4 +1,4 @@ -INCLUDES = \ +AM_CPPFLAGS = \ -I$(top_srcdir) \ -I$(top_srcdir)/widgets \ -I$(top_builddir) \ diff --git a/plugins/tnef-attachments/Makefile.am b/plugins/tnef-attachments/Makefile.am index 6ea2ce1f3e..d9447f263d 100644 --- a/plugins/tnef-attachments/Makefile.am +++ b/plugins/tnef-attachments/Makefile.am @@ -6,7 +6,7 @@ NO_UNDEFINED_REQUIRED_LIBS = \ $(top_builddir)/mail/libevolution-mail.la endif -INCLUDES = \ +AM_CPPFLAGS = \ -I$(top_srcdir) \ -DGETTEXT_PACKAGE="\"$(GETTEXT_PACKAGE)\"" \ -DLOCALEDIR="\"$(localedir)\"" \ diff --git a/plugins/vcard-inline/Makefile.am b/plugins/vcard-inline/Makefile.am index 499db50154..5a8ed2c88e 100644 --- a/plugins/vcard-inline/Makefile.am +++ b/plugins/vcard-inline/Makefile.am @@ -5,7 +5,7 @@ NO_UNDEFINED_REQUIRED_LIBS = \ $(GNOME_PLATFORM_LIBS) endif -INCLUDES = \ +AM_CPPFLAGS = \ -I$(top_srcdir) \ $(EVOLUTION_ADDRESSBOOK_CFLAGS) \ $(EVOLUTION_MAIL_CFLAGS) diff --git a/plugins/webdav-account-setup/Makefile.am b/plugins/webdav-account-setup/Makefile.am index c143b8f667..761cd69363 100644 --- a/plugins/webdav-account-setup/Makefile.am +++ b/plugins/webdav-account-setup/Makefile.am @@ -1,4 +1,4 @@ -INCLUDES = \ +AM_CPPFLAGS = \ -I . \ -I$(top_srcdir) \ $(EVOLUTION_ADDRESSBOOK_CFLAGS) -- cgit