diff options
Diffstat (limited to 'plugins')
54 files changed, 475 insertions, 108 deletions
diff --git a/plugins/attachment-reminder/ChangeLog b/plugins/attachment-reminder/ChangeLog index 1bddccefe0..fb8d1de6c6 100644 --- a/plugins/attachment-reminder/ChangeLog +++ b/plugins/attachment-reminder/ChangeLog @@ -1,3 +1,13 @@ +2008-08-12 Bharath Acharya <abharath@novell.com> + + * Makefile.am: Have a check for OS_WIN32 and handle the schema data + differently. make install error on win32. + +2008-08-12 Bharath Acharya <abharath@novell.com> + + * Makefile.am: Use NO_UNDEFINED. Link with more libraries. To generate + dlls on Windows. + 2008-06-04 Johnny Jacob <jjohnny@novell.com> ** Fixes Bug #208943. diff --git a/plugins/attachment-reminder/Makefile.am b/plugins/attachment-reminder/Makefile.am index 79e4271370..d6e9fb8809 100644 --- a/plugins/attachment-reminder/Makefile.am +++ b/plugins/attachment-reminder/Makefile.am @@ -19,7 +19,12 @@ plugin_DATA = \ plugin_LTLIBRARIES = liborg-gnome-evolution-attachment-reminder.la liborg_gnome_evolution_attachment_reminder_la_SOURCES = attachment-reminder.c -liborg_gnome_evolution_attachment_reminder_la_LDFLAGS = -module -avoid-version +liborg_gnome_evolution_attachment_reminder_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED) +liborg_gnome_evolution_attachment_reminder_la_LIBADD = \ + $(top_builddir)/e-util/libeutil.la \ + $(top_builddir)/widgets/misc/libemiscwidgets.la \ + $(top_builddir)/mail/libevolution-mail.la \ + $(EVOLUTION_MAIL_LIBS) schemadir = $(GCONF_SCHEMA_FILE_DIR) schema_in_files = apps-evolution-attachment-reminder.schemas.in @@ -27,12 +32,25 @@ schema_DATA = $(schema_in_files:.schemas.in=.schemas) @INTLTOOL_SCHEMAS_RULE@ +if OS_WIN32 install-data-local: - if test -z "$(DESTDIR)" ; then \ - for p in $(schema_DATA) ; do \ - GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $$p; \ - done \ + if test -z "$(DESTDIR)" ; then \ + for p in $(schema_DATA) ; do \ + (echo set GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE); \ + echo $(GCONFTOOL) --makefile-install-rule $$p) >_temp.bat; \ + cmd /c _temp.bat; \ + rm _temp.bat; \ + done \ fi +else +install-data-local: + if test -z "$(DESTDIR)" ; then \ + for p in $(schema_DATA) ; do \ + GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) \ + $(GCONFTOOL) --makefile-install-rule $$p; \ + done \ + fi +endif EXTRA_DIST = org-gnome-evolution-attachment-reminder.eplug.xml \ org-gnome-attachment-reminder.error.xml \ diff --git a/plugins/audio-inline/ChangeLog b/plugins/audio-inline/ChangeLog index deecb913e5..d7fe8ddffc 100644 --- a/plugins/audio-inline/ChangeLog +++ b/plugins/audio-inline/ChangeLog @@ -1,3 +1,8 @@ +2008-08-12 Bharath Acharya <abharath@novell.com> + + * Makefile.am: Use NO_UNDEFINED. Link with more libraries. To generate + dlls on Windows. + 2008-04-21 Matthew Barnes <mbarnes@redhat.com> ** Fixes #528793, solution by Reece Hart diff --git a/plugins/audio-inline/Makefile.am b/plugins/audio-inline/Makefile.am index 15ced924bf..0780bf0bfc 100644 --- a/plugins/audio-inline/Makefile.am +++ b/plugins/audio-inline/Makefile.am @@ -9,8 +9,10 @@ plugin_DATA = org-gnome-audio-inline.eplug plugin_LTLIBRARIES = liborg-gnome-audio-inline.la liborg_gnome_audio_inline_la_SOURCES = audio-inline.c -liborg_gnome_audio_inline_la_LDFLAGS = -module -avoid-version -liborg_gnome_audio_inline_la_LIBADD = $(GSTREAMER_LIBS) +liborg_gnome_audio_inline_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED) +liborg_gnome_audio_inline_la_LIBADD = \ + $(GSTREAMER_LIBS) \ + $(EVOLUTION_MAIL_LIBS) EXTRA_DIST = org-gnome-audio-inline.eplug.xml diff --git a/plugins/audio-inline/audio-inline.c b/plugins/audio-inline/audio-inline.c index cf653148d2..405c3d87d6 100644 --- a/plugins/audio-inline/audio-inline.c +++ b/plugins/audio-inline/audio-inline.c @@ -12,7 +12,6 @@ #include <gtk/gtk.h> #include <glib/gstdio.h> -#include "e-util/e-icon-factory.h" #include "e-util/e-mktemp.h" #include "camel/camel-medium.h" #include "camel/camel-mime-part.h" diff --git a/plugins/backup-restore/ChangeLog b/plugins/backup-restore/ChangeLog index 3dbab34a81..d87b1e8b6b 100644 --- a/plugins/backup-restore/ChangeLog +++ b/plugins/backup-restore/ChangeLog @@ -1,3 +1,8 @@ +2008-08-12 Bharath Acharya <abharath@novell.com> + + * Makefile.am: Use NO_UNDEFINED. Link with more libraries. To generate + dlls on Windows. + 2008-08-01 Matthew Barnes <mbarnes@redhat.com> ** Fixes bug #543754 diff --git a/plugins/backup-restore/Makefile.am b/plugins/backup-restore/Makefile.am index d83b7fb2f9..eaa5963a4f 100644 --- a/plugins/backup-restore/Makefile.am +++ b/plugins/backup-restore/Makefile.am @@ -18,7 +18,9 @@ plugin_DATA = org-gnome-backup-restore.eplug org-gnome-backup-restore.xml plugin_LTLIBRARIES = liborg-gnome-backup-restore.la liborg_gnome_backup_restore_la_SOURCES = backup-restore.c -liborg_gnome_backup_restore_la_LDFLAGS = -module -avoid-version +liborg_gnome_backup_restore_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED) +liborg_gnome_backup_restore_la_LIBADD = \ + $(EVOLUTION_MAIL_LIBS) privlibexec_PROGRAMS = evolution-backup evolution_backup_SOURCES = backup.c diff --git a/plugins/bbdb/ChangeLog b/plugins/bbdb/ChangeLog index 53d5e13f7e..703868747b 100644 --- a/plugins/bbdb/ChangeLog +++ b/plugins/bbdb/ChangeLog @@ -1,3 +1,8 @@ +2008-08-12 Bharath Acharya <abharath@novell.com> + + * Makefile.am: Use NO_UNDEFINED. Link with more libraries. To generate + dlls on Windows. + 2008-08-07 Paul Bolle <pebolle@tiscali.nl> ** Fixes bug #546785 diff --git a/plugins/bbdb/Makefile.am b/plugins/bbdb/Makefile.am index 2506593d46..1f1ddfea46 100644 --- a/plugins/bbdb/Makefile.am +++ b/plugins/bbdb/Makefile.am @@ -10,7 +10,10 @@ plugin_DATA = org-gnome-evolution-bbdb.eplug plugin_LTLIBRARIES = liborg-gnome-evolution-bbdb.la liborg_gnome_evolution_bbdb_la_SOURCES = bbdb.c bbdb.h gaimbuddies.c -liborg_gnome_evolution_bbdb_la_LDFLAGS = -module -avoid-version +liborg_gnome_evolution_bbdb_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED) +liborg_gnome_evolution_bbdb_la_LIBADD = \ + $(top_builddir)/e-util/libeutil.la \ + $(EVOLUTION_ADDRESSBOOK_LIBS) EXTRA_DIST = org-gnome-evolution-bbdb.eplug.xml diff --git a/plugins/copy-tool/ChangeLog b/plugins/copy-tool/ChangeLog index c53c8075f1..be77eb5834 100644 --- a/plugins/copy-tool/ChangeLog +++ b/plugins/copy-tool/ChangeLog @@ -1,3 +1,8 @@ +2008-08-12 Bharath Acharya <abharath@novell.com> + + * Makefile.am: Use NO_UNDEFINED. Link with more libraries. To generate + dlls on Windows. + 2007-04-02 Sankar P <psankar@novell.com> * Committed on behalf of Gilles Dartiguelongue <dartigug@esiee.fr> diff --git a/plugins/copy-tool/Makefile.am b/plugins/copy-tool/Makefile.am index 263a0a2da0..d0011ab0fa 100644 --- a/plugins/copy-tool/Makefile.am +++ b/plugins/copy-tool/Makefile.am @@ -8,7 +8,9 @@ plugin_DATA = org-gnome-copy-tool.eplug plugin_LTLIBRARIES = liborg-gnome-copy-tool.la liborg_gnome_copy_tool_la_SOURCES = copy-tool.c -liborg_gnome_copy_tool_la_LDFLAGS = -module -avoid-version +liborg_gnome_copy_tool_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED) +liborg_gnome_copy_tool_la_LIBADD = \ + $(EVOLUTION_MAIL_LIBS) EXTRA_DIST = org-gnome-copy-tool.eplug.xml diff --git a/plugins/default-mailer/ChangeLog b/plugins/default-mailer/ChangeLog index 624324daff..8955f0981d 100644 --- a/plugins/default-mailer/ChangeLog +++ b/plugins/default-mailer/ChangeLog @@ -1,3 +1,13 @@ +2008-08-12 Bharath Acharya <abharath@novell.com> + + * Makefile.am: Have a check for OS_WIN32 and handle the schema data + differently. make install error on win32. + +2008-08-12 Bharath Acharya <abharath@novell.com> + + * Makefile.am: Use NO_UNDEFINED. Link with more libraries. To generate + dlls on Windows. + 2007-08-20 Matthew Barnes <mbarnes@redhat.com> * Makefile.am: Fix a distcheck error. diff --git a/plugins/default-mailer/Makefile.am b/plugins/default-mailer/Makefile.am index 72a74dbe8a..45f4e29c2b 100644 --- a/plugins/default-mailer/Makefile.am +++ b/plugins/default-mailer/Makefile.am @@ -12,7 +12,10 @@ plugin_DATA = org-gnome-default-mailer.eplug plugin_LTLIBRARIES = liborg-gnome-default-mailer.la liborg_gnome_default_mailer_la_SOURCES = default-mailer.c -liborg_gnome_default_mailer_la_LDFLAGS = -module -avoid-version +liborg_gnome_default_mailer_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED) +liborg_gnome_default_mailer_la_LIBADD = \ + $(top_builddir)/mail/libevolution-mail.la \ + $(EVOLUTION_MAIL_LIBS) schemadir = $(GCONF_SCHEMA_FILE_DIR) schema_in_files = apps-evolution-mail-prompts-checkdefault.schemas.in @@ -20,12 +23,25 @@ schema_DATA = $(schema_in_files:.schemas.in=.schemas) @INTLTOOL_SCHEMAS_RULE@ +if OS_WIN32 install-data-local: - if test -z "$(DESTDIR)" ; then \ - for p in $(schema_DATA) ; do \ - GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $$p; \ - done \ + if test -z "$(DESTDIR)" ; then \ + for p in $(schema_DATA) ; do \ + (echo set GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE); \ + echo $(GCONFTOOL) --makefile-install-rule $$p) >_temp.bat; \ + cmd /c _temp.bat; \ + rm _temp.bat; \ + done \ fi +else +install-data-local: + if test -z "$(DESTDIR)" ; then \ + for p in $(schema_DATA) ; do \ + GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) \ + $(GCONFTOOL) --makefile-install-rule $$p; \ + done \ + fi +endif EXTRA_DIST = \ org-gnome-default-mailer.eplug.xml \ diff --git a/plugins/email-custom-header/ChangeLog b/plugins/email-custom-header/ChangeLog index 7f4dc1918a..2c992a4fac 100644 --- a/plugins/email-custom-header/ChangeLog +++ b/plugins/email-custom-header/ChangeLog @@ -1,3 +1,18 @@ +2008-08-14 Matthew Barnes <mbarnes@redhat.com> + + * gui/contact-editor/e-contact-editor.c: + Use e_display_help() for displaying help. + +2008-08-12 Bharath Acharya <abharath@novell.com> + + * Makefile.am: Have a check for OS_WIN32 and handle the schema data + differently. make install error on win32. + +2008-08-12 Bharath Acharya <abharath@novell.com> + + * Makefile.am: Added necessary libraries to link to. Build break while + compiling on Windows. + 2008-08-01 Matthew Barnes <mbarnes@redhat.com> ** Fixes bug #543755 diff --git a/plugins/email-custom-header/Makefile.am b/plugins/email-custom-header/Makefile.am index 91a3b52df4..ccc9c787f8 100644 --- a/plugins/email-custom-header/Makefile.am +++ b/plugins/email-custom-header/Makefile.am @@ -24,6 +24,7 @@ liborg_gnome_email_custom_header_la_LIBADD = \ $(top_builddir)/e-util/libeutil.la \ $(top_builddir)/widgets/misc/libemiscwidgets.la \ $(top_builddir)/mail/libevolution-mail.la \ + $(EVOLUTION_MAIL_LIBS) \ $(NO_UNDEFINED_REQUIRED_LIBS) liborg_gnome_email_custom_header_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED) @@ -34,12 +35,25 @@ schema_DATA = $(schema_in_files:.schemas.in=.schemas) @INTLTOOL_SCHEMAS_RULE@ +if OS_WIN32 install-data-local: - if test -z "$(DESTDIR)" ; then \ - for p in $(schema_DATA) ; do \ - GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $$p; \ - done \ + if test -z "$(DESTDIR)" ; then \ + for p in $(schema_DATA) ; do \ + (echo set GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE); \ + echo $(GCONFTOOL) --makefile-install-rule $$p) >_temp.bat; \ + cmd /c _temp.bat; \ + rm _temp.bat; \ + done \ fi +else +install-data-local: + if test -z "$(DESTDIR)" ; then \ + for p in $(schema_DATA) ; do \ + GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) \ + $(GCONFTOOL) --makefile-install-rule $$p; \ + done \ + fi +endif glade_DATA = \ org-gnome-email-custom-header.glade \ diff --git a/plugins/email-custom-header/email-custom-header.c b/plugins/email-custom-header/email-custom-header.c index 6918a9b43c..ab882cc197 100644 --- a/plugins/email-custom-header/email-custom-header.c +++ b/plugins/email-custom-header/email-custom-header.c @@ -26,7 +26,6 @@ #include <glib/gi18n.h> #include <gconf/gconf-client.h> #include <e-util/e-error.h> -#include <libgnome/libgnome.h> #include <glade/glade.h> #include "mail/em-menu.h" #include "mail/em-utils.h" @@ -34,6 +33,7 @@ #include "composer/e-msg-composer.h" #include "libedataserver/e-account.h" #include "e-util/e-config.h" +#include "e-util/e-util.h" #include "email-custom-header.h" @@ -197,7 +197,6 @@ epech_header_options_cb (GtkDialog *dialog, gint state, gpointer func_data) { EmailCustomHeaderOptionsDialogPrivate *priv; CustomHeaderOptionsDialog *mch; - GError *error = NULL; mch = func_data; priv = mch->priv; @@ -211,12 +210,9 @@ epech_header_options_cb (GtkDialog *dialog, gint state, gpointer func_data) g_object_unref (priv->xml); break; case GTK_RESPONSE_HELP: - gnome_help_display ( - "evolution.xml", priv->help_section, &error); - if (error) { - g_warning ("%s", error->message); - g_error_free (error); - } + e_display_help ( + GTK_WINDOW (priv->main), + priv->help_section); break; } diff --git a/plugins/exchange-operations/ChangeLog b/plugins/exchange-operations/ChangeLog index f16f1301cf..09fb3274af 100644 --- a/plugins/exchange-operations/ChangeLog +++ b/plugins/exchange-operations/ChangeLog @@ -1,3 +1,8 @@ +2008-08-14 Matthew Barnes <mbarnes@redhat.com> + + * exchange-send-options.c: + Use e_display_help() for displaying help. + 2008-08-06 Milan Crha <mcrha@redhat.com> ** Fix for bug #435969 diff --git a/plugins/exchange-operations/exchange-send-options.c b/plugins/exchange-operations/exchange-send-options.c index 02c50e78e0..ef7687df93 100644 --- a/plugins/exchange-operations/exchange-send-options.c +++ b/plugins/exchange-operations/exchange-send-options.c @@ -26,9 +26,8 @@ #include <libedataserverui/e-name-selector.h> #include <libedataserverui/e-contact-store.h> #include "exchange-operations.h" +#include <e-util/e-util.h> #include <e-util/e-error.h> -#include <libgnome/libgnome.h> -#include <libgnome/gnome-i18n.h> #include <glade/glade.h> #include "e-util/e-util-private.h" @@ -280,7 +279,6 @@ static void exchange_send_options_cb (GtkDialog *dialog, gint state, gpointer fu { ExchangeSendOptionsDialogPrivate *priv; ExchangeSendOptionsDialog *sod; - GError *error = NULL; sod = func_data; priv = sod->priv; @@ -295,12 +293,9 @@ static void exchange_send_options_cb (GtkDialog *dialog, gint state, gpointer fu g_object_unref (priv->xml); break; case GTK_RESPONSE_HELP: - gnome_help_display ( - "evolution.xml", priv->help_section, &error); - if (error != NULL) { - g_warning ("%s", error->message); - g_error_free (error); - } + e_display_help ( + GTK_WINDOW (priv->main), + priv->help_section); break; } g_signal_emit (G_OBJECT (func_data), signals[SOD_RESPONSE], 0, state); diff --git a/plugins/folder-unsubscribe/ChangeLog b/plugins/folder-unsubscribe/ChangeLog index db584a1e04..6f26a1f396 100644 --- a/plugins/folder-unsubscribe/ChangeLog +++ b/plugins/folder-unsubscribe/ChangeLog @@ -1,3 +1,8 @@ +2008-08-12 Bharath Acharya <abharath@novell.com> + + * Makefile.am: Use NO_UNDEFINED. Link with more libraries. To generate + dlls on Windows. + 2007-12-20 Matthew Barnes <mbarnes@redhat.com> ** Fixes part of bug #362638 diff --git a/plugins/folder-unsubscribe/Makefile.am b/plugins/folder-unsubscribe/Makefile.am index a01b43d78e..2c11596c51 100644 --- a/plugins/folder-unsubscribe/Makefile.am +++ b/plugins/folder-unsubscribe/Makefile.am @@ -8,6 +8,9 @@ plugin_DATA = org-gnome-mail-folder-unsubscribe.eplug plugin_LTLIBRARIES = liborg-gnome-mail-folder-unsubscribe.la liborg_gnome_mail_folder_unsubscribe_la_SOURCES = folder-unsubscribe.c -liborg_gnome_mail_folder_unsubscribe_la_LDFLAGS = -module -avoid-version +liborg_gnome_mail_folder_unsubscribe_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED) +liborg_gnome_mail_folder_unsubscribe_la_LIBADD = \ + $(top_builddir)/mail/libevolution-mail.la \ + $(EVOLUTION_MAIL_LIBS) EXTRA_DIST = org-gnome-mail-folder-unsubscribe.eplug.xml diff --git a/plugins/google-account-setup/ChangeLog b/plugins/google-account-setup/ChangeLog index 037aa01a3c..3f37cde680 100644 --- a/plugins/google-account-setup/ChangeLog +++ b/plugins/google-account-setup/ChangeLog @@ -1,3 +1,12 @@ +2008-08-14 Jörgen Scheibengruber <mfcn@gmx.de> + + * google-contacts-source.c (on_ssl_cb_toggled), + (seconds_to_interval), (interval_to_seconds), + (on_interval_sb_value_changed), (on_interval_combo_changed), + (plugin_google_contacts): + + Add ssl toggle; synch UI for refreshin with the google calendar plugin + 2008-08-07 Milan Crha <mcrha@redhat.com> ** Fix for bug #535745 diff --git a/plugins/google-account-setup/google-contacts-source.c b/plugins/google-account-setup/google-contacts-source.c index d0c8e71e63..c54bf66d7f 100644 --- a/plugins/google-account-setup/google-contacts-source.c +++ b/plugins/google-account-setup/google-contacts-source.c @@ -117,34 +117,102 @@ on_username_entry_changed (GtkEntry *entry, gpointer user_data) } static void -on_update_cb_toggled (GtkToggleButton *tb, gpointer user_data) +on_ssl_cb_toggled (GtkToggleButton *tb, gpointer user_data) { ESource *source = user_data; - GtkWidget *sb = g_object_get_data (G_OBJECT (tb), "sb"); - gtk_widget_set_sensitive (sb, gtk_toggle_button_get_active (tb)); if (gtk_toggle_button_get_active (tb)) { - gdouble value; - char *value_string; - - value = gtk_spin_button_get_value (GTK_SPIN_BUTTON (sb)); - value_string = g_strdup_printf ("%d", (int)(value * 60.0)); - e_source_set_property (source, "refresh-interval", value_string); - g_free (value_string); + e_source_set_property (source, "use-ssl", "true"); } else { - e_source_set_property (source, "refresh-interval", "-1"); + e_source_set_property (source, "use-ssl", "false"); + } +} + +typedef enum { + MINUTES, + HOURS, + DAYS, + WEEKS +} IntervalType; + +static void +seconds_to_interval (guint seconds, IntervalType *type, int *time) +{ + int minutes = seconds / 60; + + *type = MINUTES; + *time = minutes; + if (minutes && !(minutes % 10080)) { + *type = WEEKS; + *time = minutes / 10080; + } else if (minutes && !(minutes % 1440)) { + *type = DAYS; + *time = minutes / 1440; + } else if (minutes && !(minutes % 60)) { + *type = HOURS; + *time = minutes / 60; + } +} + +static guint +interval_to_seconds (IntervalType type, int time) +{ + switch (type) { + case MINUTES: + return time * 60; + case HOURS: + return time * 60 * 60; + case DAYS: + return time * 60 * 60 * 24; + case WEEKS: + return time * 60 * 60 * 24 * 7; + default: + g_warning ("Time unit out of range"); + break; } + return 0; } static void on_interval_sb_value_changed (GtkSpinButton *sb, gpointer user_data) { ESource *source = user_data; - gdouble value; + gdouble time; + guint seconds; char *value_string; + GtkWidget *interval_combo; + IntervalType type; - value = gtk_spin_button_get_value (sb); - value_string = g_strdup_printf ("%d", (int)(value * 60.0)); + interval_combo = g_object_get_data (G_OBJECT (sb), "interval-combo"); + type = gtk_combo_box_get_active (GTK_COMBO_BOX (interval_combo)); + + time = gtk_spin_button_get_value (sb); + + seconds = interval_to_seconds (type, time); + + value_string = g_strdup_printf ("%u", seconds); + e_source_set_property (source, "refresh-interval", value_string); + g_free (value_string); +} + +static void +on_interval_combo_changed (GtkComboBox *combo, gpointer user_data) +{ + ESource *source = user_data; + gdouble time; + guint seconds; + char *value_string; + GtkWidget *sb; + IntervalType type; + + sb = g_object_get_data (G_OBJECT (combo), "interval-sb"); + type = gtk_combo_box_get_active (combo); + + time = gtk_spin_button_get_value (GTK_SPIN_BUTTON (sb)); + + seconds = interval_to_seconds (type, time); + + value_string = g_strdup_printf ("%u", seconds); e_source_set_property (source, "refresh-interval", value_string); g_free (value_string); } @@ -159,7 +227,9 @@ plugin_google_contacts (EPlugin *epl, const char *base_uri; const char *username; const char *refresh_interval_str; - int refresh_interval; + guint refresh_interval; + const char *use_ssl_str; + gboolean use_ssl; GtkWidget *parent; GtkWidget *vbox; @@ -171,18 +241,18 @@ plugin_google_contacts (EPlugin *epl, GtkWidget *label; GtkWidget *username_entry; - GtkWidget *update_cb; GtkWidget *interval_sb; + GtkWidget *interval_combo; + IntervalType type; + int time; + GtkWidget *ssl_cb; source = t->source; group = e_source_peek_group (source); base_uri = e_source_group_peek_base_uri (group); - g_object_set_data_full (G_OBJECT (epl), "widget", NULL, - (GDestroyNotify)gtk_widget_destroy); - if (strcmp (base_uri, "google://")) { return NULL; } @@ -205,7 +275,7 @@ plugin_google_contacts (EPlugin *epl, spacer = gtk_label_new (" "); gtk_box_pack_start (GTK_BOX (hbox), spacer, FALSE, FALSE, 0); - label = gtk_label_new (_("Username:")); + label = gtk_label_new_with_mnemonic (_("User_name:")); gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0); username_entry = gtk_entry_new (); @@ -221,43 +291,59 @@ plugin_google_contacts (EPlugin *epl, spacer = gtk_label_new (" "); gtk_box_pack_start (GTK_BOX (hbox), spacer, FALSE, FALSE, 0); + use_ssl_str = e_source_get_property (source, "use-ssl"); + if (use_ssl_str && ('1' == use_ssl_str[0] || + 0 == g_ascii_strcasecmp (use_ssl_str, "true"))) { + use_ssl = 1; + } else { + use_ssl = 0; + } + ssl_cb = gtk_check_button_new_with_mnemonic (_("Use _SSL")); + gtk_box_pack_start (GTK_BOX (hbox), ssl_cb, FALSE, FALSE, 0); + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (ssl_cb), + use_ssl); + + hbox = gtk_hbox_new (FALSE, 10); + gtk_box_pack_start (GTK_BOX (vbox2), hbox, TRUE, TRUE, 0); + + spacer = gtk_label_new (" "); + gtk_box_pack_start (GTK_BOX (hbox), spacer, FALSE, FALSE, 0); + refresh_interval_str = e_source_get_property (source, "refresh-interval"); if (refresh_interval_str && - (1 == sscanf (refresh_interval_str, "%d", &refresh_interval))) { + (1 == sscanf (refresh_interval_str, "%u", &refresh_interval))) { } else { refresh_interval = -1; } + seconds_to_interval (refresh_interval, &type, &time); - /* Translators: This is the first half of the sentence "Update - * every NNN minute(s)", where NNN is a spin button widget. */ - update_cb = gtk_check_button_new_with_label (_("Update every")); - gtk_box_pack_start (GTK_BOX (hbox), update_cb, FALSE, FALSE, 0); - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (update_cb), - refresh_interval > 0); - - interval_sb = gtk_spin_button_new_with_range (1, 60, 1); - gtk_widget_set_sensitive (interval_sb, - refresh_interval > 0); - gtk_spin_button_set_value (GTK_SPIN_BUTTON (interval_sb), - refresh_interval > 0 ? refresh_interval / 60 : 30); + label = gtk_label_new_with_mnemonic (_("Re_fresh:")); + gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0); + + interval_sb = gtk_spin_button_new_with_range (1, 100, 1); + gtk_spin_button_set_value (GTK_SPIN_BUTTON (interval_sb), time); gtk_box_pack_start (GTK_BOX (hbox), interval_sb, FALSE, FALSE, 0); - /* Translators: This is the second half of the sentence "Update - * every NNN minute(s)", where NNN is a spin button widget. */ - label = gtk_label_new (_("minute(s)")); - gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0); + interval_combo = gtk_combo_box_new_text (); + gtk_combo_box_append_text (GTK_COMBO_BOX (interval_combo), _("minutes")); + gtk_combo_box_append_text (GTK_COMBO_BOX (interval_combo), _("hours")); + gtk_combo_box_append_text (GTK_COMBO_BOX (interval_combo), _("days")); + gtk_combo_box_append_text (GTK_COMBO_BOX (interval_combo), _("weeks")); + gtk_combo_box_set_active (GTK_COMBO_BOX (interval_combo), type); + gtk_box_pack_start (GTK_BOX (hbox), interval_combo, FALSE, FALSE, 0); gtk_widget_show_all (vbox2); - g_object_set_data (G_OBJECT (update_cb), "sb", interval_sb); - g_object_set_data_full (G_OBJECT (epl), "widget", vbox2, - (GDestroyNotify)gtk_widget_destroy); - + g_object_set_data (G_OBJECT (interval_sb), "interval-combo", interval_combo); + g_object_set_data (G_OBJECT (interval_combo), "interval-sb", interval_sb); g_signal_connect (G_OBJECT (username_entry), "changed", G_CALLBACK (on_username_entry_changed), source); - g_signal_connect (G_OBJECT (update_cb), "toggled", - G_CALLBACK (on_update_cb_toggled), + g_signal_connect (G_OBJECT (interval_combo), "changed", + G_CALLBACK (on_interval_combo_changed), + source); + g_signal_connect (G_OBJECT (ssl_cb), "toggled", + G_CALLBACK (on_ssl_cb_toggled), source); g_signal_connect (G_OBJECT (interval_sb), "value-changed", G_CALLBACK (on_interval_sb_value_changed), diff --git a/plugins/import-ics-attachments/ChangeLog b/plugins/import-ics-attachments/ChangeLog index 68a87d906b..f2e73712c5 100644 --- a/plugins/import-ics-attachments/ChangeLog +++ b/plugins/import-ics-attachments/ChangeLog @@ -1,3 +1,15 @@ +2008-08-12 Bharath Acharya <abharath@novell.com> + + * Makefile.am: Added necessary libraries to link to. Build break while + compiling on Windows. + +2008-08-11 Matthew Barnes <mbarnes@redhat.com> + + ** Fixes part of bug #546892 + + * icsimporter.c: + Prefer gtk_image_new_from_icon_name() over e_icon_factory_get_image(). + 2008-04-17 Milan Crha <mcrha@redhat.com> ** Part of fix for bug #526739 diff --git a/plugins/import-ics-attachments/Makefile.am b/plugins/import-ics-attachments/Makefile.am index 30331d0c01..7f7caf3a21 100644 --- a/plugins/import-ics-attachments/Makefile.am +++ b/plugins/import-ics-attachments/Makefile.am @@ -24,6 +24,8 @@ liborg_gnome_evolution_mail_attachments_import_ics_la_LDFLAGS = -module -avoid-v liborg_gnome_evolution_mail_attachments_import_ics_la_LIBADD = \ $(top_builddir)/e-util/libeutil.la \ $(top_builddir)/mail/libevolution-mail.la \ + $(top_builddir)/calendar/common/libevolution-calendarprivate.la \ + $(EVOLUTION_CALENDAR_LIBS) \ $(EVOLUTION_MAIL_LIBS) EXTRA_DIST = org-gnome-evolution-mail-attachments-import-ics.eplug.xml diff --git a/plugins/import-ics-attachments/icsimporter.c b/plugins/import-ics-attachments/icsimporter.c index 6e3a282852..27477acf3b 100644 --- a/plugins/import-ics-attachments/icsimporter.c +++ b/plugins/import-ics-attachments/icsimporter.c @@ -38,7 +38,6 @@ #include "e-attachment-bar.h" #include <camel/camel-vee-folder.h> #include "e-util/e-error.h" -#include "e-util/e-icon-factory.h" #include <libedataserverui/e-source-selector.h> #include <libecal/e-cal.h> #include <libical/icalvcal.h> @@ -254,7 +253,8 @@ init_widgets(char *path) g_object_unref (source_list); hbox = gtk_hbox_new (FALSE, FALSE); - icon = e_icon_factory_get_image ("stock_mail-import", E_ICON_SIZE_MENU); + icon = gtk_image_new_from_icon_name ( + "stock_mail-import", GTK_ICON_SIZE_MENU); gtk_box_pack_start (GTK_BOX(hbox), icon, FALSE, FALSE, 6); label = gtk_label_new_with_mnemonic (_("_Import")); gtk_box_pack_start (GTK_BOX(hbox), label, FALSE, FALSE, 6); diff --git a/plugins/ipod-sync/ChangeLog b/plugins/ipod-sync/ChangeLog index ce1f317c42..2afd831e4c 100644 --- a/plugins/ipod-sync/ChangeLog +++ b/plugins/ipod-sync/ChangeLog @@ -1,3 +1,7 @@ +2008-08-12 Milan Crha <mcrha@redhat.com> + + * ipod-sync.c: Added missing include. + 2008-04-19 Matthew Barnes <mbarnes@redhat.com> * ical-fomat.c (do_save_calendar_ical): diff --git a/plugins/ipod-sync/ipod-sync.c b/plugins/ipod-sync/ipod-sync.c index 3743ed8bd6..4315c1cfe2 100644 --- a/plugins/ipod-sync/ipod-sync.c +++ b/plugins/ipod-sync/ipod-sync.c @@ -32,6 +32,7 @@ #include <glib.h> #include <gio/gio.h> #include <glib/gi18n.h> +#include <unistd.h> #include <libebook/e-book.h> #include <libebook/e-contact.h> diff --git a/plugins/itip-formatter/ChangeLog b/plugins/itip-formatter/ChangeLog index 6d6d93f1e2..7d0624cf42 100644 --- a/plugins/itip-formatter/ChangeLog +++ b/plugins/itip-formatter/ChangeLog @@ -1,3 +1,10 @@ +2008-08-11 Matthew Barnes <mbarnes@redhat.com> + + ** Fixes part of bug #546892 + + * itip-view.c: + Prefer gtk_image_new_from_icon_name() or e_icon_factory_get_image(). + 2008-07-28 Milan Crha <mcrha@redhat.com> ** Fix for bug #491176 diff --git a/plugins/itip-formatter/itip-formatter.c b/plugins/itip-formatter/itip-formatter.c index d89d74ccf5..3e200ac873 100644 --- a/plugins/itip-formatter/itip-formatter.c +++ b/plugins/itip-formatter/itip-formatter.c @@ -50,7 +50,6 @@ #include <mail/mail-tools.h> #include <mail/mail-mt.h> #include <libedataserver/e-account-list.h> -#include <e-util/e-icon-factory.h> #include <e-util/e-error.h> #include <calendar/gui/calendar-config.h> #include <calendar/gui/itip-utils.h> diff --git a/plugins/itip-formatter/itip-view.c b/plugins/itip-formatter/itip-view.c index 061e1daf6b..e42b338e0f 100644 --- a/plugins/itip-formatter/itip-view.c +++ b/plugins/itip-formatter/itip-view.c @@ -40,7 +40,6 @@ #include <mail/em-format-hook.h> #include <mail/em-format-html.h> #include <libedataserver/e-account-list.h> -#include <e-util/e-icon-factory.h> #include <e-util/e-util.h> #include <calendar/gui/itip-utils.h> #include "itip-view.h" @@ -723,7 +722,7 @@ set_info_items (GtkWidget *info_box, GSList *info_items) image = gtk_image_new_from_stock (GTK_STOCK_DIALOG_ERROR, GTK_ICON_SIZE_SMALL_TOOLBAR); break; case ITIP_VIEW_INFO_ITEM_TYPE_PROGRESS: - image = e_icon_factory_get_image ("stock_animation", E_ICON_SIZE_BUTTON); + image = gtk_image_new_from_icon_name ("stock_animation", GTK_ICON_SIZE_BUTTON); break; case ITIP_VIEW_INFO_ITEM_TYPE_NONE: default: @@ -963,7 +962,8 @@ itip_view_init (ItipView *view) gtk_box_set_spacing (GTK_BOX (view), 12); /* The meeting icon */ - icon = e_icon_factory_get_image (MEETING_ICON, E_ICON_SIZE_LARGE_TOOLBAR); + icon = gtk_image_new_from_icon_name ( + MEETING_ICON, GTK_ICON_SIZE_LARGE_TOOLBAR); gtk_misc_set_alignment (GTK_MISC (icon), 0.5, 0); gtk_widget_show (icon); diff --git a/plugins/mail-notification/ChangeLog b/plugins/mail-notification/ChangeLog index 278f8bb93a..81039caa5c 100644 --- a/plugins/mail-notification/ChangeLog +++ b/plugins/mail-notification/ChangeLog @@ -1,3 +1,16 @@ +2008-08-12 Bharath Acharya <abharath@novell.com> + + * Makefile.am: Have a check for OS_WIN32 and handle the schema data + differently. make install error on win32. + +2008-08-11 Matthew Barnes <mbarnes@redhat.com> + + ** Fixes part of bug #546892 + + * mail-notification.c: + Prefer gtk_status_icon_set_from_icon_name() over + gtk_status_icon_set_from_pixbuf(). + 2008-08-01 Matthew Barnes <mbarnes@redhat.com> ** Fixes part of bug #514006 diff --git a/plugins/mail-notification/Makefile.am b/plugins/mail-notification/Makefile.am index 86fc91cc11..80b4fbcc98 100644 --- a/plugins/mail-notification/Makefile.am +++ b/plugins/mail-notification/Makefile.am @@ -29,12 +29,25 @@ schema_DATA = $(schema_in_files:.schemas.in=.schemas) @INTLTOOL_SCHEMAS_RULE@ +if OS_WIN32 install-data-local: - if test -z "$(DESTDIR)" ; then \ - for p in $(schema_DATA) ; do \ - GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $$p; \ - done \ + if test -z "$(DESTDIR)" ; then \ + for p in $(schema_DATA) ; do \ + (echo set GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE); \ + echo $(GCONFTOOL) --makefile-install-rule $$p) >_temp.bat; \ + cmd /c _temp.bat; \ + rm _temp.bat; \ + done \ fi +else +install-data-local: + if test -z "$(DESTDIR)" ; then \ + for p in $(schema_DATA) ; do \ + GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) \ + $(GCONFTOOL) --makefile-install-rule $$p; \ + done \ + fi +endif BUILT_SOURCES = $(plugin_DATA) diff --git a/plugins/mail-notification/mail-notification.c b/plugins/mail-notification/mail-notification.c index afa633c999..9826f5a06d 100644 --- a/plugins/mail-notification/mail-notification.c +++ b/plugins/mail-notification/mail-notification.c @@ -38,7 +38,6 @@ #include <time.h> #include "e-util/e-config.h" -#include "e-util/e-icon-factory.h" #include "mail/em-utils.h" #include "mail/em-event.h" #include "mail/em-folder-tree-model.h" @@ -449,7 +448,7 @@ new_notify_status (EMEventTargetFolder *t) if (new_icon) { status_icon = gtk_status_icon_new (); - gtk_status_icon_set_from_pixbuf (status_icon, e_icon_factory_get_icon ("mail-unread", E_ICON_SIZE_LARGE_TOOLBAR)); + gtk_status_icon_set_from_icon_name (status_icon, "mail-unread"); } if (!status_count) { diff --git a/plugins/mail-to-meeting/ChangeLog b/plugins/mail-to-meeting/ChangeLog index 67b3092f37..d266c0cf44 100644 --- a/plugins/mail-to-meeting/ChangeLog +++ b/plugins/mail-to-meeting/ChangeLog @@ -1,3 +1,8 @@ +2008-08-12 Bharath Acharya <abharath@novell.com> + + * Makefile.am: Use NO_UNDEFINED. Link with more libraries. To generate + dlls on Windows. + 2007-11-05 Milan Crha <mcrha@redhat.com> ** Fix for bug #353779 diff --git a/plugins/mail-to-meeting/Makefile.am b/plugins/mail-to-meeting/Makefile.am index 617deeac97..5596678783 100644 --- a/plugins/mail-to-meeting/Makefile.am +++ b/plugins/mail-to-meeting/Makefile.am @@ -8,7 +8,10 @@ plugin_DATA = org-gnome-mail-to-meeting.eplug plugin_LTLIBRARIES = liborg-gnome-mail-to-meeting.la liborg_gnome_mail_to_meeting_la_SOURCES = mail-to-meeting.c -liborg_gnome_mail_to_meeting_la_LDFLAGS = -module -avoid-version +liborg_gnome_mail_to_meeting_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED) +liborg_gnome_mail_to_meeting_la_LIBADD = \ + $(EVOLUTION_CALENDAR_LIBS) \ + $(EVOLUTION_MAIL_LIBS) EXTRA_DIST = org-gnome-mail-to-meeting.eplug.xml diff --git a/plugins/mail-to-task/ChangeLog b/plugins/mail-to-task/ChangeLog index 8f6ec7a35e..ffa866b4d6 100644 --- a/plugins/mail-to-task/ChangeLog +++ b/plugins/mail-to-task/ChangeLog @@ -1,3 +1,8 @@ +2008-08-12 Bharath Acharya <abharath@novell.com> + + * Makefile.am: Use NO_UNDEFINED. Link with more libraries. To generate + dlls on Windows. + 2008-06-18 Milan Crha <mcrha@redhat.com> ** Fix for bug #318089 diff --git a/plugins/mail-to-task/Makefile.am b/plugins/mail-to-task/Makefile.am index 57d29acdb3..f4241c2fc3 100644 --- a/plugins/mail-to-task/Makefile.am +++ b/plugins/mail-to-task/Makefile.am @@ -8,7 +8,13 @@ plugin_DATA = org-gnome-mail-to-task.eplug org-gnome-mail-to-task.xml plugin_LTLIBRARIES = liborg-gnome-mail-to-task.la liborg_gnome_mail_to_task_la_SOURCES = mail-to-task.c -liborg_gnome_mail_to_task_la_LDFLAGS = -module -avoid-version +liborg_gnome_mail_to_task_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED) +liborg_gnome_mail_to_task_la_LIBADD = \ + $(top_builddir)/e-util/libeutil.la \ + $(top_builddir)/calendar/common/libevolution-calendarprivate.la \ + $(top_builddir)/mail/libevolution-mail.la \ + $(EVOLUTION_CALENDAR_LIBS) \ + $(EVOLUTION_MAIL_LIBS) EXTRA_DIST = org-gnome-mail-to-task.eplug.xml \ org-gnome-mail-to-task.xml diff --git a/plugins/mailing-list-actions/ChangeLog b/plugins/mailing-list-actions/ChangeLog index 8241315310..8c661916bb 100644 --- a/plugins/mailing-list-actions/ChangeLog +++ b/plugins/mailing-list-actions/ChangeLog @@ -1,3 +1,8 @@ +2008-08-12 Bharath Acharya <abharath@novell.com> + + * Makefile.am: Use NO_UNDEFINED. Link with more libraries. To generate + dlls on Windows. + 2008-06-02 Jacob Brown <jeblinux@gmail.com> ** Fix for bug #529464 diff --git a/plugins/mailing-list-actions/Makefile.am b/plugins/mailing-list-actions/Makefile.am index 72bbd70660..7d6560d716 100644 --- a/plugins/mailing-list-actions/Makefile.am +++ b/plugins/mailing-list-actions/Makefile.am @@ -9,7 +9,11 @@ plugin_DATA = org-gnome-mailing-list-actions.eplug org-gnome-mailing-list-action plugin_LTLIBRARIES = liborg-gnome-mailing-list-actions.la liborg_gnome_mailing_list_actions_la_SOURCES = mailing-list-actions.c -liborg_gnome_mailing_list_actions_la_LDFLAGS = -module -avoid-version +liborg_gnome_mailing_list_actions_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED) +liborg_gnome_mailing_list_actions_la_LIBADD = \ + $(top_builddir)/e-util/libeutil.la \ + $(top_builddir)/mail/libevolution-mail.la \ + $(EVOLUTION_MAIL_LIBS) error_DATA = org-gnome-mailing-list-actions.error errordir = $(privdatadir)/errors diff --git a/plugins/mark-calendar-offline/ChangeLog b/plugins/mark-calendar-offline/ChangeLog index 989a282ea2..e0c73095d6 100644 --- a/plugins/mark-calendar-offline/ChangeLog +++ b/plugins/mark-calendar-offline/ChangeLog @@ -1,3 +1,8 @@ +2008-08-12 Bharath Acharya <abharath@novell.com> + + * Makefile.am: Use NO_UNDEFINED. Link with more libraries. To generate + dlls on Windows. + 2007-11-11 Gilles Dartiguelongue <gdartigu@svn.gnome.org> ** Fix bug #495872 diff --git a/plugins/mark-calendar-offline/Makefile.am b/plugins/mark-calendar-offline/Makefile.am index 3a4334699c..c7773ae87b 100644 --- a/plugins/mark-calendar-offline/Makefile.am +++ b/plugins/mark-calendar-offline/Makefile.am @@ -8,7 +8,9 @@ plugin_DATA = org-gnome-mark-calendar-offline.eplug plugin_LTLIBRARIES = liborg-gnome-mark-calendar-offline.la liborg_gnome_mark_calendar_offline_la_SOURCES = mark-calendar-offline.c -liborg_gnome_mark_calendar_offline_la_LDFLAGS = -module -avoid-version +liborg_gnome_mark_calendar_offline_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED) +liborg_gnome_mark_calendar_offline_la_LIBADD = \ + $(EVOLUTION_CALENDAR_LIBS) EXTRA_DIST = org-gnome-mark-calendar-offline.eplug.xml diff --git a/plugins/prefer-plain/ChangeLog b/plugins/prefer-plain/ChangeLog index 274dde355c..7f2699a779 100644 --- a/plugins/prefer-plain/ChangeLog +++ b/plugins/prefer-plain/ChangeLog @@ -1,3 +1,8 @@ +2008-08-12 Bharath Acharya <abharath@novell.com> + + * Makefile.am: Use NO_UNDEFINED. Link with more libraries. To generate + dlls on Windows. + 2008-05-27 Milan Crha <mcrha@redhat.com> ** Fix for bug #532384 diff --git a/plugins/prefer-plain/Makefile.am b/plugins/prefer-plain/Makefile.am index 00eef8ba84..ec597e4d4c 100644 --- a/plugins/prefer-plain/Makefile.am +++ b/plugins/prefer-plain/Makefile.am @@ -8,7 +8,10 @@ plugin_DATA = org-gnome-prefer-plain.eplug plugin_LTLIBRARIES = liborg-gnome-prefer-plain.la liborg_gnome_prefer_plain_la_SOURCES = prefer-plain.c -liborg_gnome_prefer_plain_la_LDFLAGS = -module -avoid-version +liborg_gnome_prefer_plain_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED) +liborg_gnome_prefer_plain_la_LIBADD = \ + $(top_builddir)/mail/libevolution-mail.la \ + $(EVOLUTION_MAIL_LIBS) EXTRA_DIST = org-gnome-prefer-plain.eplug.xml diff --git a/plugins/save-calendar/ChangeLog b/plugins/save-calendar/ChangeLog index 2d84be32d4..eb418028d0 100644 --- a/plugins/save-calendar/ChangeLog +++ b/plugins/save-calendar/ChangeLog @@ -1,3 +1,8 @@ +2008-08-12 Bharath Acharya <abharath@novell.com> + + * Makefile.am: Use NO_UNDEFINED. Link with more libraries. To generate + dlls on Windows. + 2008-05-22 Matthew Barnes <mbarnes@redhat.com> * csv-format.c (do_save_calendar_csv): diff --git a/plugins/save-calendar/Makefile.am b/plugins/save-calendar/Makefile.am index b3c8deb280..461bf0492d 100644 --- a/plugins/save-calendar/Makefile.am +++ b/plugins/save-calendar/Makefile.am @@ -14,7 +14,10 @@ liborg_gnome_save_calendar_la_SOURCES = \ rdf-format.c \ format-handler.h -liborg_gnome_save_calendar_la_LDFLAGS = -module -avoid-version +liborg_gnome_save_calendar_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED) +liborg_gnome_save_calendar_la_LIBADD = \ + $(top_builddir)/e-util/libeutil.la \ + $(EVOLUTION_CALENDAR_LIBS) EXTRA_DIST = org-gnome-save-calendar.eplug.xml diff --git a/plugins/select-one-source/ChangeLog b/plugins/select-one-source/ChangeLog index c190550d6e..abaa1aed35 100644 --- a/plugins/select-one-source/ChangeLog +++ b/plugins/select-one-source/ChangeLog @@ -1,3 +1,8 @@ +2008-08-12 Bharath Acharya <abharath@novell.com> + + * Makefile.am: Use NO_UNDEFINED. Link with more libraries. To generate + dlls on Windows. + 2007-11-11 Gilles Dartiguelongue <gdartigu@svn.gnome.org> ** Fix bug #495872 diff --git a/plugins/select-one-source/Makefile.am b/plugins/select-one-source/Makefile.am index 2dcf45c0a0..7bd40ef4f7 100644 --- a/plugins/select-one-source/Makefile.am +++ b/plugins/select-one-source/Makefile.am @@ -8,7 +8,9 @@ plugin_DATA = org-gnome-select-one-source.eplug plugin_LTLIBRARIES = liborg-gnome-select-one-source.la liborg_gnome_select_one_source_la_SOURCES = select-one-source.c -liborg_gnome_select_one_source_la_LDFLAGS = -module -avoid-version +liborg_gnome_select_one_source_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED) +liborg_gnome_select_one_source_la_LIBADD = \ + $(EVOLUTION_CALENDAR_LIBS) EXTRA_DIST = org-gnome-select-one-source.eplug.xml diff --git a/plugins/startup-wizard/startup-wizard.c b/plugins/startup-wizard/startup-wizard.c index 22ace2ea13..32cf21a217 100644 --- a/plugins/startup-wizard/startup-wizard.c +++ b/plugins/startup-wizard/startup-wizard.c @@ -23,7 +23,6 @@ #include <gtk/gtk.h> #include <libgnomeui/libgnomeui.h> #include "widgets/e-timezone-dialog/e-timezone-dialog.h" -#include "e-util/e-icon-factory.h" #include "e-util/e-error.h" #include "e-util/e-import.h" #include "shell/es-event.h" diff --git a/plugins/subject-thread/ChangeLog b/plugins/subject-thread/ChangeLog index 3c647ab8f8..59b23f7b75 100644 --- a/plugins/subject-thread/ChangeLog +++ b/plugins/subject-thread/ChangeLog @@ -1,3 +1,8 @@ +2008-08-12 Bharath Acharya <abharath@novell.com> + + * Makefile.am: Use NO_UNDEFINED. Link with more libraries. To generate + dlls on Windows. + 2007-07-29 Srinivasa Ragavan <sragavan@novell.com> ** Fix for bug #428123 from Lucky diff --git a/plugins/subject-thread/Makefile.am b/plugins/subject-thread/Makefile.am index 45f2a826b1..0ff0fc49a5 100644 --- a/plugins/subject-thread/Makefile.am +++ b/plugins/subject-thread/Makefile.am @@ -8,7 +8,9 @@ plugin_DATA = org-gnome-subject-thread.eplug plugin_LTLIBRARIES = liborg-gnome-subject-thread.la liborg_gnome_subject_thread_la_SOURCES = subject-thread.c -liborg_gnome_subject_thread_la_LDFLAGS = -module -avoid-version +liborg_gnome_subject_thread_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED) +liborg_gnome_subject_thread_la_LIBADD = \ + $(EVOLUTION_MAIL_LIBS) EXTRA_DIST = org-gnome-subject-thread.eplug.xml diff --git a/plugins/templates/ChangeLog b/plugins/templates/ChangeLog index c559689e43..e1157ef1d9 100644 --- a/plugins/templates/ChangeLog +++ b/plugins/templates/ChangeLog @@ -1,3 +1,13 @@ +2008-08-12 Bharath Acharya <abharath@novell.com> + + * Makefile.am: Have a check for OS_WIN32 and handle the schema data + differently. make install error on win32. + +2008-08-12 Bharath Acharya <abharath@novell.com> + + * Makefile.am: Use NO_UNDEFINED. Link with more libraries. To generate + dlls on Windows. + 2008-07-21 Johnny Jacob <jjohnny@novell.com> * templates.c: Remove unused header files. diff --git a/plugins/templates/Makefile.am b/plugins/templates/Makefile.am index f43dce0992..5a36917fa2 100644 --- a/plugins/templates/Makefile.am +++ b/plugins/templates/Makefile.am @@ -15,7 +15,11 @@ plugin_DATA = \ plugin_LTLIBRARIES = liborg-gnome-templates.la liborg_gnome_templates_la_SOURCES = templates.c -liborg_gnome_templates_la_LDFLAGS = -module -avoid-version +liborg_gnome_templates_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED) +liborg_gnome_templates_la_LIBADD = \ + $(top_builddir)/e-util/libeutil.la \ + $(top_builddir)/mail/libevolution-mail.la \ + $(EVOLUTION_MAIL_LIBS) schemadir = $(GCONF_SCHEMA_FILE_DIR) schema_in_files = apps-evolution-template-placeholders.schemas.in @@ -23,12 +27,25 @@ schema_DATA = $(schema_in_files:.schemas.in=.schemas) @INTLTOOL_SCHEMAS_RULE@ +if OS_WIN32 install-data-local: - if test -z "$(DESTDIR)" ; then \ - for p in $(schema_DATA) ; do \ - GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $$p; \ - done \ + if test -z "$(DESTDIR)" ; then \ + for p in $(schema_DATA) ; do \ + (echo set GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE); \ + echo $(GCONFTOOL) --makefile-install-rule $$p) >_temp.bat; \ + cmd /c _temp.bat; \ + rm _temp.bat; \ + done \ fi +else +install-data-local: + if test -z "$(DESTDIR)" ; then \ + for p in $(schema_DATA) ; do \ + GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) \ + $(GCONFTOOL) --makefile-install-rule $$p; \ + done \ + fi +endif EXTRA_DIST = org-gnome-templates.eplug.xml \ $(schema_in_files) \ diff --git a/plugins/webdav-account-setup/ChangeLog b/plugins/webdav-account-setup/ChangeLog new file mode 100644 index 0000000000..0a512b4dd3 --- /dev/null +++ b/plugins/webdav-account-setup/ChangeLog @@ -0,0 +1,15 @@ +2008-08-12 Bharath Acharya <abharath@novell.com> + + * Makefile.am: Added necessary libraries to link to. Build break while + compiling on Windows. Added a ChangeLog file for webdav-account-setup + plugin. + +2008-08-04 Matthias Braun <matze@braunis.de> + + ** Fix for bug #544051 + + ** Added WebDAV plugin + * Makefile.am: + * org-gnome-evolution-webdav.eplug.xml: + * webdav-contacts-source.c: + WebDAV backend for addressbook - GUI plugin for account setup. diff --git a/plugins/webdav-account-setup/Makefile.am b/plugins/webdav-account-setup/Makefile.am index ea2ea5fdcb..5637f76e66 100644 --- a/plugins/webdav-account-setup/Makefile.am +++ b/plugins/webdav-account-setup/Makefile.am @@ -12,7 +12,8 @@ liborg_gnome_evolution_webdav_la_SOURCES = \ webdav-contacts-source.c liborg_gnome_evolution_webdav_la_LIBADD = \ - $(EPLUGIN_LIBS) + $(EPLUGIN_LIBS) \ + $(EVOLUTION_ADDRESSBOOK_LIBS) liborg_gnome_evolution_webdav_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED) |