diff options
Diffstat (limited to 'plugins')
104 files changed, 611 insertions, 8160 deletions
diff --git a/plugins/addressbook-file/ChangeLog b/plugins/addressbook-file/ChangeLog deleted file mode 100644 index f9b08a85f3..0000000000 --- a/plugins/addressbook-file/ChangeLog +++ /dev/null @@ -1,59 +0,0 @@ -2008-09-04 Sankar P <psankar@novell.com> - -License Changes - - * addressbook-file.c: - -2008-07-31 Matthew Barnes <mbarnes@redhat.com> - - ** Fixes part of bug #545568 - - * org-gnome-addressbook-file.eplug.xml: - Add "system_plugin=true" so it's not shown in the Plugin Manager. - This plugin is not designed to be disabled by the user. - -2006-02-28 Christian Kellner <gicmo@gnome.org> - - * addressbook-file.c: fixing a leak. - -2005-12-25 Funda Wang <fundawang@linux.net.cn> - - * Makefile.am: Mark this plugin as translatable (bug#301149). - -2005-12-12 Harish Krishnaswamy <kharish@novell.com> - - * Makefile.am: Fix make-clean issues. - -2005-12-07 Funda Wang <fundawang@linux.net.cn> - - * org-gnome-addressbook-file.eplug.in: i18nlized. - -2005-08-23 Not Zed <NotZed@Ximian.com> - - * addressbook-file.c (e_book_file_dummy): fix relative_uri type, - don't include every header in the world we dont' need. And it - sure has hell seems to do something for a 'dummy' function. - -2005-06-27 Tor Lillqvist <tml@novell.com> - - * Makefile.am: There is no EVOLUTION_CFLAGS. Use - NO_UNDEFINED. Link with EVOLUTION_ADDRESSBOOK_LIBS. - -2005-06-18 Tor Lillqvist <tml@novell.com> - - * org-gnome-addressbook-file.eplug.in: Use SOEXT. - -2005-02-28 Sivaiah Nallagatla <snallagatla@novell.com> - - * addressbook-file.c (e_book_file_dummy) : - don't set the relative uri if already present. - Also change the typo in the prototype s/calendar/book - part of fix for #73152 - -2005-02-24 Björn Torkelsson <torkel@acc.umu.se> - - * org-gnome-addressbook-file.eplug.in: Added author and description. - -2005-01-21 Sivaiah Nallagatla <snallagatla@novell.com> - - * initial commit diff --git a/plugins/addressbook-file/addressbook-file.c b/plugins/addressbook-file/addressbook-file.c index 2168d324cc..0adcf9a701 100644 --- a/plugins/addressbook-file/addressbook-file.c +++ b/plugins/addressbook-file/addressbook-file.c @@ -25,6 +25,14 @@ #include <libedataserver/e-source.h> #include <string.h> +gint e_plugin_lib_enable (EPlugin *ep, gint enable); + +gint +e_plugin_lib_enable (EPlugin *ep, gint enable) +{ + return 0; +} + GtkWidget *e_book_file_dummy (EPlugin *epl, EConfigHookItemFactoryData *data); GtkWidget * diff --git a/plugins/attachment-reminder/ChangeLog b/plugins/attachment-reminder/ChangeLog deleted file mode 100644 index 53db95fe62..0000000000 --- a/plugins/attachment-reminder/ChangeLog +++ /dev/null @@ -1,196 +0,0 @@ -2008-09-24 Sankar P <psankar@novell.com> - -License Changes - - * attachment-reminder.c: - -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. - - * org-gnome-attachment-reminder.error.xml: Added - "Add attachment" button. - - * attachment-reminder.c (ask_for_missing_attachment): activate - composer's "attach" action on "Add attachment". - -2008-05-23 Johnny Jacob <jjohnny@novell.com> - - ** Fixes Bug 496476. - - * attachment-reminder.glade: Removed GtkTables and added simple HBoxes - - * attachment-reminder.c (e_plugin_lib_get_configure_widget): Let the - configure widget expand. - -2008-05-22 Johnny Jacob <jjohnny@novell.com> - - ** Fixes Bug #529995 - - * attachment-reminder.c (ask_for_missing_attachment): Disable the plugin. - - * apps-evolution-attachment-reminder.schemas.in: Removed GConf key. - - * attachment-reminder.c (toggle_cb): Removed. - (e_plugin_lib_get_configure_widget): Remove "Remind missing attachments" - check button. - (org_gnome_evolution_attachment_reminder): Removed Gconf key - for enable/disable . - -2008-05-22 Johnny Jacob <jjohnny@novell.com> - - * attachment-reminder.c (strip_text_msg): Wrong condition check - -2008-05-20 Johnny Jacob <jjohnny@novell.com> - - ** Fixes Bug #473198 - - * attachment-reminder.c (strip_text_msg): Ignore signature. - -2008-04-07 Ambuj Chitranshi <ambuj_1075@yahoo.co.in> - - ** Fix for bug #484793 - - * org-gnome-attachment-reminder.error.xml: - String change: "Continue Editing" -> "Edit Message" - -2008-02-03 Matthew Barnes <mbarnes@redhat.com> - - * attachment-reminder.c (org_gnome_evolution_attachment_reminder): - Fix a compiler warning. - -2008-01-24 Johnny Jacob <jjohnny@novell.com> - - ** Fixes bug #503327 & #503678 - - * attachment-reminder.c (strip_text_msg): Memory leak Fix. - (org_gnome_evolution_attachment_reminder): Free GByteArray. - NULL terminate string. - -2008-01-14 Kjartan Maraas <kmaraas@gnome.org> - - * apps-evolution-attachment-reminder.schemas.in: Add - missing punctuation. - -2007-12-15 Johnny Jacob <jjohnny@novell.com> - - ** Cleanup of attachment reminder over Milan Crha's work. - - * attachment-reminder.c (check_for_attachment_clues): Unref gconf_client. - (commit_changes): reuse ui->gconf. - (e_plugin_lib_get_configure_widget): Remove unnecessary - gconf_client_get_default () - -2007-12-07 Milan Crha <mcrha@redhat.com> - - ** Fix for bug #502312 - - * attachment-reminder.c: A little cleanup of configuration part of - the plugin to not use global variables and free memory properly. - -2007-12-05 Sankar P <psankar@novell.com> - - * attachment-reminder.c: (e_plugin_lib_get_configure_widget): - Move preferences to the configure tab. - -2007-10-26 Kjartan Maraas <kmaraas@gnome.org> - - * attachment-reminder.c: (check_for_attachment_clues), - (clue_check_isempty): Don't mix code and declarations. Also - remove a c++ comment. - -2007-09-06 B S Srinidhi <srinidhi.bs@gmail.com> - - ** Fix for bug #468366 - - * attachment-reminder.c: Avoid empty keywords getting added and - other small fixes and improvements. - -2007-08-21 Andre Klapper <a9016009@gmx.de> - - * org-gnome-attachment-reminder.error.xml: Marked strings for - translation - -2007-08-20 Johnny Jacob <jjohnny@novell.com> - - ** Fix for 468159 from Gilles Dartiguelongue - <gdartigu@svn.gnome.org> - - * apps-evolution-attachment-reminder.schemas.in.in : Renamed to - apps-evolution-attachment-reminder.schemas.in - - * Makefile.am : Removed usage of BASE_VERSION - -2007-08-03 Johnny Jacob <jjohnny@novell.com> - - * org-gnome-attachment-reminder.errors.xml: Renamed to - org-gnome-attachment-reminder.error.xml - - * org-gnome-attachment-reminder.error.xml: Marked strings for - translation - - * Makefile.am : Fixed translation rules. - -2007-08-03 Hiroyuki Ikezoe <poincare@ikezoe.net> - - ** Fix for bug #460821 - - * attachment-reminder.c: (strip_text_msg): The second argument of - g_utf8_strdown() expects the length of string in bytes or -1. - -2007-07-30 Andre Klapper <a9016009@gmx.de> - - * attachment-reminder.glade: - remove "window1" string from translation - -2007-07-26 Sankar P <psankar@novell.com> - - * attachment-reminder.c: (e_plugin_lib_configure), - (org_gnome_attachment_reminder_config_option): - * attachment-reminder.glade: - Configure attachment-reminder plugin within the plugin-manager. - -2007-07-26 Hiroyuki Ikezoe <poincare@ikezoe.net> - - * attachment-reminder.c: Plugged memory leak and the second argument - of g_utf8_strdown() should be in bytes. - -2007-07-17 Sankar P <psankar@novell.com> - - * org-gnome-attachment-reminder.errors.xml: - Changed the string "Cancel" to "Continue Editing" - -2007-07-10 Sankar P <psankar@novell.com> - - * org-gnome-attachment-reminder.errors.xml: - Fixed Marking for Translation bugs - -2007-07-09 Srinivasa Ragavan <sragavan@novell.com> - - * Makefile.am: Fix for build break from Johnny. - -2007-07-09 Johnny Jacob <jjohnny@novell.com> - - * attachment-remidner.glade : Added mnemonics. - * attachment-reminder.c : Fixed warnings. - * org-gnome-attachment-reminder.errors.xml : Added new strings. - -2007-07-09 Johnny Jacob <jjohnny@novell.com> - - ** Added attachment Reminder plugins - * apps-evolution-attachment-reminder.schemas.in.in: - * org-gnome-evolution-attachment-reminder.eplug.xml: - * attachment-reminder.c: - * Makefile.am: - * attachment-reminder.glade: - * org-gnome-attachment-reminder.errors.xml: diff --git a/plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in b/plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in index c75bc34247..e86ebf665d 100644 --- a/plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in +++ b/plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in @@ -17,7 +17,7 @@ in a message body</short> <long> List of clues for the attachment reminder plugin to look for - in a message body. + in a message body </long> </locale> </schema> diff --git a/plugins/attachment-reminder/attachment-reminder.c b/plugins/attachment-reminder/attachment-reminder.c index ee17785fbd..19decd6cbf 100644 --- a/plugins/attachment-reminder/attachment-reminder.c +++ b/plugins/attachment-reminder/attachment-reminder.c @@ -30,14 +30,6 @@ #include <e-util/e-config.h> #include <mail/em-config.h> #include <mail/em-event.h> -#include <camel/camel-mime-message.h> -#include <camel/camel-medium.h> -#include <camel/camel-mime-message.h> -#include <camel/camel-multipart.h> -#include <camel/camel-stream.h> -#include <camel/camel-stream-mem.h> -#include <camel/camel-mime-message.h> -#include <camel/camel-multipart.h> #include <e-util/e-alert-dialog.h> #include <e-util/e-plugin.h> @@ -120,14 +112,17 @@ ask_for_missing_attachment (EPlugin *ep, GtkWindow *window) { GtkWidget *check = NULL; GtkDialog *dialog = NULL; + GtkWidget *content_area; gint response; - dialog = (GtkDialog*)e_alert_dialog_new_for_args(window, "org.gnome.evolution.plugins.attachment_reminder:attachment-reminder", NULL); + dialog = (GtkDialog*) e_alert_dialog_new_for_args ( + window, "org.gnome.evolution.plugins.attachment_reminder:attachment-reminder", NULL); /*Check buttons*/ check = gtk_check_button_new_with_mnemonic (_("_Do not show this message again.")); gtk_container_set_border_width((GtkContainer *)check, 12); - gtk_box_pack_start ((GtkBox *)dialog->vbox, check, TRUE, TRUE, 0); + content_area = gtk_dialog_get_content_area (dialog); + gtk_box_pack_start (GTK_BOX (content_area), check, TRUE, TRUE, 0); gtk_widget_show (check); response = gtk_dialog_run ((GtkDialog *) dialog); @@ -490,17 +485,17 @@ e_plugin_lib_get_configure_widget (EPlugin *epl) clue_add = gtk_button_new_from_stock ("gtk-add"); gtk_widget_show (clue_add); gtk_container_add (GTK_CONTAINER (vbuttonbox2), clue_add); - GTK_WIDGET_SET_FLAGS (clue_add, GTK_CAN_DEFAULT); + gtk_widget_set_can_default (clue_add, TRUE); clue_edit = gtk_button_new_from_stock ("gtk-edit"); gtk_widget_show (clue_edit); gtk_container_add (GTK_CONTAINER (vbuttonbox2), clue_edit); - GTK_WIDGET_SET_FLAGS (clue_edit, GTK_CAN_DEFAULT); + gtk_widget_set_can_default (clue_edit, TRUE); clue_remove = gtk_button_new_from_stock ("gtk-remove"); gtk_widget_show (clue_remove); gtk_container_add (GTK_CONTAINER (vbuttonbox2), clue_remove); - GTK_WIDGET_SET_FLAGS (clue_remove, GTK_CAN_DEFAULT); + gtk_widget_set_can_default (clue_remove, TRUE); ui->gconf = gconf_client_get_default (); diff --git a/plugins/audio-inline/ChangeLog b/plugins/audio-inline/ChangeLog deleted file mode 100644 index 374d489fbe..0000000000 --- a/plugins/audio-inline/ChangeLog +++ /dev/null @@ -1,102 +0,0 @@ -2009-02-11 Andre Klapper <a9016009@gmx.de> - - * audio-inline.c: - Substitute some deprecated gtk+ functions. - -2008-10-03 Sankar P <psankar@novell.com> - -License Changes - - * audio-inline.c: - -2008-09-24 Philip Withnall <philip@tecnocode.co.uk> - - ** Fixes bug #553479 - - * org-gnome-audio-inline.eplug.xml: String capitalisation - improvements. - -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 - - * org-gnome-audio-inline.eplug.xml: - Add inline disposition for "audio/microsoft-wav" MIME types. - -2007-09-05 Frederic Crozat <fcrozat@mandriva.com> - - * audio-inline.c: - * org-gnome-audio-inline.eplug.xml: - Port plugin to gstreamer 0.10 and handle additional mimetypes - (bug #329629). - -2007-08-16 Milan Crha <mcrha@redhat.com> - - ** Part of fix for bug #350539 - - * audio-inline.c: (org_gnome_audio_inline_play_clicked): - Ensures non-NULL part. - -2006-01-09 Kjartan Maraas <kmaraas@gnome.org> - - * audio-inline.c: (org_gnome_audio_inline_add_button): - s/volatile static/static volatile/g. Remove unused var. - -2005-12-18 Tor Lillqvist <tml@novell.com> - - * audio-inline.c: Use g_ascii_strcasecmp() instead of - strcasecmp(), especially as we are comparing to plain ASCII - strings. - -2005-05-11 Not Zed <NotZed@Ximian.com> - - * Makefile.am: add cleanfiles and built_sources. - -2005-05-06 Not Zed <NotZed@Ximian.com> - - * Makefile.am: - * org-gnome-audio-inline.eplug.xml: s/.in/.xml/ & i18n. - -2005-02-24 Björn Torkelsson <torkel@acc.umu.se> - - * org-gnome-audio-inline.eplug.in: Added a . to the end of description. - -2004-11-26 JP Rosevear <jpr@novell.com> - - * audio-inline.c (org_gnome_audio_inline_add_button): get image - from icon factory directly - -2004-11-11 Radek Doulik <rodo@ximian.com> - - * org-gnome-audio-inline.eplug.in: fixed author and description - -2004-11-01 JP Rosevear <jpr@novell.com> - - * Makefile.am: dist .eplug.in file - -2004-10-25 Radek Doulik <rodo@ximian.com> - - * audio-inline.c: removed unused enum declaration - (org_gnome_audio_inline_play_clicked): added cast to &argv to - quiet compiler - handle more mime types - - * org-gnome-audio-inline.eplug.in: handle application/x-ogg mime - type - handle more mime types - - * audio-inline.c: handle application/x-ogg mime type - - * org-gnome-audio-inline.eplug.in: handle audio/x-mp3 mime type - - * audio-inline.c: (org_gnome_audio_inline_play_clicked): handle - audio/x-mp3 mime type - -2004-10-25 Radek Doulik <rodo@ximian.com> - - * audio-inline.c: imported audio inline plugin diff --git a/plugins/audio-inline/audio-inline.c b/plugins/audio-inline/audio-inline.c index 9de5512e0f..983bf12438 100644 --- a/plugins/audio-inline/audio-inline.c +++ b/plugins/audio-inline/audio-inline.c @@ -27,10 +27,6 @@ #include <gtk/gtk.h> #include <glib/gstdio.h> #include "e-util/e-mktemp.h" -#include "camel/camel-medium.h" -#include "camel/camel-mime-part.h" -#include "camel/camel-stream.h" -#include "camel/camel-stream-fs.h" #include "mail/em-format-hook.h" #include "mail/em-format-html.h" #include "gtkhtml/gtkhtml-embedded.h" @@ -38,6 +34,14 @@ #define d(x) +gint e_plugin_lib_enable (EPlugin *ep, gint enable); + +gint +e_plugin_lib_enable (EPlugin *ep, gint enable) +{ + return 0; +} + void org_gnome_audio_inline_format (gpointer ep, EMFormatHookTarget *t); static volatile gint org_gnome_audio_class_id_counter = 0; @@ -78,7 +82,7 @@ org_gnome_audio_inline_pobject_free (EMFormatHTMLPObject *o) } if (po->part) { - camel_object_unref (po->part); + g_object_unref (po->part); po->part = NULL; } if (po->filename) { @@ -205,10 +209,10 @@ org_gnome_audio_inline_play_clicked (GtkWidget *button, EMFormatHTMLPObject *pob d(printf ("audio inline formatter: write to temp file %s\n", po->filename)); stream = camel_stream_fs_new_with_name (po->filename, O_RDWR | O_CREAT | O_TRUNC, 0600); - data = camel_medium_get_content_object (CAMEL_MEDIUM (po->part)); + data = camel_medium_get_content (CAMEL_MEDIUM (po->part)); camel_data_wrapper_decode_to_stream (data, stream); camel_stream_flush (stream); - camel_object_unref (stream); + g_object_unref (stream); d(printf ("audio inline formatter: init gst playbin\n")); @@ -297,7 +301,7 @@ org_gnome_audio_inline_format (gpointer ep, EMFormatHookTarget *t) pobj = (struct _org_gnome_audio_inline_pobject *) em_format_html_add_pobject ((EMFormatHTML *) t->format, sizeof(*pobj), classid, t->part, org_gnome_audio_inline_button_panel); - camel_object_ref (t->part); + g_object_ref (t->part); pobj->part = t->part; pobj->filename = NULL; pobj->playbin = NULL; diff --git a/plugins/backup-restore/ChangeLog b/plugins/backup-restore/ChangeLog deleted file mode 100644 index 7413e0e564..0000000000 --- a/plugins/backup-restore/ChangeLog +++ /dev/null @@ -1,182 +0,0 @@ -2009-01-30 Milan Crha <mcrha@redhat.com> - - * backup-restore.c: (sanity_check): Removed dangling '*/'. - -2009-01-28 Tor Lillqvist <tml@novell.com> - - Make it compile on Windows, by Fridrich Strbra. (Just compile; - little chance of it actually doing anything sensible on Windows at - this point...) - - * Makefile.am: Use -no-undefined on Windows. Link with libeutil. - - * backup.c: Remove unused <sys/wait.h>. - - * backup-restore.c: Check HAVE_SYS_WAIT_H. - -2009-01-21 Milan Crha <mcrha@redhat.com> - - * Makefile.am: Use also EVOLUTION_CALENDAR_CFLAGS. - -2008-08-27 Sankar P <psankar@novell.com> - -License Changes - - * backup-restore.c: - * backup.c: - -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 - - * org-gnome-backup-restore.error.xml: - Reword "insufficient-permissions" error message. - -2008-07-03 Roger Zauner <roger@eskimo.com> - - ** Fix for bug #540400 - - * backup.c: (backup): Make Evolution Backup follow symbolic links. - -2008-07-01 Milan Crha <mcrha@redhat.com> - - ** Fix for bug #540274 - - * Makefile.am: Link with libraries we require now. - * backup.c: (rc), (s): Exchange $HOME with g_get_home_dir in commands. - * backup.c: (ensure_locals), (fix_account_folder_uri), (restore): - After restore walk through all account, addressbook, calendar, task - and memo sources and fix the base uri if required. (One should be able - to import also into different user than one where the backup was done.) - -2008-06-30 Milan Crha <mcrha@redhat.com> - - ** Fix for bug #536488 - - * backup.c: (backup), (restore): Remove '~/.evolution/.running' - file before backup/after restore, thus Evolution will not claim - next start it was closed incorrectly. - -2008-06-30 Tobias Mueller <muelli@auftrags-killer.org> - - ** Fix for bug #540516 - - * backup.c (backup), (restore), (check): Sanitize user input while - accepting path/filename of the backup. - -2008-06-20 Milan Crha <mcrha@redhat.com> - - * backup.c: (main): Use Evolution icon for the window. - -2008-06-19 Milan Crha <mcrha@redhat.com> - - ** Fix for bug #478469 - - * backup.c: (main): - Changed the progress dialog to be more HIG compliant. - -2008-05-20 Sankar P <psankar@novell.com> - - * backup-restore.c: (epbr_perform_pre_backup_checks), - (org_gnome_backup_restore_backup): - * org-gnome-backup-restore.error.xml: - Indicate error if backup folder chosen lacks permissions. - - ** Fixes bug #534012 - -2008-02-25 Jeff Cai<jeff.cai@sun.com> - - * backup.c: (backup), (restore): - Because Solaris tar doesn't respect '-z' option, use gzip&tar to - finish the silimar function. - -2008-02-20 Jeff Cai<jeff.cai@sun.com> - - ** Fix for bug #516648 - - * backup.c: (backup), (restore): - Use $HOME instead of "~" - -2008-01-06 Christian Krause <chkr@plauener.de> - - * backup.c: (backup), (restore), (check), (main): Initialize static - variables before use, not-NULL checks for filename before - backup/restore/check operations. - -2007-08-07 Johnny Jacob <jjohnny@novell.com> - - * Committed on behalf of Anand V M <avmuttagi@gmail.com> - - ** Fix for bug #458508 - - * backup-restore-plugin: string issues resolved. - -2007-08-23 Srinivasa Ragavan <sragavan@novell.com> - - * backup-restore.c: (org_gnome_backup_restore_restore): Popup the - right warning - -2007-06-18 Srinivasa Ragavan <sragavan@novell.com> - - * backup.c: Remove BASE_VERSION from the binary - -2007-06-18 Srinivasa Ragavan <sragavan@novell.com> - - ** Fix for bug #428328 from Ghislain MARY - - * backup.c: (main): Use GOptions from popt - -2007-04-12 Srinivasa Ragavan <sragavan@novell.com> - - ** Reworked Backup/Restore plugin. It comes in File menu for - backup/restore. It also provides a option to restore, while setting up - a new account. Option added to show GUI progress for backup/restore. - - * Makefile.am: Added error file to build. - * backup-restore.c: (backup), (restore), (sanity_check), - (dialog_prompt_user), (org_gnome_backup_restore_backup), - (org_gnome_backup_restore_restore), (check_toggled), - (restore_wizard), (file_changed), (backup_restore_page), - (backup_restore_commit), (backup_restore_abort): - * backup.c: (backup), (restore), (check), (pbar_update), - (thread_start), (idle_cb), (dlg_response), (main): - * org-gnome-backup-restore.eplug.xml: - * org-gnome-backup-restore.error.xml: - * org-gnome-backup-restore.xml: - -2007-04-02 Sankar P <psankar@novell.com> - - * Committed on behalf of Gilles Dartiguelongue <dartigug@esiee.fr> - - * org-gnome-backup-restore.eplug.xml: - Cleanup. - Fixes part of #301149 - -2007-03-20 Matthew Barnes <mbarnes@redhat.com> - - ** Fixes part of bug #419524 - - * Include <glib/gi18n.h> instead of <libgnome/gnome-i18n.h>. - -2005-05-11 Not Zed <NotZed@Ximian.com> - - * Makefile.am: setup built_sources & cleanfiles. - -2005-05-06 Not Zed <NotZed@Ximian.com> - - * Makefile.am (plugin_DATA): - * org-gnome-backup-restore.eplug.xml: s/.in/.xml & i18n. - -2005-02-24 Björn Torkelsson <torkel@acc.umu.se> - - * org-gnome-backup-restore.eplug.in: Added author and fixed description. - -2004-12-16 JP Rosevear <jpr@novell.com> - - * Imported backup/restore plugin - diff --git a/plugins/backup-restore/backup-restore.c b/plugins/backup-restore/backup-restore.c index 5286605f66..87feab7a25 100644 --- a/plugins/backup-restore/backup-restore.c +++ b/plugins/backup-restore/backup-restore.c @@ -51,6 +51,14 @@ typedef enum _br_flags { BR_START = 1<<1 }br_flags; +gint e_plugin_lib_enable (EPlugin *ep, gint enable); + +gint +e_plugin_lib_enable (EPlugin *ep, gint enable) +{ + return 0; +} + static void backup (const gchar *filename, gboolean restart) { @@ -350,14 +358,14 @@ static GtkActionEntry entries[] = { { "settings-backup", NULL, - N_("_Backup Settings..."), + N_("_Backup Evolution Settings..."), NULL, N_("Backup Evolution data and settings to an archive file"), G_CALLBACK (action_settings_backup_cb) }, { "settings-restore", NULL, - N_("R_estore Settings..."), + N_("R_estore Evolution Settings..."), NULL, N_("Restore Evolution data and settings from an archive file"), G_CALLBACK (action_settings_restore_cb) } diff --git a/plugins/backup-restore/backup.c b/plugins/backup-restore/backup.c index dcaaa7e4fe..3c2fe90a6d 100644 --- a/plugins/backup-restore/backup.c +++ b/plugins/backup-restore/backup.c @@ -252,7 +252,7 @@ restore (const gchar *filename) run_cmd (EVOLUTION " --quit"); CANCEL (complete); - txt = _("Backup current Evolution data"); + txt = _("Back up current Evolution data"); run_cmd ("mv " EVOLUTION_DIR " " EVOLUTION_DIR_BACKUP); run_cmd ("mv $HOME/.camel_certs ~/.camel_certs_old"); @@ -443,6 +443,8 @@ main (gint argc, gchar **argv) if (gui_arg && !check_op) { GtkWidget *widget, *container; + GtkWidget *action_area; + GtkWidget *content_area; const gchar *txt, *txt2; gchar *str = NULL; gchar *markup; @@ -460,13 +462,16 @@ main (gint argc, gchar **argv) gtk_dialog_set_has_separator (GTK_DIALOG (progress_dialog), FALSE); gtk_container_set_border_width (GTK_CONTAINER (progress_dialog), 12); + action_area = gtk_dialog_get_action_area ( + GTK_DIALOG (progress_dialog)); + content_area = gtk_dialog_get_content_area ( + GTK_DIALOG (progress_dialog)); + /* Override GtkDialog defaults */ - widget = GTK_DIALOG (progress_dialog)->vbox; - gtk_box_set_spacing (GTK_BOX (widget), 12); - gtk_container_set_border_width (GTK_CONTAINER (widget), 0); - widget = GTK_DIALOG (progress_dialog)->action_area; - gtk_box_set_spacing (GTK_BOX (widget), 12); - gtk_container_set_border_width (GTK_CONTAINER (widget), 0); + gtk_box_set_spacing (GTK_BOX (content_area), 12); + gtk_container_set_border_width (GTK_CONTAINER (content_area), 0); + gtk_box_set_spacing (GTK_BOX (action_area), 12); + gtk_container_set_border_width (GTK_CONTAINER (action_area), 0); if (oper && file) str = g_strdup_printf(oper, file); @@ -476,7 +481,8 @@ main (gint argc, gchar **argv) gtk_table_set_row_spacings (GTK_TABLE (container), 12); gtk_widget_show (container); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (progress_dialog)->vbox), container, FALSE, TRUE, 0); + gtk_box_pack_start ( + GTK_BOX (content_area), container, FALSE, TRUE, 0); widget = gtk_image_new_from_stock (GTK_STOCK_COPY, GTK_ICON_SIZE_DIALOG); gtk_misc_set_alignment (GTK_MISC (widget), 0.0, 0.0); diff --git a/plugins/bbdb/ChangeLog b/plugins/bbdb/ChangeLog deleted file mode 100644 index f7b0b27e30..0000000000 --- a/plugins/bbdb/ChangeLog +++ /dev/null @@ -1,347 +0,0 @@ -2008-10-01 Milan Crha <mcrha@redhat.com> - - ** Fix for bug #553527 - - * bbdb.c: (struct todo_struct), (free_todo_struct), (bbdb_do_in_thread), - (bbdb_do_thread), (bbdb_handle_reply): Do the EBook work in a separate - thread to have better performance on reply with slow address books. - -2008-09-29 Milan Crha <mcrha@redhat.com> - - ** Fix for bug #497928 - - * bbdb.c: (source_changed_cb), (gaim_source_changed_cb): - Set URI to empty string when user deletes previously selected source. - -2008-09-19 Sankar P <psankar@novell.com> - -License Changes - - * bbdb.c: - -2008-09-02 Sankar P <psankar@novell.com> - -License Changes - - * gaimbuddies.c: - -2008-08-27 Philip Withnall <philip@tecnocode.co.uk> - - ** Fix for bug #534762 - - * bbdb.c: (bbdb_page_factory): - * org-gnome-evolution-bbdb.eplug.xml: Change "addressbook" to - "address book" in translatable strings. - -2008-08-27 Sankar P <psankar@novell.com> - -License Changes - - * bbdb.h: - * test-evobuddy.c: - -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 - - * bbdb.c: (e_plugin_lib_enable): The bbdb plugin is noisy when - enabled: - "BBDB spinning up..." - Make this plugin just as polite as google-account-setup. - -2008-07-28 Lucian Langa <lucilanga@gnome.org> - - ** See bug #504417 - - * bbdb.c: - Preferences window cut off - -2008-01-10 Milan Crha <mcrha@redhat.com> - - ** Fix for bug #496402 - - * gaimbuddies.c: (parse_buddy_group), (get_all_blocked), - (bbdb_get_gaim_buddy_list), (free_gaim_body), (free_buddy_list), - (parse_buddy_group): Do not synchronize blocked bodies from pidgin. - -2008-01-02 Milan Crha <mcrha@redhat.com> - - ** Fix for bug #502914 - - * bbdb.c: (enable_toggled_cb): Do not write NULL into gconf. - -2007-12-03 Srinivasa Ragavan <sragavan@novell.com> - - ** Fix for bug #391062 - - * bbdb.c: (bbdb_open_addressbook): Dont add contacts, if it is enabled - to do so. - -2007-10-26 Kjartan Maraas <kmaraas@gnome.org> - - * bbdb.c: (bbdb_check_gaim_enabled), (source_changed_cb): - ANSIfication of function declaration. - -2007-10-22 Matthew Barnes <mbarnes@redhat.com> - - ** Fixes part of bug #417999 - - * bbdb.c: - * gaimbuddies.c: - Use ESourceComboBox instead of ESourceOptionMenu (deprecated). - -2007-10-09 Matthew Barnes <mbarnes@redhat.com> - - ** Fixes part of bug #437579 - - * bbdb.c: - * gaimbuddies.c: - Fix various compiler warnings. Patch from Milan Crha. - -2007-09-27 Matthew Barnes <mbarnes@redhat.com> - - * bbdb.c (bbdb_page_factory): - Use consistent terminology for mail messages (#480621). - -2007-08-24 Suman Manjunath <msuman@novell.com> - - ** Fix for bug #440807 - - * bbdb.c: (bbdb_page_factory): - * gaimbuddies.c: (bbdb_sync_buddy_list_check), - (bbdb_get_gaim_buddy_list), (get_buddy_icon_from_setting), - (parse_contact): - Sync now with Pidgin IM [previously Gaim IM]. - -2007-08-06 Sankar P <psankar@novell.com> - - * Committed on behalf of Diego Escalante Urrelo - <diegoe@gnome.org> - - * bbdb.c: (bbdb_timeout), (bbdb_open_addressbook): - * gaimbuddies.c: (bbdb_sync_buddy_list_check): - "Synchronize now" should work even if periodic checking - is not enabled. - Fixes bug #377309 - -2007-06-25 Milan Crha <mcrha@redhat.com> - - ** Fix for bug #334140 - - * bbdb.c: (bbdb_do_it): Strip '\"' out of name part, if exists. - -2007-06-07 Gilles Dartiguelongue <dartigug@esiee.fr> - - * gaimbuddies.c: (get_node_text), (parse_contact): more compilation - warnings cleanup, completes bug #437584 fixes - -2007-05-14 Srinivasa Ragavan <sragavan@novell.com> - - ** Fix for bug #414195 from Loïc Minier - - * Makefile.am: - -2007-05-11 Gilles Dartiguelongue <dartigug@esiee.fr> - - * gaimbuddies.c: (bbdb_sync_buddy_list_check), - (bbdb_get_gaim_buddy_list), (get_node_text), (parse_contact), - (parse_buddy_group): add casts to clear compilation warnings, - Fixes part of bug #437584 - -2007-04-02 Sankar P <psankar@novell.com> - - * Committed on behalf of Gilles Dartiguelongue <dartigug@esiee.fr> - - * org-gnome-evolution-bbdb.eplug.xml: - Cleanup. - Fixes part of #301149 - -2007-03-29 Matthew Barnes <mbarnes@redhat.com> - - * gaimbuddies.c: - Fix "incompatible pointer type" warnings (#360619). - -2007-03-20 Matthew Barnes <mbarnes@redhat.com> - - ** Fixes part of bug #419524 - - * Include <glib/gi18n.h> instead of <libgnome/gnome-i18n.h>. - -2006-08-17 Kjartan Maraas <kmaraas@gnome.org> - - * gaimbuddies.c: (bbdb_sync_buddy_list_check): Don't leak - the file path here. - -2006-08-17 Kjartan Maraas <kmaraas@gnome.org> - - * bbdb.c: (bbdb_open_addressbook), - (create_addressbook_option_menu): Plug a couple leaks. - -2006-08-03 Devashish Sharma <sdevashish@novell.com> - - * bbdb.c: Gaim and automatic contacts were not seen until - evolution is restarted. - Fix for Bug #346180, 349371, 346353 - -2006-07-18 Ross Burton <ross@openedhand.com> - - * gaimbuddies.c: - Fix for EContactPhoto change. Partially fixed by Hiroyuki Ikezoe - <poincare@ikezoe.net>, rest by me. (#347870) - -2006-07-12 Andre Klapper <a9016009@gmx.de> - - * bbdb.c: Marking two strings for translation that were accidentally - not marked. Fixes bug #347312. - -2006-02-14 Andre Klapper <a9016009@gmx.de> - - * bbdb.c (bbdb_page_factory): Another typo fix from gfree to g_free. - -2006-02-14 Veerapuram Varadhan <vvaradhan@novell.com> - - * bbdb.c (bbdb_page_factory): A typo fix from gfree to g_free. - -2006-02-12 Karsten Bräckelmann <guenther@rudersport.de> - - * bbdb.c (bbdb_page_factory): - Removing unnecessary markup in translateable string. - Fixes part of bug #272789. - -2006-01-23 Devashish Sharma <sdevashish@novell.com> - - * bbdb.c : - * gaimbuddies.c : - Added provision for having the gaimbuddies synced to a separate - addressbook. Earlier it used the same addressbook as used for - Automatic Contacts. - -2006-01-19 Andre Klapper <a9016009@gmx.de> - - * org-gnome-evolution-bbdb.eplug.xml: - changed "mails" to "mail" or "messages". Fixes bug 325569. - -2005-12-30 Andre Klapper <a9016009@gmx.de> - - * org-gnome-evolution-bbdb.eplug.xml: Fixing several typos and - harmonizing capital/small letters. Partially fixes bug 306117. - -2005-09-13 Sushma Rai <rsushma@novell.com> - - * bbdb.c (bbdb_do_it): If the contact has only e-mail id and not name, - extract the name from e-mail id and add it to the address book. - Fixes #303286. - -2005-07-28 Vivek Jain <jvivek@novell.com> - - * bbdb.c:(bbdb_handle_reply):check for NULL - before using the address. - **Fixes bugs like #274544 - -2005-05-11 Not Zed <NotZed@Ximian.com> - - * Makefile.am: setup cleanfiles/built_sources - -2005-05-06 Not Zed <NotZed@Ximian.com> - - * Makefile.am: - * org-gnome-evolution-bbdb.eplug.xml: s/.in/.xml/ & i18n. - -2005-04-07 Sushma Rai <rsushma@novell.com> - - * bbdb.c (bbdb_handle_reply): Check for camel_internet_address_get() - return value and initialize name and e-mail variables inside the loop. - (bbdb_do_it): Check for query being NULL. Fixes #74366. - Free list of contacts before returning, on finding multiple contacts - with the same name. - -2005-04-05 Not Zed <NotZed@Ximian.com> - - * bbdb.c (bbdb_handle_reply): noop if we can't open the book/we're - disabled. - -2005-02-07 JP Rosevear <jpr@novell.com> - - * org-gnome-evolution-bbdb.eplug.in: specify id - -2005-01-31 Sivaiah Nallagatla <snallagatla@novell.com> - - * gaimbuddies.c (bbdb_sync_buddy_list) : initialize - GError* to NULL - Fixes #71512 - - * bbdb.c (bbdb_open_addressbook) : ditto - -2005-01-22 Nat Friedman <nat@novell.com> - - * gaimbuddies.c (im_list_contains_buddy): Check the buddy account - name, not alias. Duh. - (free_contact_list): Removed. - -2005-01-13 Nat Friedman <nat@novell.com> - - * gaimbuddies.c (bbdb_sync_buddy_list_check): Remove some debug - printfs. - (bbdb_sync_buddy_list): Do not query for the IM name, which is - slow. Instead, query by alias and only commit the contact if we - have changes for it. - (bbdb_merge_buddy_to_contact): Return a boolean indicating whether - we dirtied the contact or not. - -2005-01-08 Nat Friedman <nat@novell.com> - - * org-gnome-evolution-bbdb.eplug.in: Reformatted the description. - -2004-11-03 Nat Friedman <nat@novell.com> - - * org-gnome-evolution-bbdb.eplug.in: Add description and author - fields. Change name. - -2004-11-01 JP Rosevear <jpr@novell.com> - - * Makefile.am: dist .eplug.in file - -2004-11-01 JP Rosevear <jpr@novell.com> - - * Makefile.am: list bbdb.h as a source so it gets disted - -2004-10-27 Nat Friedman <nat@novell.com> - - * bbdb.c (bbdb_page_factory): Use _with_mnemonic for the button. - - * Makefile.am: Don't build the test program by default. - -2004-10-25 Nat Friedman <nat@novell.com> - - * bbdb.c (e_plugin_lib_enable): Sync the Gaim buddy list. Set a - timer to check for Gaim buddy list chnages to sync. - (bbdb_do_it): Free some memory we were leaking before. - (bbdb_open_addressbook): New function for Gaim buddy list support. - (bbdb_check_gaim_enabled): Likewise. - (enable_gaim_toggled_cb): Likewise. - (synchronize_button_clicked_cb): Likewise. - (bbdb_page_factory): Added UI for Gaim buddy list sync support. - - * gaimbuddies.c: New file, contains routines to synchronize IM - information and buddy icons from a Gaim buddy list. - - * bbdb.h: New file, contains shared macros and prototypes. - - * test-evobuddy.c (main): New function, tests a gaim buddy list - sync. - -2004-10-23 Nat Friedman <nat@novell.com> - - * bbdb.c (bbdb_do_it): Change assertions to if statements, so as - not to issue warnings in the case of routine failures (name - is NULL). Don't add an email to a contact if the appropriate - contact is ambiguous. - -2004-10-22 Nat Friedman <nat@novell.com> - - * Initial checkin. - diff --git a/plugins/bbdb/bbdb.c b/plugins/bbdb/bbdb.c index e3666f94de..545fd6842d 100644 --- a/plugins/bbdb/bbdb.c +++ b/plugins/bbdb/bbdb.c @@ -34,7 +34,6 @@ #include <e-util/e-config.h> #include <mail/em-config.h> #include <mail/em-event.h> -#include <camel/camel-mime-message.h> #include <composer/e-msg-composer.h> #include "bbdb.h" @@ -682,7 +681,7 @@ bbdb_page_factory (EPlugin *ep, EConfigHookItemFactoryData *hook_data) /* Create a new notebook page */ page = gtk_vbox_new (FALSE, 0); - GTK_CONTAINER (page)->border_width = 12; + gtk_container_set_border_width (GTK_CONTAINER (page), 12); tab_label = gtk_label_new (_("Automatic Contacts")); gtk_notebook_append_page (GTK_NOTEBOOK (hook_data->parent), page, tab_label); @@ -695,7 +694,7 @@ bbdb_page_factory (EPlugin *ep, EConfigHookItemFactoryData *hook_data) str = g_strdup_printf ("<span weight=\"bold\">%s</span>", _("Automatic Contacts")); gtk_label_set_markup (GTK_LABEL (frame_label), str); g_free (str); - GTK_MISC (frame_label)->xalign = 0.0; + gtk_misc_set_alignment (GTK_MISC (frame_label), 0.0, 0.5); gtk_box_pack_start (GTK_BOX (frame), frame_label, FALSE, FALSE, 0); /* Indent/padding */ @@ -731,7 +730,7 @@ bbdb_page_factory (EPlugin *ep, EConfigHookItemFactoryData *hook_data) str = g_strdup_printf ("<span weight=\"bold\">%s</span>", _("Instant Messaging Contacts")); gtk_label_set_markup (GTK_LABEL (frame_label), str); g_free (str); - GTK_MISC (frame_label)->xalign = 0.0; + gtk_misc_set_alignment (GTK_MISC (frame_label), 0.0, 0.5); gtk_box_pack_start (GTK_BOX (frame), frame_label, FALSE, FALSE, 0); /* Indent/padding */ @@ -743,7 +742,7 @@ bbdb_page_factory (EPlugin *ep, EConfigHookItemFactoryData *hook_data) gtk_box_pack_start (GTK_BOX (hbox), inner_vbox, FALSE, FALSE, 0); /* Enable Gaim Checkbox */ - check_gaim = gtk_check_button_new_with_mnemonic (_("Synchronize contact info and images from Pidgin buddy list")); + check_gaim = gtk_check_button_new_with_mnemonic (_("_Synchronize contact info and images from Pidgin buddy list")); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check_gaim), gconf_client_get_bool (target->gconf, GCONF_KEY_ENABLE_GAIM, NULL)); g_signal_connect (GTK_TOGGLE_BUTTON (check_gaim), "toggled", G_CALLBACK (enable_gaim_toggled_cb), stuff); gtk_box_pack_start (GTK_BOX (inner_vbox), check_gaim, FALSE, FALSE, 0); diff --git a/plugins/bogo-junk-plugin/ChangeLog b/plugins/bogo-junk-plugin/ChangeLog deleted file mode 100644 index b24ac0db6c..0000000000 --- a/plugins/bogo-junk-plugin/ChangeLog +++ /dev/null @@ -1,123 +0,0 @@ -2009-01-28 Tor Lillqvist <tml@novell.com> - - * Makefile.am: Use -no-undefined on Windows. Link with libeutil. - - * bf-junk-filter.c: Tentative port to Windows even though this - plugin isn't even compiled on Windows for now. Just for - completeness. - -2008-12-15 srinivasa ragavan <sragavan@novell.com> - - * makefile.am: - * bf-junk-filter.c: (init_db), (pipe_to_bogofilter): init the - bogofilter if it wasn't. say that evolution's welcome message is not - junk. - -2008-10-14 Sankar P <psankar@novell.com> - -License Changes - - * bf-junk-filter.c: - -2008-04-29 Milan Crha <mcrha@redhat.com> - - * bf-junk-filter.c: (pipe_to_bogofilter): - Report errors properly. Thanks to Reid Thompson whom found it. - -2008-04-25 Milan Crha <mcrha@redhat.com> - - ** Fix for bug #273041 - - * bf-junk-filter.c: (pipe_to_bogofilter), (em_junk_bf_check_junk), - (em_junk_bf_report_junk), (em_junk_bf_report_non_junk): - Propagate possible errors to the UI. - -2008-03-19 Sankar P <psankar@novell.com> - - ** Fix for bug #519304 - - * org-gnome-bogo-junk-plugin.eplug.xml: - Mark plugin name for translation. - -2007-09-27 Matthew Barnes <mbarnes@redhat.com> - - * bf-junk-filter.c: - Use consistent terminology for mail messages (#480621). - -2007-09-07 Milan Crha <mcrha@redhat.com> - - ** Part of fix for bug #473903 - - * bf-junk-filter.c: (em_junk_bf_validate_binary): Changing function - prototype to fit what is expected in 'invoke', returns value based on it. - -2007-08-27 Srinivasa Ragavan <sragavan@novell.com> - - * bf-junk-filter.c: (e_plugin_lib_enable): Avoid re-entrancy in - enable - -2007-08-22 Srinivasa Ragavan <sragavan@novell.com> - - ** Fix for bug #468294 - - * org-gnome-bogo-junk-plugin.eplug.xml: Add a few strings for - translation. - -2007-08-22 Srinivasa Ragavan <sragavan@novell.com> - - ** Fix for bug #468303 - - * org-gnome-bogo-junk-plugin.eplug.xml: Enable strings for i18n. - -2007-07-26 Hiroyuki Ikezoe <poincare@ikezoe.net> - - * bf-junk-filter.c: (convert_unicode_cb): Plugged memory leak. - -2007-06-03 Srinivasa Ragavan <sragavan@novell.com> - - ** Fix for version removal from Installed files from Gilles Dartiguelongue - - * Makefile.am: - -2007-05-12 Matthew Barnes <mbarnes@redhat.com> - - ** Fixes part of bug #337616 - - * Makefile.am: Add $(schema_DATA) to DISTCLEANFILES. - - * org-gnome-bogo-junk-plugin.eplug.in: Rename as *.eplug.xml. - -2007-05-11 Gilles Dartiguelongue <dartigug@esiee.fr> - - * bf-junk-filter.c: add prototypes to clean compilation warnings - Fixes part of bug #437584 - -2007-04-23 Matthew Barnes <mbarnes@redhat.com> - - * Makefile.am: Distribute bogo-junk-plugin.schemas.in.in. (#432616) - -2007-04-03 Srinivasa Ragavan <sragavan@novell.com> - - * Makefile.am: Committing the right Makefile.am - -2007-04-03 Srinivasa Ragavan <sragavan@novell.com> - - ** Added bogofilter part of Evolution source. - -2006-02-19 Mikhail Zabaluev <mhz@altlinux.org> - -* configure.ac: Switched to evolution-plugin-2.6 for plugin configuration. -Bumped version to 0.2.0. - -* org-altlinux-bf-junk-plugin.eplug.in: Templatized the plugin manifesto, -with plugin install directory substituted. -* configure.ac: Added org-altlinux-bf-junk-plugin.eplug to AC_CONFIG_FILES. -* Makefile.am: Added org-altlinux-bf-junk-plugin.eplug.in to EXTRA_DIST. - -* README: Added bug reference to the initial ham training problem. - -2005-11-22 Mikhail Zabaluev <mhz@altlinux.org> - -* README: Added reference to Spam Trainer. - -* README: Reflect on the fix for bug #313096 that made it to Evolution 2.5.2. diff --git a/plugins/bogo-junk-plugin/bf-junk-filter.c b/plugins/bogo-junk-plugin/bf-junk-filter.c index 4190eebe86..6cc2e80d4d 100644 --- a/plugins/bogo-junk-plugin/bf-junk-filter.c +++ b/plugins/bogo-junk-plugin/bf-junk-filter.c @@ -45,11 +45,6 @@ #include <e-util/e-plugin.h> #include "mail/em-config.h" #include <mail/em-junk.h> -#include <camel/camel-data-wrapper.h> -#include <camel/camel-mime-message.h> -#include <camel/camel-mime-parser.h> -#include <camel/camel-stream-fs.h> -#include <camel/camel-debug.h> #include <gconf/gconf-client.h> #include "shell/e-shell.h" @@ -100,10 +95,10 @@ init_db (void) camel_mime_parser_init_with_stream (parser, stream); camel_mime_parser_scan_from (parser, FALSE); - camel_object_unref (stream); + g_object_unref (stream); camel_mime_part_construct_from_parser ((CamelMimePart *) msg, parser); - camel_object_unref (parser); + g_object_unref (parser); d(fprintf (stderr, "Initing the bogofilter DB with Welcome message\n")); @@ -112,7 +107,7 @@ init_db (void) } pipe_to_bogofilter (msg, argv, NULL); - camel_object_unref (msg); + g_object_unref (msg); } @@ -172,7 +167,7 @@ retry: camel_data_wrapper_write_to_stream (CAMEL_DATA_WRAPPER (msg), stream); camel_stream_flush (stream); camel_stream_close (stream); - camel_object_unref (stream); + g_object_unref (stream); #ifndef G_OS_WIN32 waitres = waitpid (child_pid, &status, 0); @@ -391,7 +386,9 @@ org_gnome_bogo_convert_unicode (struct _EPlugin *epl, struct _EConfigHookItemFac { EShell *shell; GtkWidget *check; - guint i = ((GtkTable *)data->parent)->nrows; + guint n_rows; + + g_object_get (data->parent, "n-rows", &n_rows, NULL); if (data->old) return data->old; @@ -400,7 +397,9 @@ org_gnome_bogo_convert_unicode (struct _EPlugin *epl, struct _EConfigHookItemFac gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check), em_junk_bf_unicode); g_signal_connect (GTK_TOGGLE_BUTTON (check), "toggled", G_CALLBACK (convert_unicode_cb), (gpointer) "/apps/evolution/mail/junk/bogofilter/unicode"); - gtk_table_attach((GtkTable *)data->parent, check, 0, 1, i, i+1, 0, 0, 0, 0); + gtk_table_attach ( + GTK_TABLE (data->parent), check, + 0, 1, n_rows, n_rows+1, 0, 0, 0, 0); shell = e_shell_get_default (); if (e_shell_get_express_mode (shell)) diff --git a/plugins/caldav/ChangeLog b/plugins/caldav/ChangeLog deleted file mode 100644 index 9a9bae7398..0000000000 --- a/plugins/caldav/ChangeLog +++ /dev/null @@ -1,124 +0,0 @@ -2009-04-28 Milan Crha <mcrha@redhat.com> - - ** Fix for bug #578335 - - * caldav-source.c: (user_changed), (location_changed): - Revert part of bug #562990, as EPassword requires username - as part of an URL to store passwords properly to a keyring. - -2009-04-24 Milan Crha <mcrha@redhat.com> - - ** Part of fix for bug #569652 - - * caldav-source.c: (ensure_caldav_source_group): - Use new ESourceList API (simplifies code). - -2009-04-24 Milan Crha <mcrha@redhat.com> - - ** Fix for bug #572348 - - * caldav-source.c: Remove deprecated Gtk+ symbols. - -2009-02-26 Matthew Barnes <mbarnes@redhat.com> - - ** Fixes part of bug #572950 - - * Makefile.am: - Fix ordering of -I compiler directives. Patch by Daniel Macks. - -2008-12-08 Milan Crha <mcrha@redhat.com> - - ** Fix for bug #562990 - - * caldav-source.c: (user_changed), (oge_caldav): Use 'username' - property of the ESource to read/write user name, not the uri. - -2008-11-28 Milan Crha <mcrha@redhat.com> - - ** Part of fix for bug #503662 - - * caldav-source.c: (user_changed): - Set NULL properly to protect against using already freed memory. - -2008-11-28 Milan Crha <mcrha@redhat.com> - - ** Part of fix for bug #359745 - - * caldav-source.c: (ensure_caldav_source_group), - (e_plugin_lib_enable): Ensure source group for VTODO and VJOURNAL too. - * caldav-source.c: (set_refresh_time), (get_refresh_minutes), - (spin_changed), (option_changed), (oge_caldav): - Be able to change refresh time for the CalDAV sources. - * org-gnome-evolution-caldav.eplug.xml: - Show CalDAV options under all the other standard options. - -2008-09-02 Sankar P <psankar@novell.com> - -License Changes - - * caldav-source.c: - -2008-08-07 Paul Bolle <pebolle@tiscali.nl> - - ** Fixes bug #546785 - - * caldav-source.c: (e_plugin_lib_enable): The caldav plugin is noisy - when enabled: - "CalDAV Eplugin starting up ..." - Make this plugin just as polite as google-account-setup. - -2008-07-31 Matthew Barnes <mbarnes@redhat.com> - - ** Fixes part of bug #545568 - - * org-gnome-caldav.eplug.xml: - Add "system_plugin=true" so it's not shown in the Plugin Manager. - This plugin is not designed to be disabled by the user. - -2007-10-26 Kjartan Maraas <kmaraas@gnome.org> - - * caldav-source.c: (ensure_caldav_source_group): - ANSIfication of function declaration. - -2007-05-12 Matthew Barnes <mbarnes@redhat.com> - - ** Fixes part of bug #337616 - - * Makefile.am: Add "eplug" file to CLEANFILES. - -2006-08-28 Kjartan Maraas <kmaraas@gnome.org> - - * org-gnome-evolution-caldav.eplug.xml: Mark name and - description for translation. - Makefile.am: Rename the above from .in to .xml - -2006-06-15 Tor Lillqvist <tml@novell.com> - - * Makefile.am: Use NO_UNDEFINED. - - * org-gnome-evolution-caldav.eplug.in: Use SOEXT. - -2006-03-28 Jeff Cai <jeff.cai@sun.com> - - ** Fixes #333881 - * caldav-source.c: (oge_caldav): - Set an empty string instead of null for a TEXT entry. - -2006-02-22 Irene.Huang <Irene.Huang@sun.com> - - Fixes bug #328252 - - * Makefile.am: Add $(EVOLUTION_CALENDAR_LIBS) - to liborg_gnome_evolution_caldav_la_LIBADD. - -2006-01-16 Harish Krishnaswamy <kharish@novell.com> - - * Makefile.am : Integrate with eplugin make - scripts and add a ChangeLog file for the eplugin. - -2006-01-16 Harish Krishnaswamy <kharish@novell.com> - - * caldav*: 'Import' the CalDAV eplugin - implementation into evolution. Please - refer evolution-caldav module in cvs.gnome.org for - prior Change history. diff --git a/plugins/caldav/caldav-browse-server.c b/plugins/caldav/caldav-browse-server.c index ff19ff0c38..8b2d1ae0e4 100644 --- a/plugins/caldav/caldav-browse-server.c +++ b/plugins/caldav/caldav-browse-server.c @@ -39,7 +39,6 @@ #include <libedataserverui/e-passwords.h> #include <e-util/e-dialog-utils.h> -#include <widgets/misc/e-spinner.h> #include "caldav-browse-server.h" @@ -789,6 +788,7 @@ soup_authenticate (SoupSession *session, SoupMessage *msg, SoupAuth *auth, gbool if (!password || !*password || retrying) { gchar *pass, *prompt, *add = NULL; + gchar *bold_user, *bold_host; if (retrying && msg && msg->reason_phrase) { add = g_strdup_printf (_("Previous attempt failed: %s"), msg->reason_phrase); @@ -796,7 +796,11 @@ soup_authenticate (SoupSession *session, SoupMessage *msg, SoupAuth *auth, gbool add = g_strdup_printf (_("Previous attempt failed with code %d"), msg->status_code); } - prompt = g_strdup_printf (_("Enter password for user <b>%s</b> on server <b>%s</b>"), username, soup_auth_get_host (auth)); + bold_user = g_strconcat ("<b>", username, "</b>", NULL); + bold_host = g_strconcat ("<b>", soup_auth_get_host (auth), "</b>", NULL); + prompt = g_strdup_printf (_("Enter password for user %s on server %s"), bold_user, bold_host); + g_free (bold_user); + g_free (bold_host); if (add) { gchar *tmp; @@ -1180,7 +1184,8 @@ init_dialog (GtkDialog *dialog, GtkWidget **new_url_entry, const gchar *url, con info_box = gtk_hbox_new (FALSE, 2); - spinner = e_spinner_new_spinning_small_shown (); + spinner = gtk_spinner_new (); + gtk_spinner_start (GTK_SPINNER (spinner)); gtk_box_pack_start (GTK_BOX (info_box), spinner, FALSE, FALSE, 0); g_object_set_data (G_OBJECT (dialog), "caldav-spinner", spinner); diff --git a/plugins/caldav/caldav-source.c b/plugins/caldav/caldav-source.c index 5691fdde45..a3129af3a4 100644 --- a/plugins/caldav/caldav-source.c +++ b/plugins/caldav/caldav-source.c @@ -185,6 +185,7 @@ oge_caldav (EPlugin *epl, SoupURI *suri; GtkWidget *parent, *location, *ssl, *user, *browse_cal; gchar *uri, *username; + guint n_rows; source = t->source; @@ -214,25 +215,38 @@ oge_caldav (EPlugin *epl, location = e_plugin_util_add_entry (parent, _("_URL:"), NULL, NULL); gtk_entry_set_text (GTK_ENTRY (location), uri); - g_signal_connect (G_OBJECT (location), "changed", G_CALLBACK (location_changed_cb), source); + + g_signal_connect ( + location, "changed", + G_CALLBACK (location_changed_cb), source); ssl = e_plugin_util_add_check (parent, _("Use _SSL"), source, "ssl", "1", "0"); user = e_plugin_util_add_entry (parent, _("User_name:"), NULL, NULL); gtk_entry_set_text (GTK_ENTRY (user), username ? username : ""); - g_signal_connect (G_OBJECT (user), "changed", G_CALLBACK (user_changed_cb), source); + + g_signal_connect ( + user, "changed", + G_CALLBACK (user_changed_cb), source); g_free (uri); g_free (username); browse_cal = gtk_button_new_with_mnemonic (_("Brows_e server for a calendar")); gtk_widget_show (browse_cal); - gtk_table_attach (GTK_TABLE (parent), browse_cal, 1, 2, GTK_TABLE (parent)->nrows, GTK_TABLE (parent)->nrows + 1, GTK_FILL, 0, 0, 0); + g_object_get (parent, "n-rows", &n_rows, NULL); + gtk_table_attach ( + GTK_TABLE (parent), browse_cal, 1, 2, + n_rows, n_rows + 1, GTK_FILL, 0, 0, 0); g_object_set_data (G_OBJECT (browse_cal), "caldav-url", location); g_object_set_data (G_OBJECT (browse_cal), "caldav-username", user); g_object_set_data (G_OBJECT (browse_cal), "caldav-ssl", ssl); - g_signal_connect (G_OBJECT (browse_cal), "clicked", G_CALLBACK (browse_cal_clicked_cb), GINT_TO_POINTER (t->source_type)); + + g_signal_connect ( + browse_cal, "clicked", + G_CALLBACK (browse_cal_clicked_cb), + GINT_TO_POINTER (t->source_type)); e_plugin_util_add_refresh (parent, _("Re_fresh:"), source, "refresh"); diff --git a/plugins/calendar-file/ChangeLog b/plugins/calendar-file/ChangeLog deleted file mode 100644 index 66be2b91b2..0000000000 --- a/plugins/calendar-file/ChangeLog +++ /dev/null @@ -1,60 +0,0 @@ -2008-09-04 Sankar P <psankar@novell.com> - -License Changes - - * calendar-file.c: - -2008-07-31 Matthew Barnes <mbarnes@redhat.com> - - ** Fixes part of bug #545568 - - * org-gnome-calendar-file.eplug.xml: - Add "system_plugin=true" so it's not shown in the Plugin Manager. - This plugin is not designed to be disabled by the user. - -2007-03-20 Matthew Barnes <mbarnes@redhat.com> - - ** Fixes part of bug #419524 - - * Include <glib/gi18n.h> instead of <libgnome/gnome-i18n.h>. - -2006-02-28 Christian Kellner <gicmo@gnome.org> - - * calendar-file.c: fixing a leak. - -2005-08-23 Not Zed <NotZed@Ximian.com> - - * calendar-file.c (e_calendar_file_dummy): fix relative_uri type. - -2005-06-27 Tor Lillqvist <tml@novell.com> - - * Makefile.am: There is no EVOLUTION_CFLAGS. Use - NO_UNDEFINED. Link with EVOLUTION_CALENDAR_LIBS. - -2005-06-18 Tor Lillqvist <tml@novell.com> - - * org-gnome-calendar-file.eplug.xml: Use SOEXT. - -2005-05-11 Not Zed <NotZed@Ximian.com> - - * Makefile.am: add built_sources/cleanfiles - -2005-05-06 Not Zed <NotZed@Ximian.com> - - * Makefile.am: - * org-gnome-calendar-file.eplug.xml: s/.in/.xml/ & i18n. - -2005-02-28 Sivaiah Nallagatla <snallagatla@novell.com> - - * calendar-file.c (e_calendar_file_dummy) : - don't set the relative uri if already present. - - part of fix for #73152 - -2005-02-24 Björn Torkelsson <torkel@acc.umu.se> - - * calendar-file.c: Added author and description. - -2005-01-06 JP Rosevear <jpr@novell.com> - - * Initial import of file properties plugin. diff --git a/plugins/calendar-file/calendar-file.c b/plugins/calendar-file/calendar-file.c index e82feaa11a..7bacfb44a6 100644 --- a/plugins/calendar-file/calendar-file.c +++ b/plugins/calendar-file/calendar-file.c @@ -27,6 +27,14 @@ #include <glib/gi18n.h> #include <string.h> +gint e_plugin_lib_enable (EPlugin *ep, gint enable); + +gint +e_plugin_lib_enable (EPlugin *ep, gint enable) +{ + return 0; +} + static void location_changed (GtkFileChooserButton *widget, ESource *source) { @@ -95,6 +103,7 @@ e_calendar_file_customs (EPlugin *epl, EConfigHookItemFactoryData *data) ECalConfigTargetSource *t = (ECalConfigTargetSource *) data->target; ESource *source = t->source; const gchar *relative_uri, *value; + guint n_rows; GtkWidget *w1, *w2, *box1, *box2, *mainbox, *maincheck; if (!e_plugin_util_is_source_proto (source, "file")) @@ -107,7 +116,11 @@ e_calendar_file_customs (EPlugin *epl, EConfigHookItemFactoryData *data) e_source_set_relative_uri (source, e_source_peek_uid (source)); mainbox = gtk_vbox_new (FALSE, 2); - gtk_table_attach (GTK_TABLE (data->parent), mainbox, 1, 2, GTK_TABLE (data->parent)->nrows, GTK_TABLE (data->parent)->nrows + 1, GTK_EXPAND | GTK_FILL, 0, 0, 0); + g_object_get (data->parent, "n-rows", &n_rows, NULL); + gtk_table_attach ( + GTK_TABLE (data->parent), mainbox, + 1, 2, n_rows, n_rows + 1, + GTK_EXPAND | GTK_FILL, 0, 0, 0); maincheck = gtk_check_button_new_with_mnemonic (_("_Customize options")); gtk_box_pack_start ((GtkBox *)mainbox, maincheck, TRUE, TRUE, 2); diff --git a/plugins/calendar-http/ChangeLog b/plugins/calendar-http/ChangeLog deleted file mode 100644 index 7ceb72ae76..0000000000 --- a/plugins/calendar-http/ChangeLog +++ /dev/null @@ -1,103 +0,0 @@ -2009-04-24 Milan Crha <mcrha@redhat.com> - - ** Fix for bug #572348 - - * calendar-http.c: Remove deprecated Gtk+ symbols. - -2008-07-31 Matthew Barnes <mbarnes@redhat.com> - - ** Fixes part of bug #545568 - - * org-gnome-calendar-http.eplug.xml: - Add "system_plugin=true" so it's not shown in the Plugin Manager. - This plugin is not designed to be disabled by the user. - -2008-03-31 Suman Manjunath <msuman@novell.com> - - ** Fix for bug #346555 - - * calendar-http.c: (e_calendar_http_refresh): - Fixed a mnemonic conflict. - -2007-10-09 Matthew Barnes <mbarnes@redhat.com> - - ** Fixes part of bug #437579 - - * calendar-http.c: - Fix various compiler warnings. Patch from Milan Crha. - -2007-07-25 Milan Crha <mcrha@redhat.com> - - ** Fix for bug #268162 - - * org-gnome-calendar-http.eplug.xml: - Added new entry for username. - * calendar-http.c: (e_calendar_http_auth): - Creates and setup entry for username. - * calendar-http.c: (username_changed): - New callback when user changes username entry content. - -2007-03-20 Matthew Barnes <mbarnes@redhat.com> - - ** Fixes part of bug #419524 - - * Include <glib/gi18n.h> instead of <libgnome/gnome-i18n.h>. - -2006-01-16 Tony Tsui <tsui.tony@gmail.com> - - Fixes #267402 - * plugins/calendar-http/calendar-http.c - * plugins/calendar-http/org-gnome-calendar-http.eplug.xml: - Add support for accessing web calendars over HTTPS. - -2005-06-27 Tor Lillqvist <tml@novell.com> - - * Makefile.am: There is no EVOLUTION_CFLAGS. Use - NO_UNDEFINED. Link with EVOLUTION_CALENDAR_LIBS. - -2005-06-18 Tor Lillqvist <tml@novell.com> - - * org-gnome-calendar-http.eplug.xml: Use SOEXT. - -2005-05-11 Not Zed <NotZed@Ximian.com> - - * Makefile.am: added built_sources/cleanfiles - -2005-05-06 Not Zed <NotZed@Ximian.com> - - * Makefile.am: - * org-gnome-calendar-http.eplug.xml: s/.in/.xml/ & i18n. - -2005-02-24 Björn Torkelsson <torkel@acc.umu.se> - - * org-gnome-calendar-http.eplug.in: Added author and description. - -2005-01-06 JP Rosevear <jpr@novell.com> - - * Makefile.am: include top_srcdir - -2004-12-28 David Trowbridge <David.Trowbridge@Colorado.edu> - - * calendar-http.c (e_calendar_http_check): s/strcmp/strncmp. - - * org-gnome-calendar-http.eplug.in: fixed order of menus. - -2004-11-12 Diego Sevilla Ruiz <dsevilla@ditec.um.es> - - * calendar-http.c (e_calendar_http_check): Accept protocol-less - URIs. Fixes #68264. - (e_calendar_http_check): Fixed a memory leak. - (e_calendar_http_refresh): Another mem. leak fix. - (e_calendar_http_url): Fixed another more memory leak. - -2004-11-09 Rodney Dawes <dobey@novell.com> - - * Makefile.am: Add EXTRA_DIST variable for the eplug.in file - -2004-11-04 Not Zed <NotZed@Ximian.com> - - * Makefile.am: duh, add this to cvs, remove Makefile. - -2004-11-04 David Trowbridge <David.Trowbridge@Colorado.edu> - - * Initial import of webcal properties plugin. diff --git a/plugins/calendar-http/calendar-http.c b/plugins/calendar-http/calendar-http.c index 1137d0617e..658f93d0e0 100644 --- a/plugins/calendar-http/calendar-http.c +++ b/plugins/calendar-http/calendar-http.c @@ -34,6 +34,14 @@ gboolean e_calendar_http_check (EPlugin *epl, EConfigHookPageCheckData *data); GtkWidget * e_calendar_http_secure (EPlugin *epl, EConfigHookItemFactoryData *data); GtkWidget *e_calendar_http_auth (EPlugin *epl, EConfigHookItemFactoryData *data); +gint e_plugin_lib_enable (EPlugin *ep, gint enable); + +gint +e_plugin_lib_enable (EPlugin *ep, gint enable) +{ + return 0; +} + static void url_changed (GtkEntry *entry, ESource *source) { diff --git a/plugins/calendar-weather/ChangeLog b/plugins/calendar-weather/ChangeLog deleted file mode 100644 index 8aa7f8990c..0000000000 --- a/plugins/calendar-weather/ChangeLog +++ /dev/null @@ -1,140 +0,0 @@ -2009-04-24 Milan Crha <mcrha@redhat.com> - - ** Fix for bug #572348 - - * calendar-weather.c: Remove deprecated Gtk+ symbols. - -2008-12-10 Suman Manjunath <msuman@novell.com> - - * Makefile.am: Don't try to specify LIBGWEATHER_(CFLAGS|LIBS), they - will be provided by configure.in. - -2008-12-03 Milan Crha <mcrha@redhat.com> - - ** Part of fix for bug #352287 - - * Makefile.am: Compile and link with libgweather. - * calendar-weather.c: (e_plugin_lib_enable), (selection_changed), - (find_location_func), (find_location), (treeview_clicked), - (create_source_selector), (build_location_path), - (location_clicked), (e_calendar_weather_location): - Use libgweather for weather calendar. - -2008-07-31 Matthew Barnes <mbarnes@redhat.com> - - ** Fixes part of bug #545568 - - * org-gnome-calendar-weather.eplug.xml: - Add "system_plugin=true" so it's not shown in the Plugin Manager. - This plugin is not designed to be disabled by the user. - -2008-03-31 Suman Manjunath <msuman@novell.com> - - ** Fix for bug #346555 - - * calendar-weather.c: (e_calendar_weather_refresh): - Fixed a mnemonic conflict. - -2007-10-26 Kjartan Maraas <kmaraas@gnome.org> - - * calendar-weather.c: (load_locations), (treeview_clicked): - ANSIfication of function declaration. - -2007-05-24 Matthew Barnes <mbarnes@redhat.com> - - * calendar-weather.c (e_calendar_weather_location): - Remove check for obsolete GTK+ version (#424562). - -2007-05-11 Gilles Dartiguelongue <dartigug@esiee.fr> - - * calendar-weather.c: (e_plugin_lib_enable), (parse_subtree), - (location_clicked), (e_calendar_weather_location), - (e_calendar_weather_refresh), (set_units), - (e_calendar_weather_units): fix casts in strcmp, - fixes part of bug #437584. - -2007-03-20 Matthew Barnes <mbarnes@redhat.com> - - ** Fixes part of bug #419524 - - * Include <glib/gi18n.h> instead of <libgnome/gnome-i18n.h>. - -2005-07-13 Tor Lillqvist <tml@novell.com> - - * calendar-weather.c (e_calendar_weather_migrate): Don't return a - value from a void funtion. - -2005-06-27 Tor Lillqvist <tml@novell.com> - - * Makefile.am: There is no EVOLUTION_CFLAGS. Use - NO_UNDEFINED. Link with EVOLUTION_CALENDAR_LIBS. - -2005-06-18 Tor Lillqvist <tml@novell.com> - - * org-gnome-calendar-weather.eplug.xml: Use SOEXT. - -2005-05-11 Not Zed <NotZed@Ximian.com> - - * Makefile.am: added built_sources/cleanfiles - -2005-05-06 Not Zed <NotZed@Ximian.com> - - * Makefile.am: - - * org-gnome-calendar-weather.eplug.xml: s/.in/.xml/ & i18n. - -2005-03-22 David Trowbridge <trowbrds@cs.colorado.edu> - - * Makefile.am: Use $(weatherdatadir) rather than $(weatherdir), get - rid of an incorrect comment - -2005-02-24 Björn Torkelsson <torkel@acc.umu.se> - - * org-gnome-calendar-weather.eplug.in: Add a . to the end of description. - -2005-02-02 Rodney Dawes <dobey@novell.com> - - * Makefile.am (INCLUDES): Use $(weatherdir) instead of duplicating the - define for it below - (weatherdir): Fix to use the correct versioned directory - -2005-01-26 David Trowbridge <trowbrds@cs.colorado.edu> - - * org-gnome-calendar-weather.eplug.in: fix typo - -2005-01-25 Rodrigo Moya <rodrigo@novell.com> - - * calendar-weather.c (e_plugin_lib_enable): set all new categories to - not searchable. - -2005-01-12 David Trowbridge <trowbrds@cs.colorado.edu> - - * calendar-weather.c (e_calendar_weather_units): fix spelling - -2005-01-12 David Trowbridge <trowbrds@cs.colorado.edu> - - * calendar-weather.c, org-gnome-calendar-weather.eplug.in: use - a single setting for metric/imperial rather than separate - temperature and snowfall settings - -2005-01-10 Rodrigo Moya <rodrigo@novell.com> - - * calendar-weather.c (create_source_selected): use HIG-compliant - button order. - -2005-01-07 Rodrigo Moya <rodrigo@novell.com> - - * Makefile.am: define EDS's datadir, needed to get to the - Locations.xml file. - - * calendar-weather.c (load_locations): use EDS's datadir for the - Locations.xml file full path. - -2005-01-07 Rodrigo Moya <rodrigo@novell.com> - - * Makefile.am: define weatherdatadir here, no need to use e-d-s's one, - use evolution's instead. - -2005-01-06 David Trowbridge <trowbrds@cs.colorado.edu> - - * Initial import of weather properties plugin diff --git a/plugins/calendar-weather/calendar-weather.c b/plugins/calendar-weather/calendar-weather.c index 50c698da28..61180b7153 100644 --- a/plugins/calendar-weather/calendar-weather.c +++ b/plugins/calendar-weather/calendar-weather.c @@ -208,6 +208,7 @@ static GtkDialog * create_source_selector (ESource *source) { GtkWidget *dialog, *treeview, *scrolledwindow; + GtkWidget *content_area; GtkCellRenderer *text; GtkTreeSelection *selection; gchar *uri_text; @@ -256,9 +257,10 @@ create_source_selector (ESource *source) text = gtk_cell_renderer_text_new (); gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (treeview), -1, "location", text, "text", 0, NULL); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), scrolledwindow); + content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog)); + gtk_container_add (GTK_CONTAINER (content_area), scrolledwindow); gtk_container_set_border_width (GTK_CONTAINER (scrolledwindow), 6); - gtk_box_set_spacing (GTK_BOX (GTK_DIALOG (dialog)->vbox), 6); + gtk_box_set_spacing (GTK_BOX (content_area), 6); gtk_dialog_set_response_sensitive (GTK_DIALOG (dialog), GTK_RESPONSE_OK, FALSE); gtk_window_set_default_size (GTK_WINDOW (dialog), 420, 340); @@ -334,7 +336,7 @@ GtkWidget * e_calendar_weather_location (EPlugin *epl, EConfigHookItemFactoryData *data) { GtkWidget *button, *parent, *text, *label; - gint row; + guint row; ECalConfigTargetSource *t = (ECalConfigTargetSource *) data->target; ESource *source = t->source; SoupURI *suri; @@ -351,7 +353,7 @@ e_calendar_weather_location (EPlugin *epl, EConfigHookItemFactoryData *data) parent = data->parent; - row = ((GtkTable*)parent)->nrows; + g_object_get (parent, "n-rows", &row, NULL); label = gtk_label_new_with_mnemonic (_("_Location:")); gtk_widget_show (label); @@ -432,7 +434,7 @@ GtkWidget * e_calendar_weather_units (EPlugin *epl, EConfigHookItemFactoryData *data) { GtkWidget *combobox, *parent, *label; - gint row; + guint row; ECalConfigTargetSource *t = (ECalConfigTargetSource *) data->target; ESource *source = t->source; @@ -441,7 +443,7 @@ e_calendar_weather_units (EPlugin *epl, EConfigHookItemFactoryData *data) parent = data->parent; - row = ((GtkTable*)parent)->nrows; + g_object_get (parent, "n-rows", &row, NULL); label = gtk_label_new_with_mnemonic (_("_Units:")); gtk_widget_show (label); diff --git a/plugins/default-mailer/ChangeLog b/plugins/default-mailer/ChangeLog deleted file mode 100644 index 5fe56f0817..0000000000 --- a/plugins/default-mailer/ChangeLog +++ /dev/null @@ -1,123 +0,0 @@ -2008-09-25 Sankar P <psankar@novell.com> - -License Changes - - * default-mailer.c: - -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. - -2007-07-26 Hiroyuki Ikezoe <poincare@ikezoe.net> - - * default-mailer.c: (org_gnome_default_mailer_check_default): Plugged - memory leak. - -2007-07-01 Srinivasa Ragavan <sragavan@novell.com> - - ** Fix for bug #448970 - - * default-mailer.c: (org_gnome_default_mailer_check_default): - -2007-06-03 Srinivasa Ragavan <sragavan@novell.com> - - ** Fix for version removal from Installed files from Gilles Dartiguelongue - - * Makefile.am: - -2007-05-12 Matthew Barnes <mbarnes@redhat.com> - - ** Fixes part of bug #337616 - - * Makefile.am: Add $(schema_DATA) to DISTCLEANFILES. - -2007-04-02 Sankar P <psankar@novell.com> - - * Committed on behalf of Gilles Dartiguelongue <dartigug@esiee.fr> - - * org-gnome-default-mailer.eplug.xml: - Cleanup. - Fixes part of #301149 - -2006-08-22 Srinivasa Ragavan <sragavan@novell.com> - - ** Fix for bug #350823 - - * default-mailer.c: (evolution_is_default_mailer), - (org_gnome_default_mailer_check_default): Patch from Matthew Barnes - to make it robust as well as invokes the right component. - -2006-02-27 Srinivasa Ragavan <sragavan@novell.com> - - * default-mailer.c (org_gnome_default_mailer_check_default): Used - gconf_value_free to free a GConfValue instead of a g_free. - -2005-12-12 Harish Krishnaswamy <kharish@novell.com> - - * Makefile.am: Fix make-clean issues. - -2005-06-23 Not Zed <NotZed@Ximian.com> - - * Makefile.am: Changed the way the i18n stuff and xml building is - done for the 'new way'. - - * default-mailer.c: fixed e-error header move and removed some - other unecessary includes. - -2005-03-24 Jonathan Dieter <jdieter99@gmx.net> - * default-mailer.c: removed code to put a checkbox in the - configuration menu, changed procedure names to avoid - namespace pollution. - - * org-gnome-default-mailer.eplug.in: removed definitions - to put a checkbox in the configuration menu. - - * apps-evolution-mail-prompts-checkdefault.schema.in.in: - schema for GConf key /apps/evolution/mail/prompts/checkdefault. - - * Makefile.am: added steps to build GConf schema. - -2005-03-17 Jonathan Dieter <jdieter99@gmx.net> - - * default-mailer.c: renamed from default-mail-client-check.c - Renamed modules to fit new name and cleaned up code. Fixed - small memory leak. - - * org-gnome-default-mailer.xml: renamed from - org-gnome-default-mail-client-check.xml. - - * org-gnome-default-mailer.eplug.in: renamed from - org-gnome-default-mail-client-check.eplug.in. - - * Makefile.am: Fixed references to fit new file names. - -2005-03-15 Jonathan Dieter <jdieter99@gmx.net> - - * default-mail-client-check.c (check_default_mail_client): - Removed gtk_message_dialog() call and replaced with - e_error(). - - * Makefile.am: added necessary steps to build xml. - - * org-gnome-default-mail-client-check.xml: define the - message box that shows up on startup. - -2005-03-07 Jonathan Dieter <jdieter99@gmx.net> - - * default-mail-client-check.c: Plugin implementation. - - * org-gnome-default-mail-client-check.eplug.in: define the - default mail client check plugin. - - * Makefile.am: build the default mail client check plugin. - diff --git a/plugins/default-mailer/Makefile.am b/plugins/default-mailer/Makefile.am deleted file mode 100644 index b4132fd8eb..0000000000 --- a/plugins/default-mailer/Makefile.am +++ /dev/null @@ -1,66 +0,0 @@ -@EVO_PLUGIN_RULE@ - -error_DATA = org-gnome-default-mailer.error -errordir = $(privdatadir)/errors - -plugin_DATA = org-gnome-default-mailer.eplug - -plugin_LTLIBRARIES = liborg-gnome-default-mailer.la - -liborg_gnome_default_mailer_la_CPPFLAGS = \ - $(AM_CPPFLAGS) \ - -I$(top_srcdir) \ - -I$(top_srcdir)/widgets \ - $(GNOME_PLATFORM_CFLAGS) \ - $(EVOLUTION_MAIL_CFLAGS) - -liborg_gnome_default_mailer_la_SOURCES = default-mailer.c -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) \ - $(GNOME_PLATFORM_LIBS) - -schemadir = $(GCONF_SCHEMA_FILE_DIR) -schema_in_files = apps-evolution-mail-prompts-checkdefault.schemas.in -schema_DATA = $(schema_in_files:.schemas.in=.schemas) - -@INTLTOOL_SCHEMAS_RULE@ - -if GCONF_SCHEMAS_INSTALL - -if OS_WIN32 -install-data-local: - 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 - -endif - -EXTRA_DIST = \ - org-gnome-default-mailer.eplug.xml \ - org-gnome-default-mailer.error.xml \ - $(schema_in_files) - -BUILT_SOURCES = org-gnome-default-mailer.eplug \ - org-gnome-default-mailer.error - -CLEANFILES = $(BUILT_SOURCES) - -DISTCLEANFILES = $(schema_DATA) - --include $(top_srcdir)/git.mk diff --git a/plugins/default-mailer/apps-evolution-mail-prompts-checkdefault.schemas.in b/plugins/default-mailer/apps-evolution-mail-prompts-checkdefault.schemas.in deleted file mode 100644 index cdcaf7892a..0000000000 --- a/plugins/default-mailer/apps-evolution-mail-prompts-checkdefault.schemas.in +++ /dev/null @@ -1,16 +0,0 @@ -<gconfschemafile> - <schemalist> - <schema> - <key>/schemas/apps/evolution/mail/prompts/checkdefault</key> - <applyto>/apps/evolution/mail/prompts/checkdefault</applyto> - <owner>evolution-mail</owner> - <type>bool</type> - <default>true</default> - <locale name="C"> - <short>Check whether Evolution is the default mailer</short> - <long>Every time Evolution starts, check whether or not it is the default mailer.</long> - </locale> - </schema> - </schemalist> -</gconfschemafile> - diff --git a/plugins/default-mailer/default-mailer.c b/plugins/default-mailer/default-mailer.c deleted file mode 100644 index 93c100631b..0000000000 --- a/plugins/default-mailer/default-mailer.c +++ /dev/null @@ -1,99 +0,0 @@ -/* - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) version 3. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> - * - * - * Authors: - * Jonathan Dieter <jdieter99@gmx.net> - * - * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) - * Copyright 2005 Jonathan Dieter - * - */ - -#include <stdlib.h> -#include <string.h> - -#include <gconf/gconf-client.h> - -#include <mail/em-utils.h> -#include <shell/es-event.h> - -#define GCONF_KEY_CHECKDEFAULT "/apps/evolution/mail/prompts/checkdefault" -#define GCONF_KEY_MAILTO_ENABLED "/desktop/gnome/url-handlers/mailto/enabled" -#define GCONF_KEY_MAILTO_COMMAND "/desktop/gnome/url-handlers/mailto/command" -#define EVOLUTION_MAILTO_COMMAND "evolution --component=mail %s" - -void org_gnome_default_mailer_check_default (EPlugin *ep, ESEventTargetUpgrade *target); - -static gboolean -evolution_is_default_mailer (const gchar *mailto_command) -{ - gint argc; - gchar **argv; - gchar *basename; - gboolean is_default; - - if (mailto_command == NULL) - return FALSE; - - /* tokenize the mailto command */ - if (!g_shell_parse_argv (mailto_command, &argc, &argv, NULL)) - return FALSE; - - g_assert (argc > 0); - - /* check the basename of the first token */ - basename = g_path_get_basename (argv[0]); - is_default = g_str_has_prefix (basename, "evolution"); - g_free (basename); - - g_strfreev (argv); - - return is_default; -} - -void -org_gnome_default_mailer_check_default (EPlugin *ep, ESEventTargetUpgrade *target) -{ - GConfClient *client; - gchar *mailer; - GConfValue *is_key; - - client = gconf_client_get_default (); - - /* See whether the check default mailer key has already been set */ - is_key = gconf_client_get(client, GCONF_KEY_CHECKDEFAULT, NULL); - if (!is_key) - gconf_client_set_bool(client, GCONF_KEY_CHECKDEFAULT, TRUE, NULL); - else - gconf_value_free (is_key); - - /* Check whether we're supposed to check whether or not we are the default mailer */ - if (gconf_client_get_bool(client, GCONF_KEY_CHECKDEFAULT, NULL)) { - mailer = gconf_client_get_string(client, GCONF_KEY_MAILTO_COMMAND, NULL); - - /* Check whether we are the default mailer */ - if (!evolution_is_default_mailer (mailer)) { - /* Ask whether we should be the default mailer */ - if (em_utils_prompt_user(NULL, GCONF_KEY_CHECKDEFAULT, "org.gnome.default.mailer:check-default", NULL)) { - gconf_client_set_bool(client, GCONF_KEY_MAILTO_ENABLED, TRUE, NULL); - gconf_client_set_string(client, GCONF_KEY_MAILTO_COMMAND, EVOLUTION_MAILTO_COMMAND, NULL); - } - } - - g_free(mailer); - } - - g_object_unref (client); -} diff --git a/plugins/default-mailer/org-gnome-default-mailer.eplug.xml b/plugins/default-mailer/org-gnome-default-mailer.eplug.xml deleted file mode 100644 index 44c5febedf..0000000000 --- a/plugins/default-mailer/org-gnome-default-mailer.eplug.xml +++ /dev/null @@ -1,20 +0,0 @@ -<?xml version="1.0"?> -<e-plugin-list> - <e-plugin - id="org.gnome.evolution.default.mailer" - type="shlib" - _name="Default Mail Client" - location="@PLUGINDIR@/liborg-gnome-default-mailer@SOEXT@"> - - <_description>Check whether Evolution is the default mail client on startup.</_description> - <author name="Jonathan Dieter" email="jdieter99@gmx.net"/> - - <hook class="org.gnome.evolution.shell.events:1.0"> - <event - id="upgrade.done" - handle="org_gnome_default_mailer_check_default" - target="upgrade" - /> - </hook> - </e-plugin> -</e-plugin-list> diff --git a/plugins/default-mailer/org-gnome-default-mailer.error.xml b/plugins/default-mailer/org-gnome-default-mailer.error.xml deleted file mode 100644 index 03e2e8262d..0000000000 --- a/plugins/default-mailer/org-gnome-default-mailer.error.xml +++ /dev/null @@ -1,10 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<error-list domain="org.gnome.default.mailer"> - - <error id="check-default" type="question" default="GTK_RESPONSE_YES"> - <_secondary>Do you want to make Evolution your default e-mail client?</_secondary> - <button stock="gtk-yes" response="GTK_RESPONSE_YES"/> - <button stock="gtk-no" response="GTK_RESPONSE_NO"/> - </error> - -</error-list> diff --git a/plugins/default-source/ChangeLog b/plugins/default-source/ChangeLog deleted file mode 100644 index cb0075e36b..0000000000 --- a/plugins/default-source/ChangeLog +++ /dev/null @@ -1,80 +0,0 @@ -2008-09-04 Sankar P <psankar@novell.com> - -License Changes - - * default-source.c: - -2008-08-27 Philip Withnall <philip@tecnocode.co.uk> - - ** Fix for bug #534762 - - * org-gnome-default-source.eplug.xml: Change "addressbook" to - "address book" in translatable strings. - -2008-04-21 Milan Crha <mcrha@redhat.com> - - ** Fix for bug #448863 - - * default-source.c: (org_gnome_default_book), - (get_calendar_option_caption), (org_gnome_default_cal): - Use better description of the option based on source type. - -2007-09-10 Milan Crha <mcrha@redhat.com> - - ** Fix for bug #330223 - - * default-source.c: (commit_default_calendar): - Added type E_CAL_SOURCE_TYPE_JOURNAL to other types. - -2007-03-20 Matthew Barnes <mbarnes@redhat.com> - - ** Fixes part of bug #419524 - - * Include <glib/gi18n.h> instead of <libgnome/gnome-i18n.h>. - -2006-10-21 Priit Laes <amd@store20.com> - - * org-gnome-default-source.eplug.xml: Fix typo. Fixes #363999. - -2006-02-11 Andre Klapper <a9016009@gmx.de> - - * default-source.c: adding mnemonic. Fixes bug 328151. - -2005-12-25 Funda Wang <fundawang@linux.net.cn> - - * Makefile.am: Mark this plugin as translatable (bug#301149). - -2005-12-12 Harish Krishnaswamy <kharish@novell.com> - - * Makefile.am: Fix make-clean issues. - -2005-12-07 Funda Wang <fundawang@linux.net.cn> - - * org-gnome-default-source.eplug.in: i18nlized. - -2005-08-23 Not Zed <NotZed@Ximian.com> - - * default-source.c: forward declare exported func. - -2005-08-10 Tor Lillqvist <tml@novell.com> - - * org-gnome-default-source.eplug.in: Use SOEXT. - -2005-06-27 Tor Lillqvist <tml@novell.com> - - * Makefile.am: There is no EVOLUTION_CFLAGS. Use - NO_UNDEFINED. Link with EVOLUTION_CALENDAR_LIBS and - EVOLUTION_ADDRESSBOOK_LIBS. - -2005-05-06 Chenthill Palanisamy <pchenthill@novell.com> - - * default-source.c: (org_gnome_default_book): Removed the extra - space in "Mark as default folder". - -2005-02-24 Björn Torkelsson <torkel@acc.umu.se> - - * org-gnome-default-source.eplug.in: Added author and description. - -2005-01-21 Sivaiah Nallagatla <snallagatla@novell.com> - - * initil commit diff --git a/plugins/default-source/default-source.c b/plugins/default-source/default-source.c index db8423aec6..a938239808 100644 --- a/plugins/default-source/default-source.c +++ b/plugins/default-source/default-source.c @@ -37,6 +37,14 @@ GtkWidget *org_gnome_autocomplete_book (EPlugin *epl, EConfigHookItemFactoryData void commit_default_calendar (EPlugin *epl, EConfigTarget *target); void commit_default_book (EPlugin *epl, EConfigTarget *target); +gint e_plugin_lib_enable (EPlugin *ep, gint enable); + +gint +e_plugin_lib_enable (EPlugin *ep, gint enable) +{ + return 0; +} + void commit_default_calendar (EPlugin *epl, EConfigTarget *target) { diff --git a/plugins/email-custom-header/ChangeLog b/plugins/email-custom-header/ChangeLog deleted file mode 100644 index f826eddd86..0000000000 --- a/plugins/email-custom-header/ChangeLog +++ /dev/null @@ -1,127 +0,0 @@ -2009-02-25 Milan Crha <mcrha@redhat.com> - - ** Fix for bug #572399 - - * email-custom-header.c: (header_foreach_check_isempty): - Do not read from invalid iterator after call of row changed. - -2009-02-13 Milan Crha <mcrha@redhat.com> - - ** Fixes part of bug #564229 - - * email-custom-header.c: (e_plugin_lib_get_configure_widget): - Do not use uninitialized variable. - -2009-02-02 Takao Fujiwara <takao.fujiwara@sun.com> - - Reviewed by Srinivasa Ragavan <sragavan@novell.com> - - ** Fix for bug #567568 - - * apps_evolution_email_custom_header.schemas.in: - Remove translatable <default> tag. - * email-custom-header.c (epech_setup_widgets): - Added gettext for the default custom header. - -2009-01-09 Takao Fujiwara <takao.fujiwara@sun.com> - - Reviewed by Matthew Barnes <mbarnes@redhat.com> - - ** Fix for bug #567129 - - * apps_evolution_email_custom_header.schemas.in: - Add <default> tag in C locale to localize the value. - * email-custom-header.c (epech_setup_widgets): - Add gettext. - -2008-09-12 Sankar P <psankar@novell.com> - -License Changes - - * email-custom-header.c: - * email-custom-header.h: - -2008-09-01 Matthew Barnes <mbarnes@redhat.com> - - * email-custom-header.c: - Don't mix declarations and code. - -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 - - * apps_evolution_email_custom_header.schemas.in: Fix typo. - -2008-07-22 Milan Crha <mcrha@redhat.com> - - ** Part of fix for bug #544022 - - * email-custom-header.c: Compiler warning cleanup. - -2008-06-25 Ashish Shrivastava <shashish@novell.com> - * email-custom-header.glade: Marked strings for - translation. - remove "window1" string from translation. - -2008-06-24 Ashish Shrivastava <shashish@novell.com> - - * email-custom-header.c: (e_plugin_lib_get_configure_widget), - (org_gnome_email_custom_header_config_option): - Added Support for configuring gconf values. - * email-custom-header.glade: - Configure email-custom-header plugin within the plugin-manager. - * org-gnome-email-custom-header.eplug.xml: Add hook class - for Configure tab. - * Makefile.am: Add new file.(email-custom-header.glade). - -2008-06-02 Matthew Barnes <mbarnes@redhat.com> - - * Makefile.am: - Distribute the Glade file. - -2008-06-02 Ashish Shrivastava <shashish@novell.com> - - ** Fixes bug #536183 - - * email-custom-header.c: - * org-gnome-email-custom-header.glade: - Change email custom header's dialog to non-modal. - Remove un-used tab from dialog - -2008-05-22 Matthew Barnes <mbarnes@redhat.com> - - * email-custom-header.c (action_email_custom_header_cb): - Remove unused 'editor' variable. - -2008-05-22 Matthew Barnes <mbarnes@redhat.com> - - ** Fixes part of bug #534360 - - * email-custom-header.h: - Migrate from deprecated GtkObject symbols to GObject equivalents. - -2008-05-19 Ashish Shrivastava <shashish@novell.com> - - * org-gnome-email-custom-header.eplug.xml: - * org-gnome-email-custom-header.glade: - * apps_evolution_email_custom_header.schemas.in: - * Makefile.am: - * email-custom-header.c: - * email-custom-header.h: - ** Initial set of files. Implements Custom header support. - ** Added custom header plugin. diff --git a/plugins/email-custom-header/email-custom-header.c b/plugins/email-custom-header/email-custom-header.c index 84452b28a9..6b94c721f3 100644 --- a/plugins/email-custom-header/email-custom-header.c +++ b/plugins/email-custom-header/email-custom-header.c @@ -534,8 +534,9 @@ destroy_compo_data (gpointer data) static void action_email_custom_header_cb (GtkAction *action, EMsgComposer *composer) { - GtkUIManager *ui_manager; - GtkWidget *menuitem; + GtkUIManager *ui_manager; + GtkWidget *menuitem; + GdkWindow *window; CustomHeaderOptionsDialog *dialog = NULL; EmailCustomHeaderWindow *new_email_custom_header_window = NULL; @@ -544,14 +545,15 @@ static void action_email_custom_header_cb (GtkAction *action, EMsgComposer *comp new_email_custom_header_window = g_object_get_data ((GObject *) composer, "compowindow"); - if (epech_check_existing_composer_window(new_email_custom_header_window,menuitem->window) == 0) { + window = gtk_widget_get_window (menuitem); + if (epech_check_existing_composer_window(new_email_custom_header_window,window) == 0) { dialog = new_email_custom_header_window->epech_dialog; } else { dialog = epech_dialog_new (); if (dialog) { EmailCustomHeaderWindow *new_email_custom_header_window; new_email_custom_header_window = g_new0(EmailCustomHeaderWindow, 1); - new_email_custom_header_window->epech_window = menuitem->window; + new_email_custom_header_window->epech_window = window; new_email_custom_header_window->epech_dialog = dialog; g_object_set_data_full ((GObject *) composer, "compowindow", new_email_custom_header_window, destroy_compo_data); } @@ -924,17 +926,17 @@ e_plugin_lib_get_configure_widget (EPlugin *epl) header_add = gtk_button_new_from_stock ("gtk-add"); gtk_widget_show (header_add); gtk_container_add (GTK_CONTAINER (vbuttonbox1), header_add); - GTK_WIDGET_SET_FLAGS (header_add, GTK_CAN_DEFAULT); + gtk_widget_set_can_default (header_add, TRUE); header_edit = gtk_button_new_from_stock ("gtk-edit"); gtk_widget_show (header_edit); gtk_container_add (GTK_CONTAINER (vbuttonbox1), header_edit); - GTK_WIDGET_SET_FLAGS (header_edit, GTK_CAN_DEFAULT); + gtk_widget_set_can_default (header_edit, TRUE); header_remove = gtk_button_new_from_stock ("gtk-remove"); gtk_widget_show (header_remove); gtk_container_add (GTK_CONTAINER (vbuttonbox1), header_remove); - GTK_WIDGET_SET_FLAGS (header_remove, GTK_CAN_DEFAULT); + gtk_widget_set_can_default (header_remove, TRUE); cd->gconf = gconf_client_get_default (); diff --git a/plugins/external-editor/ChangeLog b/plugins/external-editor/ChangeLog deleted file mode 100644 index 55ead0195b..0000000000 --- a/plugins/external-editor/ChangeLog +++ /dev/null @@ -1,101 +0,0 @@ -2009-04-28 Holger Macht <holger@homac.de> - - ** Fix for bug #567145 - - External Editor rewrite. - * composer/evolution-composer.ui: - * plugins/external-editor/Makefile.am: - * plugins/external-editor/apps-evolution-external-editor.schemas.in - : - * plugins/external-editor/external-editor.c: - * plugins/external-editor/org-gnome-external-editor.eplug.xml: - * plugins/external-editor/org-gnome-external-editor.error.xml: - -2009-04-27 Milan Crha <mcrha@redhat.com> - - ** Fix for bug #561188 - - * external-editor.c: (show_error), (read_file), - (async_external_editor), (show_composer_dialog): - Do more things in main thread. - * Makefile.am: - * org-gnome-external-editor-errors.xml: Renamed to: - * org-gnome-external-editor.error.xml: Create .error file properly. - -2009-01-28 Tor Lillqvist <tml@novell.com> - - Windows port by Fridrich Strba. - - * Makefile.am: Use -no-undefined and link with more libraries on - Windows. - - * external-editor.c: Check HAVE_SYS_WAIT_H. - -2008-08-27 Sankar P <psankar@novell.com> - -License Changes - - * external-editor.c: - -2008-08-01 Matthew Barnes <mbarnes@redhat.com> - - ** Fixes bug #517151 - - * org-gnome-external-editor.xml: - Give a mnemonic to "Composer in External Editor". - -2008-04-17 Sankar P <psankar@novell.com> - - * Makefile.am: - Added new files deleted files not needed. - - * external-editor.c: (convert_to_camel_internet_address), - (ee_editor_command_changed), (e_plugin_lib_get_configure_widget), - (async_external_editor), (show_composer_dialog), - (org_gnome_external_editor): - Leak fixes, Temporary files, Bug fixes and so on. - - * org-gnome-external-editor-errors.xml: - Modified error file for staying aligned with other plugins - - * apps-evolution-external-editor.schemas.in: - Added new file for default schema - - * org-gnome-external-editor.error.xml: - Removed in favor of the other errors file. - - ** Fix for bug #517168 - -2008-02-18 Milan Crha <mcrha@redhat.com> - - ** Part of fix for bug #515744 - - * external-editor.c: (convert_to_camel_internet_address), - (org_gnome_external_editor): Memory leak fix. - -2007-12-04 Sankar P <psankar@novell.com> - - * Committed on behalf of Denis Washington <denisw@svn.gnome.org> - - ** Fix for bug #496298 - * org-gnome-external-editor.eplug.xml: - * org-gnome-external-editor.xml: - Change mails to messages. - -2007-10-25 Sankar P <psankar@novell.com> - - * Makefile.am: - * org-gnome-external-editor.eplug.xml: - * org-gnome-external-editor.xml: - * org-gnome-external-editor.error.xml: - * external-editor.c: - - - Initial files for the plugin. - - - This plugin allows you to use an external editor - as the composer. - - - I've tested this gvim and it works fine. - - - Needs a lot of more work before this - moves out of experimental state. diff --git a/plugins/external-editor/external-editor.c b/plugins/external-editor/external-editor.c index 60d37800f4..11db7db3a2 100644 --- a/plugins/external-editor/external-editor.c +++ b/plugins/external-editor/external-editor.c @@ -31,7 +31,6 @@ #include <mail/mail-config.h> #include <e-util/e-alert-dialog.h> #include <e-msg-composer.h> -#include <camel/camel-mime-filter-tohtml.h> #include <glib/gi18n-lib.h> #include <glib-object.h> @@ -65,6 +64,14 @@ static gboolean key_press_cb(GtkWidget * widget, GdkEventKey * event, EMsgCompos /* used to track when the external editor is active */ static GThread *editor_thread; +gint e_plugin_lib_enable (EPlugin *ep, gint enable); + +gint +e_plugin_lib_enable (EPlugin *ep, gint enable) +{ + return 0; +} + void ee_editor_command_changed (GtkWidget *textbox) { diff --git a/plugins/face/ChangeLog b/plugins/face/ChangeLog deleted file mode 100644 index 7737ac777e..0000000000 --- a/plugins/face/ChangeLog +++ /dev/null @@ -1,77 +0,0 @@ -2009-04-27 Milan Crha <mcrha@redhat.com> - - ** Part of fix for bug #561188 - - * Makefile.am: - * org-gnome-face.errors.xml: Renamed to: - * org-gnome-face.error.xml: Create .error file properly. - -2008-08-27 Sankar P <psankar@novell.com> - -License Changes - - * face.c: - -2008-05-08 Matthew Barnes <mbarnes@redhat.com> - - ** Fixes part of bug #525241 (EPluginUI) - - * Makefile.am: - * org-gnome-face-ui.xml: - Remove org-gnome-face-ui.xml (obsolete). - - * face.c (e_plugin_ui_init): - Initialization callback for EPluginUI. Adds a "face" action to - the EMsgComposer instance's "composer" action group. - - * org-gnome-face.eplug.xml: - Replace the "bonobomenu" hook definition with a new one for - EPluginUI. Include the UI definition inline. - -2008-03-11 Matthew Barnes <mbarnes@redhat.com> - - ** Fixes part of bug #513951 - - * face.c (org_gnome_composer_face): - Use e_get_user_data_dir() instead of constructing the full path. - -2007-10-09 Matthew Barnes <mbarnes@redhat.com> - - ** Fixes part of bug #437579 - - * face.c: - Fix various compiler warnings. Patch from Milan Crha. - -2007-09-27 Matthew Barnes <mbarnes@redhat.com> - - * org-gnome-face-eplug.xml: - Use consistent terminology for mail messages (#480621). - -2007-09-27 Matthew Barnes <mbarnes@redhat.com> - - ** Fixes part of bug #474000 - - * face.c: - Use GLib's Base64 API instead of Camel's. - -2007-09-14 Matthew Barnes <mbarnes@redhat.com> - - ** Fixes part of bug #476231 - - * face.c: - Remove non-USE_GTKFILECHOOSER code. - GtkFileChooser has been around since 2004. - -2007-07-18 Sankar P <psankar@novell.com> - - * face.c: (org_gnome_composer_face): - Remove unused variables. - -2007-07-17 Sankar P <psankar@novell.com> - - * org-gnome-face.eplug.xml: - * org-gnome-face-ui.xml: - * org-gnome-face.errors.xml: - * Makefile.am: - * face.c: - Initial set of files. Implements Face header support. diff --git a/plugins/face/face.c b/plugins/face/face.c index 478f7888c6..468b9273c9 100644 --- a/plugins/face/face.c +++ b/plugins/face/face.c @@ -397,12 +397,19 @@ action_toggle_face_cb (GtkToggleAction *action, EMsgComposer *composer) /* ----------------------------------------------------------------- */ +gint e_plugin_lib_enable (EPlugin *ep, gint enable); gboolean e_plugin_ui_init (GtkUIManager *ui_manager, EMsgComposer *composer); GtkWidget *e_plugin_lib_get_configure_widget (EPlugin *epl); void face_handle_send (EPlugin *ep, EMEventTargetComposer *target); /* ----------------------------------------------------------------- */ +gint +e_plugin_lib_enable (EPlugin *ep, gint enable) +{ + return 0; +} + gboolean e_plugin_ui_init (GtkUIManager *ui_manager, EMsgComposer *composer) diff --git a/plugins/google-account-setup/ChangeLog b/plugins/google-account-setup/ChangeLog deleted file mode 100644 index 43513257b7..0000000000 --- a/plugins/google-account-setup/ChangeLog +++ /dev/null @@ -1,170 +0,0 @@ -2009-04-24 Milan Crha <mcrha@redhat.com> - - ** Part of fix for bug #569652 - - * google-contacts-source.h: (manage_google_group): - * google-contacts-source.c: (manage_google_group): - Removed. - - * google-contacts-source.c: (ensure_google_contacts_source_group), - (remove_google_contacts_source_group): - * google-source.c: (ensure_google_source_group): - Use new ESourceList API (simplifies code). - -2009-04-24 Milan Crha <mcrha@redhat.com> - - ** Fix for bug #572348 - - * google-source.c: Remove deprecated Gtk+ symbols. - -2009-04-09 Milan Crha <mcrha@redhat.com> - - ** Fix for bug #574248 - - * google-contacts-source.c: (plugin_google_contacts): - * google-source.c: (plugin_google): - Compare base URI case insensitively. - -2009-04-07 Tobias Mueller <tobiasmue@gnome.org> - - ** Fixes bug #578034 - - * google-source.c (claim_error): - Call gtk_message_dialog_new with a proper format string. - -2009-02-26 Matthew Barnes <mbarnes@redhat.com> - - ** Fixes part of bug #572950 - - * Makefile.am: - Fix ordering of -I compiler directives. Patch by Daniel Macks. - -2009-02-25 Milan Crha <mcrha@redhat.com> - - ** Part of fix for bug #559719 - - * google-contacts-source.c: (struct ui_data), (destroy_ui_data), - (plugin_google_contacts): Use it's own/unique name for the property - on the 'epl' and free the widget only if it wasn't freed yet. - -2009-01-29 Milan Crha <mcrha@redhat.com> - - ** Fix for bug #539467 - - * google-contacts-source.h: (manage_google_group): - * google-contacts-source.c: (manage_google_group), - (ensure_google_contacts_source_group), - (remove_google_contacts_source_group): - * google-source.c: (ensure_google_source_group): - Find group by its base uri, not by a localized name. - -2008-11-07 Matthew Barnes <mbarnes@redhat.com> - - ** Fix for bug #559518 - - * google-source.c: (retrieve_list_clicked), - (retrieve_list_sensitize), (plugin_google): Desensitizes the button - when the username field is blank. - -2008-11-06 Bharath Acharya <abharath@novell.com> - - ** Fix for bug #557726 - - * google-contacts-source.c: (destroy_ui_data), - (plugin_google_contacts): Destroy the widgets created by this group. - -2008-09-24 Philip Withnall <philip@tecnocode.co.uk> - - ** Fixes bug #553479 - - * org-gnome-evolution-google.eplug.xml: String capitalisation - improvements. - -2008-08-27 Sankar P <psankar@novell.com> - -License Changes - - * google-source.c: - -2008-08-20 Milan Crha <mcrha@redhat.com> - - ** Fix for bug #525555 - - * google-source.c: (print_uri_noproto): Removed. - * google-source.c: (user_changed): Do not leak. - * google-source.c: (plugin_google): Get username from source, not URL. - -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 - - * google-source.c: (sanitize_user_mail), (construct_default_uri), - (is_default_uri), (init_combo_values), (user_changed), - (cal_combo_changed), (claim_error), (retrieve_list_clicked), - (plugin_google): New widgets and functionality to retrieve list - of subscribed calendars from the Google account and let user choose - which one would be shown. - -2008-08-01 Matthew Barnes <mbarnes@redhat.com> - - ** Fixes bug #544860 - - * google-contacts-source.c (plugin_google_contacts): - Add translator comments for split "update every" sentence. - -2008-07-31 Matthew Barnes <mbarnes@redhat.com> - - ** Fixes part of bug #545568 - - * org-gnome-evolution-google.eplug.xml: - Add "system_plugin=true" so it's not shown in the Plugin Manager. - This plugin is not designed to be disabled by the user. - -2008-05-24 Jörgen Scheibengruber <mfcn@gmx.de> - - * Makefile.am: - * google-contacts-source.c (ensure_google_contacts_source_group), - (remove_google_contacts_source_group), (on_username_entry_changed), - (on_update_cb_toggled), (on_interval_sb_value_changed), - (plugin_google_contacts): - * google-contacts-source.h: - * google-source.c (e_plugin_lib_enable): - * org-gnome-evolution-google.eplug.xml: - Added a UI for the addressbook part - -2008-03-31 Suman Manjunath <msuman@novell.com> - - ** Fix for bug #346555 - - * google-source.c: (plugin_google): - Fixed a mnemonic conflict. - -2008-01-25 Tor Lillqvist <tml@novell.com> - - * Makefile.am (liborg_gnome_evolution_google_la_LIBADD): Fix typo: - s/EVOLUTION_CALENDAR_LIB1S/EVOLUTION_CALENDAR_LIBS/. - -2007-12-23 Nyall Dawson <nyall@zombiepigs.net> - - ** Fix for bug #503954 - - * google-source.c: (is_email), (user_changed): Accept custom domain - names while setting up account. - -2007-10-30 Sankar P <psankar@novell.com> - - * ChangeLog: - Every plugin should have a ChangeLog. Added. - - * google-source.c: - Commented an unused function. - Marked Debug statements conditional. diff --git a/plugins/google-account-setup/Makefile.am b/plugins/google-account-setup/Makefile.am index 07f41510e4..ed3ab93d5d 100644 --- a/plugins/google-account-setup/Makefile.am +++ b/plugins/google-account-setup/Makefile.am @@ -12,7 +12,8 @@ liborg_gnome_evolution_google_la_CPPFLAGS = \ -DCALDAV_UIDIR=\""$(uidir)"\" \ $(GNOME_PLATFORM_CFLAGS) \ $(EVOLUTION_CALENDAR_CFLAGS) \ - $(EVOLUTION_ADDRESSBOOK_CFLAGS) + $(EVOLUTION_ADDRESSBOOK_CFLAGS) \ + $(GDATA_CFLAGS) liborg_gnome_evolution_google_la_SOURCES = \ google-source.c \ @@ -24,7 +25,8 @@ liborg_gnome_evolution_google_la_LIBADD = \ $(top_builddir)/e-util/libeutil.la \ $(EVOLUTION_CALENDAR_LIBS) \ $(EPLUGIN_LIBS) \ - $(GNOME_PLATFORM_LIBS) + $(GNOME_PLATFORM_LIBS) \ + $(GDATA_LIBS) liborg_gnome_evolution_google_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED) diff --git a/plugins/google-account-setup/google-contacts-source.c b/plugins/google-account-setup/google-contacts-source.c index d7554ebe10..289a939dec 100644 --- a/plugins/google-account-setup/google-contacts-source.c +++ b/plugins/google-account-setup/google-contacts-source.c @@ -231,6 +231,7 @@ plugin_google_contacts (EPlugin *epl, const gchar *refresh_interval_str; guint refresh_interval; const gchar *use_ssl_str; + gchar *buff; gboolean use_ssl; GtkWidget *parent; GtkWidget *vbox; @@ -270,7 +271,9 @@ plugin_google_contacts (EPlugin *epl, gtk_box_pack_start (GTK_BOX (vbox), vbox2, FALSE, FALSE, 0); section = gtk_label_new (NULL); - gtk_label_set_markup (GTK_LABEL (section), _("<b>Server</b>")); + buff = g_strconcat ("<b>", _("Server"), "</b>", NULL); + gtk_label_set_markup (GTK_LABEL (section), buff); + g_free (buff); gtk_misc_set_alignment (GTK_MISC (section), 0.0, 0.0); gtk_box_pack_start (GTK_BOX (vbox2), section, FALSE, FALSE, 0); diff --git a/plugins/google-account-setup/google-source.c b/plugins/google-account-setup/google-source.c index 26b80f0ec8..2f6dfdc12e 100644 --- a/plugins/google-account-setup/google-source.c +++ b/plugins/google-account-setup/google-source.c @@ -16,6 +16,7 @@ * * Authors: * Ebby Wiselyn <ebbywiselyn@gmail.com> + * Philip Withnall <philip@tecnocode.co.uk> * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) * @@ -46,9 +47,7 @@ #include <libedataserverui/e-cell-renderer-color.h> #include <libedataserverui/e-passwords.h> -#include <google/libgdata/gdata-service-iface.h> -#include <google/libgdata/gdata-feed.h> -#include <google/libgdata-google/gdata-google-service.h> +#include <gdata/gdata.h> #include "google-contacts-source.h" @@ -408,7 +407,7 @@ update_proxy_settings (GDataService *service, const gchar *uri) proxy_uri = e_proxy_peek_uri_for (proxy, uri); } - gdata_service_set_proxy (service, proxy_uri); + gdata_service_set_proxy_uri (service, proxy_uri); g_object_unref (proxy); } @@ -416,11 +415,10 @@ static void retrieve_list_clicked (GtkButton *button, GtkComboBox *combo) { ESource *source; - GDataGoogleService *service; + GDataCalendarService *service; GDataFeed *feed; gchar *user, *password, *tmp; - const gchar *username, *ssl; - gchar *get_subscribed_url; + const gchar *username; GError *error = NULL; GtkWindow *parent; @@ -447,20 +445,26 @@ retrieve_list_clicked (GtkButton *button, GtkComboBox *combo) return; } - service = gdata_google_service_new ("cl", "evolution-client-0.0.1"); - gdata_service_set_credentials (GDATA_SERVICE (service), user, password); + service = gdata_calendar_service_new ("evolution-client-0.1.0"); + if (!gdata_service_authenticate (GDATA_SERVICE (service), user, password, NULL, &error)) { + /* Error! */ + claim_error (parent, error->message); + g_error_free (error); + g_free (password); + g_free (user); + g_object_unref (service); + return; + } + /* privacy... maybe... */ memset (password, 0, strlen (password)); g_free (password); - 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); - update_proxy_settings (GDATA_SERVICE (service), get_subscribed_url); - feed = gdata_service_get_feed (GDATA_SERVICE (service), get_subscribed_url, &error); - g_free (get_subscribed_url); + update_proxy_settings (GDATA_SERVICE (service), URL_GET_SUBSCRIBED_CALENDARS); + feed = gdata_calendar_service_query_all_calendars (service, NULL, NULL, NULL, NULL, &error); if (feed) { - GSList *l; + GList *l; gchar *old_selected = NULL; gint idx, active = -1, default_idx = -1; GtkListStore *store = GTK_LIST_STORE (gtk_combo_box_get_model (combo)); @@ -472,31 +476,27 @@ retrieve_list_clicked (GtkButton *button, GtkComboBox *combo) gtk_list_store_clear (store); for (l = gdata_feed_get_entries (feed), idx = 1; l != NULL; l = l->next) { - const gchar *uri, *title, *color, *access; - GSList *links; - GDataEntry *entry = (GDataEntry *) l->data; + const gchar *uri, *title, *access; + GDataLink *link; + GDataColor color; + GDataEntry *entry = GDATA_ENTRY (l->data); if (!entry || !GDATA_IS_ENTRY (entry)) continue; /* skip hidden entries */ - if (gdata_entry_get_custom (entry, "hidden") && g_ascii_strcasecmp (gdata_entry_get_custom (entry, "hidden"), "true") == 0) + if (gdata_calendar_calendar_is_hidden (GDATA_CALENDAR_CALENDAR (entry))) continue; - uri = NULL; - for (links = gdata_entry_get_links (entry); links && !uri; links = links->next) { - GDataEntryLink *link = (GDataEntryLink *)links->data; - - if (!link || !link->href || !link->rel) - continue; - - if (g_ascii_strcasecmp (link->rel, "alternate") == 0) - uri = link->href; - } + /* Find the alternate link; skip the entry if one doesn't exist */ + link = gdata_entry_look_up_link (entry, GDATA_LINK_ALTERNATE); + if (!link) + continue; + uri = gdata_link_get_uri (link); title = gdata_entry_get_title (entry); - color = gdata_entry_get_custom (entry, "color"); - access = gdata_entry_get_custom (entry, "accesslevel"); + gdata_calendar_calendar_get_color (GDATA_CALENDAR_CALENDAR (entry), &color); + access = gdata_calendar_calendar_get_access_level (GDATA_CALENDAR_CALENDAR (entry)); if (uri && title) { GdkColor gdkcolor; @@ -504,8 +504,11 @@ retrieve_list_clicked (GtkButton *button, GtkComboBox *combo) if (old_selected && g_str_equal (old_selected, uri)) active = idx; - if (color) - gdk_color_parse (color, &gdkcolor); + /* Convert the GDataColor to a GdkColor */ + gdkcolor.pixel = 0; + gdkcolor.red = color.red * 256; + gdkcolor.green = color.green * 256; + gdkcolor.blue = color.blue * 256; if (default_idx == -1 && is_default_uri (uri, user)) { /* have the default uri always NULL and first in the combo */ @@ -517,7 +520,7 @@ retrieve_list_clicked (GtkButton *button, GtkComboBox *combo) } gtk_list_store_set (store, &iter, - COL_COLOR, color ? &gdkcolor : NULL, + COL_COLOR, &gdkcolor, COL_TITLE, title, COL_URL_PATH, uri, COL_READ_ONLY, access && !g_str_equal (access, "owner") && !g_str_equal (access, "contributor"), @@ -583,7 +586,7 @@ plugin_google (EPlugin *epl, GtkWidget *combo; gchar *uri; const gchar *username; - gint row; + guint row; GtkCellRenderer *renderer; GtkListStore *store; @@ -626,7 +629,7 @@ plugin_google (EPlugin *epl, e_plugin_util_add_refresh (parent, _("Re_fresh:"), source, "refresh"); - row = GTK_TABLE (parent)->nrows; + g_object_get (parent, "n-rows", &row, NULL); label = gtk_label_new_with_mnemonic (_("Cal_endar:")); gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); @@ -663,7 +666,7 @@ plugin_google (EPlugin *epl, hbox = gtk_hbox_new (FALSE, 6); gtk_box_pack_start (GTK_BOX (hbox), combo, TRUE, TRUE, 0); - label = gtk_button_new_with_mnemonic (_("Retrieve _list")); + label = gtk_button_new_with_mnemonic (_("Retrieve _List")); g_signal_connect (label, "clicked", G_CALLBACK (retrieve_list_clicked), combo); g_signal_connect (user, "changed", G_CALLBACK (retrieve_list_sensitize), label); g_object_set_data (G_OBJECT (label), "ESource", source); diff --git a/plugins/groupwise-features/ChangeLog b/plugins/groupwise-features/ChangeLog deleted file mode 100644 index 085b62155c..0000000000 --- a/plugins/groupwise-features/ChangeLog +++ /dev/null @@ -1,1181 +0,0 @@ -2009-04-27 Milan Crha <mcrha@redhat.com> - - ** Part of fix for bug #561188 - - * Makefile.am: - * org-gnome-proxy-login-errors.xml: Renamed to: - * org-gnome-proxy-login.error.xml: - * org-gnome-mail-retract-errors.xml: Renamed to: - * org-gnome-mail-retract.error.xml: - * org-gnome-shared-folder.errors.xml: Renamed to: - * org-gnome-shared-folder.error.xml: - * org-gnome-proxy-errors.xml: Renamed to: - * org-gnome-proxy.error.xml: - Create .error files properly. - -2009-01-21 Suman Manjunath <msuman@novell.com> - - ** Fix for bug #541209 - - ** Adapt to the new APIs from upstream libical. Changes made include - using the "_r" counterpart for the following APIs: - + icalproperty_as_ical_string () - + icalvalue_as_ical_string () - + icalcomponent_as_ical_string () - + icalparameter_as_ical_string () - + icaldurationtype_as_ical_string () - + icalenum_reqstat_code () - + icallangbind_property_eval_string () - + icallangbind_quote_as_ical () - + icalmime_text_end_part () - + icalperiodtype_as_ical_string () - + icalproperty_enum_to_string () - + icalproperty_get_parameter_as_string () - + icalproperty_get_value_as_string () - + icalproperty_get_property_name () - + icalrecurrencetype_as_string () - + icaltime_as_ical_string () - + icalreqstattype_as_string () - + icalvalue_binary_as_ical_string () - + icalvalue_int_as_ical_string () - + icalvalue_utcoffset_as_ical_string () - + icalvalue_string_as_ical_string () - + icalvalue_recur_as_ical_string () - + icalvalue_text_as_ical_string () - + icalvalue_attach_as_ical_string () - + icalvalue_duration_as_ical_string () - + icalvalue_date_as_ical_string () - + icalvalue_datetime_as_ical_string () - + icalvalue_float_as_ical_string () - + icalvalue_geo_as_ical_string () - + icalvalue_datetimeperiod_as_ical_string () - + icalvalue_period_as_ical_string () - + icalvalue_trigger_as_ical_string () - + icalvalue_as_ical_string () - - * send-options.c (put_options_in_source): - -2009-01-14 Matthew Barnes <mbarnes@redhat.com> - - ** Fixes bug #567744 - - * proxy-login-dialog.glade: - * proxy-listing.glade: - Comment attribute in property tag should be plural. - e.g. <property comments="..."> - -2008-12-29 Bharath Acharya <abharath@novell.com> - - ** Fix for bug bnc #435694 - - * mail-retract.c: (org_gnome_retract_message): Since we now add a bar, - lets set the popup items right. - -2008-11-20 Bharath Acharya <abharath@novell.com> - - ** Fix for bug bnc #446286 - - * status-track.c: (track_status): Remove the header check as we do a - e_gw_connection_get_item for tracking the status. - -2008-11-04 Sankar P <psankar@novell.com> - - ** Fix for bug bnc #434968 - - * plugins/groupwise-features/proxy-login.c: - Show correct icon for the proxy login dialog - -2008-10-17 Matthew Barnes <mbarnes@redhat.com> - - * send-options.c (org_gnome_send-options): - Don't mix declarations and statements. - -2008-10-03 Sankar P <psankar@novell.com> - -License Changes - - * proxy-login.c: - -2008-10-01 Gabor Kelemen <kelemeng@gnome.hu> - - * send-options.c: Mark two forgotten strings for translation. Fixes bug #553070 - -2008-10-01 Gabor Kelemen <kelemeng@gnome.hu> - - * org-gnome-proxy-errors.xml: - * org-gnome-proxy-login-errors.xml: - * proxy.c: - * proxy-listing.glade: - * proxy-login-dialog.glade: - Add translator comment to the occurrences of the Proxy term. Fixes bug #554297 - -2008-10-01 Milan Crha <mcrha@redhat.com> - - ** Fix for bug #511947 - - * proxy-login.c: (proxy_login_get_cnc): - Pass in optional parent for password dialog. - * proxy-login.c: (proxy_soap_login), (proxy_login_update_tree), - (org_gnome_proxy_account_login): Adapt to the above change and check - for NULL values to prevent runtime warnings. - -2008-09-25 Philip Withnall <philip@tecnocode.co.uk> - - ** Fix for bug #553148 - - * org-gnome-compose-send-options.xml: - * org-gnome-groupwise-features.eplug.xml: Standardise "GroupWise" - usage in translatable strings. - -2008-09-24 Sankar P <psankar@novell.com> - -License Changes - - * proxy.c: - -2008-09-22 Philip Withnall <philip@tecnocode.co.uk> - - ** Fixes bug #552851 - - * org-gnome-shared-folder.errors.xml: - Add translator comments to the accept/decline strings, and improve - some other strings in the file. - -2008-09-19 Sankar P <psankar@novell.com> - -License Changes - - * install-shared.c: - * junk-settings.c: - * share-folder.c: - * status-track.c: - -2008-09-12 Sankar P <psankar@novell.com> - -License Changes - - * send-options.c: - -2008-09-02 Sankar P <psankar@novell.com> - -License Changes - - * addressbook-groupwise.c: - * junk-mail-settings.c: - * mail-retract.c: - -2008-08-27 Sankar P <psankar@novell.com> - -License Changes - - * junk-settings.h: - * mail-send-options.c: - * mail-send-options.h: - * process-meeting.c: - * proxy-login.h: - * proxy.h: - * share-folder-common.c: - * share-folder.h: - -2008-08-01 Matthew Barnes <mbarnes@redhat.com> - - ** Fixes bug #544861 - - * org-gnome-proxy-login-errors.xml: - Reword "invalid-user" error message. - -2008-07-28 Milan Crha <mcrha@redhat.com> - - ** Fix for bug #543756 - - * org-gnome-shared-folder.errors.xml: - * process-meeting.c: (process_meeting): - Make question better translatable. - -2008-06-20 Sankar P <psankar@novell.com> - - * mail-retract.c (retract_mail_settings): - Multiple open dialogs is an usability issue - and a potential HIG violation. - Thanks to Akhil for pointing out. - -2008-06-20 Sankar P <psankar@novell.com> - - * mail-retract.c (retract_mail_settings): - Check if cnc is valid before using it. - Fixes a crash. - -2008-06-19 Sankar P <psankar@novell.com> - - * mail-retract.c (retract_mail_settings): - Ask the user if he really wants to retract mails. - Re-arrange the menus a little for grouping related things. - -2008-05-22 Matthew Barnes <mbarnes@redhat.com> - - ** Fixes part of bug #534360 - - * proxy.h: - * proxy-login.h: - Migrate from deprecated GtkObject symbols to GObject equivalents. - -2008-04-25 Milan Crha <mcrha@redhat.com> - - ** Fix for bug #529855 - - * org-gnome-shared-folder.errors.xml: (recurrence): - Use proper label element name, these are localized by default. - -2008-04-02 Matthew Barnes <mbarnes@redhat.com> - - * mail-send-options.c (org_gnome_composer_send_options): - Adapt to streamlined EMsgComposer API. - -2008-03-27 Milan Crha <mcrha@redhat.com> - - ** Fix for bug #511957 - - * org-gnome-proxy-login-errors.xml: - * org-gnome-shared-folder.errors.xml: - * org-gnome-proxy-errors.xml: - * org-gnome-mail-retract-errors.xml: - Mark messages for translation. - -2008-03-27 Milan Crha <mcrha@redhat.com> - - ** Fix for bug #511956 - - * share-folder.c: (notification_clicked): Mark text for translation. - * properties.glade: Make dialog nicer. - -2008-03-27 Milan Crha <mcrha@redhat.com> - - ** Fix for bug #511953 - - * share-folder.c: (notification_clicked): Create dialog properly. - -2008-03-27 Milan Crha <mcrha@redhat.com> - - ** Fix for bug #511950 - - * properties.glade: Do not force button/label sizes. - -2008-03-25 Sankar P <psankar@novell.com> - - * proxy.c: (org_gnome_proxy): - We are using some g_object_set on EAccount. - We should also avoid double-free later. So reffing. - -2008-03-18 Milan Crha <mcrha@redhat.com> - - ** Fix for bug #511952 - - * share-folder.c: (share_folder_construct): - * proxy.c: (proxy_add_account): Marking text for translation. - -2008-02-18 Milan Crha <mcrha@redhat.com> - - ** Part of fix for bug #515744 - - * send-options.c: (get_source): - * share-folder-common.c: (get_container_id): - * install-shared.c: (install_folder_response): - Memory leak fix. - -2008-01-28 Andre Klapper <a9016009@gmx.de> - - * proxy-add-dialog.glade: string "Read" needs gettext context, - translator comments. - -2008-01-24 Milan Crha <mcrha@redhat.com> - - ** Part of bug #511488 - - * share-folder-common.c: (users_dialog_response): The logic to check - if vfolder is running has been changed, so reflect it here too. - -2008-01-07 Milan Crha <mcrha@redhat.com> - - ** Fix for bug #300336 - - * share-folder-common.c: (users_dialog_response): - Ensure vfolder is running. - -2007-12-06 Alex Kloss <alexkloss@att.net> - - ** Fix for bug #347328 - - * properties.glade: - Fix mnemonic clash over 'c', add mnemonic for 'Name' entry - * share-folder.c: (share_folder_construct): - Connect name_selector_entry and its label - -2007-11-12 indu <indu_ait@yahoo.co.in> - - ** Fix for bug #458515 - * status-track.c: (recipient->undelivered_date): - string corrected - -2007-10-26 Kjartan Maraas <kmaraas@gnome.org> - - * junk-mail-settings.c: (junk_mail_settings), - (org_gnome_junk_settings): - * send-options.c: (send_options_finalize), (get_source): - * status-track.c: (track_status), (org_gnome_track_status): - Warning fixes: - - mixing code and declarations - - ANSIfication of function declaration - -2007-09-27 Matthew Barnes <mbarnes@redhat.com> - - ** Fixes part of bug #477045 - - * share-folder-common.c: - Use standard icon names where applicable. - -2007-08-17 Johnny Jacob <jjohnny@novell.com> - - ** Fix for bug #458715. - - * proxy.c : (proxy_page_changed_cb) : Do not include "<All User - Access>" in the list. And use g_malloc0. - -2007-08-16 Milan Crha <mcrha@redhat.com> - - ** Fix for bug #466548 - - * mail-send-options.c: (org_gnome_composer_send_options): - e_msg_composer_get_preferred_account can return NULL, so test for it. - -2007-08-13 Sankar P <psankar@novell.com> - - ** Fix for bug #330968 - - * proxy.c: (proxy_page_changed_cb): - Fixes a crash on account-editor. - Proxy Preferences Crash Fix. - -2007-08-10 Milan Crha <mcrha@redhat.com> - - ** Fix for bug #327977 - - * proxy.c: (proxy_get_cnc): Added parent_window parameter - and uses it in call of e_passwords_ask_password. - * proxy.c: (proxy_commit), (proxy_page_changed_cb): - Calls proxy_get_cnc, passing in parent window handle. - * send-options.c: (get_cnc): Added parent_window parameter - and uses it in call of e_passwords_ask_password. - * send-options.c: (e_sendoptions_clicked_cb): - Calls get_cnc, passing in parent window handle. - -2007-08-03 Hiroyuki Ikezoe <poincare@ikezoe.net> - - ** Fix for bug #462010 - - * proxy.c: (proxy_update_tree_view): - * proxy-login.c: (proxy_login_update_tree): Plugged memory leak. - -2007-07-29 Srinivasa Ragavan <sragavan@novell.com> - - ** Fix for bug #410287 from Lucky - - * status-track.c: (track_status): - -2007-05-11 Gilles Dartiguelongue <dartigug@esiee.fr> - - * mail-send-options.c: (org_gnome_composer_send_options): - Fixes typo and casts, fixes part of bug #437584 - -2007-04-19 Matthew Barnes <mbarnes@redhat.com> - - ** Fixes part of bug #429422 - - * status-track.c (track_status): - Use gtk_widget_set_size_request() instead of gtk_widget_set_usize(). - -2007-03-30 Sankar P <psankar@novell.com> - - * status-track.c: (format_date), (track_status): - Rewritten GroupWise Status Tracking - -2007-03-20 Matthew Barnes <mbarnes@redhat.com> - - ** Fixes part of bug #419524 - - * Include <glib/gi18n.h> instead of <libgnome/gnome-i18n.h>. - -2007-02-05 Sankar P <psankar@novell.com> - - * junk-settings.c: - Include missing header file - -2007-01-27 Nickolay V. Shmyrev <nshmyrev@yandex.ru> - * install-shared.c: (org_gnome_popup_wizard): - don't split sentences. Fixes bug #401288. - -2007-01-27 Nickolay V. Shmyrev <nshmyrev@yandex.ru> - - * install-shared.c: (org_gnome_popup_wizard): - * junk-settings.c: (junk_settings_construct): - * share-folder.c: (share_folder_construct): - * status-track.c: (track_status): - mark strings as translatable. See bug #399381 for details. - -2007-01-25 Kjartan Maraas <kmaraas@gnome.org> - - * send-options.c: (get_cnc): Fix a crash when setting up - a GroupWise account. Closes bug #330969. Patch from - Parthasarathi Susarla. - -2007-01-18 Raghavendran <raghavguru7@gmail.com> - - * org-gnome-groupwise-features.xml: - * mail-send-options.c : - Added code for implementing Send options via - a data hook . -2006-11-17 Harish Krishnaswamy <kharish@novell.com> - - * proxy-login.c: (proxy_login_get_cnc): Remove - an extraneous initialization that leaks a CamelUrl on - each invocation. - -2006-10-16 Chris Heath <chris@heathens.co.nz> - - * mail-send-options.c (org_gnome_compose_send_options): - Fix memory leak. Fixes bug #360815. - -2006-07-18 Andre Klapper <a9016009@gmx.de> - - * properties.glade: remove "*" from translation. Fixes bug #331147. - -2006-07-17 Sankar P <psankar@novell.com> - - * mail-retract.c: (retract_mail_settings) - Made the success message translatable and fixed a typo. - -2006-07-17 Sankar P <psankar@novell.com> - - * mail-send-options.c: (feed_input_data) - * mail-send-options.h: - Added support for X_SEND_OPT_SECURITY - -2006-07-17 Sankar P <psankar@novell.com> - - * Added support for GroupWise Message Retract - * Files added: mail-retract.c, org-gnome-mail-retract-errors.xml - * Files modified: org-gnome-groupwise-features.eplug.xml, Makefile.am - -2006-06-29 Andre Klapper <a9016009@gmx.de> - - * proxy-login.c: add translator comments to the string "Proxy - login". Fixes bug #345055. - -2006-06-12 Sankar P <psankar@novell.com> - - * proxy-login.c: org-gnome-proxy-login-errors.xml: - Handled error case to not allow proxy login to the same account - more than once. Fixes #340535 - -2006-05-31 David Richards <drichard@largo.com> - - * proxy-login-dialog.glade: - Increases the height of the dialog to make it easily usable - -2006-04-24 Sankar P <psankar@novell.com> - - * org-gnome-proxy-login-errors.xml: - Changed the ; in the end to a . in an error message - -2006-03-01 Sankar P <psankar@novell.com> - - * proxy-login.c: (proxy_get_password) - (proxy_login_get_cnc): - Takes care of non SSL accounts too. - Fixes #332948 - -2006-02-21 Shreyas Srinivasan <sshreyas@novell.com> - - * proxy.c: Fix more brokenness. doh check if its the proxy - page. Need whack on the head for sucky reckless commit. - -2006-02-16 Shreyas Srinivasan <sshreyas@novell.com> - - * proxy.c: Initialize connection only when the proxy tab is - clicked. - -2006-02-08 Parthasarathi Susarla <sparthasarathi@novell.com> - - ** See bug 326348 - * share-folder-common.c:(refresh_folder_tree) - check if its a valid accoune before creating folder - -2006-01-27 Andre Klapper <a9016009@gmx.de> - * proxy-listing.glade: - removed string "dialog1" from translation. Fixes bug 306118. - -2006-01-18 Vivek Jain <jvivek@novell.com> - - * status-track.c : (add_detail): decode the date - to local time **Fixes #314755 - also fixed some styling issues. - - Committed on behalf of Vivek - partha - -2006-01-06 Simon Zheng <simon.zheng@sun.com> - - * junk-mail-settings.c: - * mail-send-options.c: - * proxy-login.c: - * proxy.c: - * proxy.h: - * send-options.c: - use libedataserver/e-account-list.h instead of e-util/e-account-list.h. - use libedataserver/e-account.h instead of e-util/e-account.h. - -2005-12-30 Andre Klapper <a9016009@gmx.de> - - * evolution/plugins/groupwise-features/properties.glade: - Fixing several typos and harmonizing - capital/small letters. Partially fixes bug 306117. - -2005-12-17 Tor Lillqvist <tml@novell.com> - - * junk-settings.c - * proxy-login.c - * proxy.c - * share-folder.c: Construct glade file name at run-time. - - * process-meeting.c (find_attendee): Use g_ascii_strcasecmp() - instead of g_strcasecmp(). - -2005-12-12 Harish Krishnaswamy <kharish@novell.com> - - * Makefile.am: Fix make-clean issues. - -2005-12-05 Parthasarathi Susarla <sparthasarathi@novell.com> - - * proxy.c: initialize CamelException. - - Fixes bug #314576 - -2005-11-10 Harish Krishnaswamy <kharish@novell.com> - - * mail-send-options.c: (org_gnome_compose_send_options): - Function signature specifies a void return. So, do not - return NULL. - -2005-10-20 Sankar P <psankar@novell.com> - - * proxy-login.c (org_gnome_proxy_account_login) (proxy_login_get_cnc): - When the user forgets-password explicitly, the subsequent proxy-login requests - are made with a NULL password leading to unexpected behavior. - Fixes #312467 - - * proxy-login.c (proxy_login_update_tree) (proxy_login_get_cnc): - Added the missing unrefs for the connection object. - -2005-10-19 Shreyas Srinivasan <sshreyas@novell.com> - - * proxy.c (org_gnome_proxy): Dont try to connect when the account is - offline. Also connect to the server only when the proxy tab is clicked. - * Fixes #314297, #314345 - -2005-10-14 Vivek Jain <jvivek@novell.com> - - * proxy.c :(proxy_get_cnc) - "use_ssl" should be Null checked before comparing it with any value. - its NULL when evo is not compiled with ssl support and caused crash. - -2005-10-07 Vivek Jain <jvivek@novell.com> - - * share-folder.c : (remove_clicked) - when we reach to the last item in the list, de-sensitize the remove - button. - -2005-10-05 Vivek Jain <jvivek@novell.com> - - * share-folder.c : (display_container) moved code for comparing id's - to the getcontainer list part, we break if we find the matched. - also check for null before comparing, free the values - **Fixes #317906 - -2005-09-30 Vivek Jain <jvivek@novell.com> - - * shared-folder-common.c: (org_gnome_create_option) - : (org_gnome_shared_folder_factory) - * install-shared.c : (org_gnome_popup_wizard) - enable shared-folder functionalilty, remove env check - -2005-09-28 Sankar P <psankar@novell.com> - - * proxy.c (proxy_dialog_store_widgets_data): - Added code to handle the extra blank email that will be returned - from the ENameSelector, while auto-completion. - Fixes #317400 - -2005-09-27 Vivek Jain <jvivek@novell.com> - - * install-shared.c: (accept_clicked): - we have to connect "response" to (install_folder_response) - to make it work - don't destroy druid right now, wait till folder selector - dialog dies, make folder selector dialog modal - -2005-08-25 Sankar P <psankar@novell.com> - - * proxy.c: (proxy_dialog_finalize): - Replaced g_object_unref with g_free since priv was created using g_new. - Fixes #312309 - -2005-08-23 Not Zed <NotZed@Ximian.com> - - * proxy-login.c (proxy_get_password): return the right type. - (proxy_soap_login): fix pointer cast. - (proxy_login_add_new_store): fix pointer cast. - (proxy_login_setup_tree_view): fix callback cast. - (org_gnome_proxy_account_login): fix prototype to match use. - - * junk-settings.c (user_selected): fix calling. - (junk_settings_construct): more stupid casts. - - * junk-mail-settings.c (junk_mail_settings): casts. - - * install-shared.c (install_folder_response): constify item_id. - (install_folder_response): remove unused. - (org_gnome_popup_wizard): fixed numerous problems with this, - over-copying data around, not referencing information properly, - freeing potentially unset variables, etc etc. - (accept_free): add a free function. - - * share-folder.c (notification_clicked): fix a multitude of busted - casts. - (user_selected): fix broken calling conventions, busted style. - (share_folder_construct): fix more busted/missing casts. - - * share-folder-common.c: add missing header. - -2005-08-22 vivek jain <jvivek@novell.com> - - ** see previous commit - changed variable name to - groupwise_shared_folder - -2005-08-22 Vivek Jain <jvivek@novell.com> - - * shared-folder-common.c: (org_gnome_create_option) - : (org_gnome_shared_folder_factory) - * install-shared.c : (org_gnome_popup_wizard) - disable shared-folder functionalilty temporarily, (server doesn't show - mails in it) - export SHARED_FOLDER if you want to have it - -2005-08-11 Veerapuram Varadhan <vvaradhan@novell.com> - - * proxy.c: - (proxy_commit) : Check "prd" for NULL, ALWAYS. - -2005-08-10 Sankar P <psankar@novell.com> - - * proxy.c : - (proxy_dialog_store_widgets_data) - (proxy_commit) : Changed the way in which the EDIT and DELETED flags - are handled so that any proxy can be deleted without closing account-editor. - Fixes #312313 - -2005-08-10 Sankar P <psankar@novell.com> - - * proxy.c : - Moved the GList to maintain the list of proxies, - into the proxyDialog structure. - Fixes #312352, #312309 - - * proxy.h : - Added free_proxy_list declaration to avoid compiler warning - -2005-08-10 Vivek Jain <jvivek@novell.com> - - * share-folder-common.c:(org_gnome_shared_folder_factory) - always use full name for the folder - **Fixes #311555 - -2005-08-06 Sankar P <psankar@novell.com> - - * proxy.c: (proxy_dialog_store_widgets_data) - Disabling giving proxy rights to self. - Fixes #312365 - -2005-07-29 Vivek Jain <jvivek@novell.com> - - * status-track.c: (track_status): - adjust row counts while calling add_detail - so that it doesn't overlap the entries. - **Fixes #302817 - -2005-07-29 Vivek Jain <jvivek@novell.com> - - * org-gnome-groupwise-features.eplug.xml: - for status strack removed "Item" tag entries, included a factory method - - * status-track.c : (org_gnome_track_status): converted to - factory method to add the item, moved most of its code to - new function (track_status), which is a callback for the click - **Fixes #311721 - -2005-07-27 Sankar P <psankar@novell.com> - - * org-gnome-groupwise-features.eplug.xml: Added the hook for - the proxy-login feature, since it was removed by mistake. - -2005-07-23 Chenthill Palanisamy <pchenthill@novell.com> - - * Makefile.am: Added the new file process-meeting.c - and widgets/misc to include headers. - * org-gnome-groupwise-features.eplug.xml: Added the - hook for processing meetings. - * org-gnome-shared-folder.errors.xml: Added the message - for asking for error - -2005-07-22 Vivek Jain <jvivek@novell.com> - - * share-folder.c : Put back the fix I committed on - 2005-03-31, not sure when it got reverted. - **Fixes #311217 - -2005-07-20 Shreyas Srinivasan <sshreyas@novell.com> - - * proxy.c: Fix #310710. Make code little smart. Stop - adding tabs continously. Still does not reuse structures - on multiple invocations though. - -2005-07-20 Vivek Jain <jvivek@novell.com> - - * mail-send-options.c: connect to sod-signal and get the input data in - the callback "feed_input_data" - ** Fixes #310854 - -2005-07-20 Sankar P <psankar@novell.com> - - * Consolidated the proxy and proxy-login plugins into the - groupwise-features plugins and merged the ChangeLogs and copied the - following files from their old plugins directories. - - * proxy.[ch] - * proxy-login.[ch] - * org-gnome-proxy-errors.xml - * org-gnome-proxy-login-errors.xml - * proxy-login-dialog.glade - * proxy-listing.glade - * proxy-add-dialog.glade - -2005-07-19 Vivek Jain <jvivek@novell.com> - - * junk-mail-settings.c: Marked strings for translation - -2005-07-15 Sankar P <psankar@novell.com> - - * proxy-login.h: Removed the permissions from the structure, - since it is no longer needed. - -2005-07-15 Sankar P <psankar@novell.com> - - * proxy-login.c: Put permissions on the store instead of the - global structure as it gets unref before store_add. - -2005-07-14 Not Zed <NotZed@Ximian.com> - - * proxy-login.c (proxy_login_add_new_store): fixed the store - permission names. - -2005-07-14 Vivek Jain <jvivek@novell.com> - - * proxy.c: (proxy_commit),(proxy_abort): - NULL checks before we do anything else here (quite likely to be NULL) - **Fixes #310347 - -2005-07-13 Tor Lillqvist <tml@novell.com> - - * Makefile.am (LIBADD): Link with libeutil. Link with - libevolution-mail on Win32 only. (Have I understood correctly that - it isn't considered a good idea on Unix to link plugins at - link-time with libevolution-mail?) - - * org-gnome-proxy-login.eplug.xml: Use SOEXT. - -2005-07-13 Tor Lillqvist <tml@novell.com> - - * Makefile.am (LIBADD): Link with libeutil. - - -2005-07-13 Tor Lillqvist <tml@novell.com> - - * Makefile.am (NO_UNDEFINED_REQUIRED_LIBS): As the code does use - functions from libevolution-mail, link with it. But OK, let's do - it (at build time) only on Win32, then. - -2005-07-12 Sankar P <psankar@novell.com> - - * Makefile.am : - Added CLEANFILES element and glade and error files to EXTRA_DIST. - -2005-07-12 Sankar P <psankar@novell.com> - - * Makefile.am : - Added missed header files to the SOURCES. - -2005-07-12 Sankar P <psankar@novell.com> - - * Makefile.am : - Added org-gnome-proxy-errors.xml file to the EXTRA_DIST and - added CLEANFILES. - -2005-07-12 Sankar P <psankar@novell.com> - - * Makefile.am : - Added missed header files to the SOURCES. - -2005-07-12 Vivek Jain <jvivek@novell.com> - - transferred ChangeLog entry here - (2005-07-10 Shreyas Srinivasan <sshreyas@novell.com>) - * plugins/groupwise-features/*: Remove the - camel-groupwise-listener code as it runs in a different plugin. - -2005-07-11 Sankar P <psankar@novell.com> - - * proxy.c : (org_gnome_proxy) - Made changes so that the proxy list will be loaded only when the - account edited is enabled. So a new connection need not be created, - when an account is edited and a connection is not present. - Fixes #309999 - -2005-07-11 Sankar P <psankar@novell.com> - - * proxy.c : - (proxy_edit_account) : Added code to hide the contacts button - while editing proxy access rights for a proxy. - Fixes #309992 - -2005-07-11 Sankar P <psankar@novell.com> - - * proxy.c : - Included <string.h> header to avoid the compiler warnings. - -2005-07-07 Frederic Crozat <fcrozat@mandriva.com> - - * send-options.c: Add missing header. - -2005-07-07 Vivek Jain <jvivek@novell.com> - - * org-gnome-groupwise-features.eplug.xml: - have one more hookitem in folderview.popup - for displaying junk mail settings - - added four more files - * junk-mail-settings.c - * junk-settings.c - * junk-settings.h - * junk-settings.glade - * Makefile.am : updated to add these files - -2005-06-27 Sushma Rai <rsushma@novell.com> - - * org-gnome-groupwise-features.eplug.xml: - Not loading on start-up and not linking to libevolution-mail. - -2005-06-27 Tor Lillqvist <tml@novell.com> - - * Makefile.am: Use NO_UNDEFINED. Link with more libraries. - -2005-06-25 Harish Krishnaswamy <kharish@novell.com> - - * Makefile.am: Reverting previous commit. Do not remove - $(EVOLUTION_MAIL_LIBS) from LIBADD. The addressbook dependency - is not required atm. - -2005-06-25 Sushma Rai <rsushma@novell.com> - - * Makefile.am: Linking to libevolution-mail and libevolution-addressbook - -2005-06-24 Sushma Rai <rsushma@novell.com> - - * org-gnome-groupwise-features.eplug.xml: Set load-on-startup. - -2005-06-18 Tor Lillqvist <tml@novell.com> - - * org-gnome-groupwise-features.eplug.xml: Use SOEXT. - -2005-05-24 Vivek Jain <jvivek@novell.com> - - * org-gnome-groupwise-features.eplug.xml: - removed "Item" tag entries, included a factory method - - * shared-folder-common.c: changed callback (org_gnome_create_option) - to a factory method, check uri before adding the option to the menu. - New folder dialog now comes in another callback (create_shared_folder) - also added a function to free the item list. - -2005-05-23 Vivek Jain <jvivek@novell.com> - - Created a plugin "groupwise-features" which is a consolidation of - following existing plugins - * groupwise-account-setup - * addressbook-groupwise - * shared-folder - * groupwise-send-options - * groupwise-status-tracking - * send-options - -2005-05-16 Not Zed <NotZed@Ximian.com> - - * camel-gw-listener.c: moved e-error to e-util. - -2005-05-16 Not Zed <NotZed@Ximian.com> - - * share-folder-common.c: moved e-error to e-util - - * Makefile.am: error filename changes. - -2005-05-06 Chenthill Palanisamy <pchenthill@novell.com> - - Fixes #273063 - * org-gnome-shared-folder-errors.xml: - * org-gnome-shared-folder-errors.xml.h:Removed the unwanted - tabs and new line characters. - -2005-05-06 Sarfraaz Ahmed <asarfraaz@novell.com> - - * properties.glade : Fixed a typo #273064 - -2005-05-05 Srinivasa Ragavan <sragavan@novell.com> - - * properties.glade : Fixed a typo 272538 - -2005-03-31 Parthasarathi Susarla <sparthasarathi@novell.com> - - * share-folder-common.c:(create_folder): - check the store state, can create a shared - folder only in online mode - Fixes bug 74002 - -2005-03-31 Vivek Jain <jvivek@novell.com> - - **Fixes #74002 - * share-folder-common.c : - (get_cnc): return cnc as NULL if evoluiton is in offline. - (create_folder): return -1 if in offline - -2005-03-31 Vivek Jain <jvivek@novell.com> - - **Fixes #73787 (bugzilla innerweb.novell) - * share-folder.c : - (add_right_clicked) - (edit_right_clicked) - (delete_right_clicked) : use path passed in the callback to get the - current iterator - also including some NULL checks - -2005-03-28 Vivek Jain <jvivek@novell.com> - - **Fixes #73198 - * share-folder-common.c : - (org_gnome_shared_folder_factory): - (create_folder__created) : pass the full name in get_conatiner_id - (get_container_id) : break the full name and start looking for the - name from the top most parent. This will give proper container id - even in the case of the duplicate names at different hierarchies - - -2005-03-18 Vivek Jain <jvivek@novell.com> - - * send-options.h: - * send-options.c: (org_gnome_compose_send_options): replace - X_RETURN_NOTIFY_DECLINE with X_RETURN_NOTIFY_DELETE - -2005-03-18 Vivek Jain <jvivek@novell.com> - - **Fixes #73473 - * send-options.c :(org_gnome_compose_send_options) - user proper entry to calculate the date of reply requested - -2005-03-10 Vivek Jain <jvivek@novell.com> - - **Fixes #73201 - * share-folder-common.c : (org_gnome_shared_folder_factory) - use full_name given by CamelFolder to get the selected folder name - - -2005-03-09 Sankar P <psankar@novell.com> - - * send-options.c: (org_gnome_compose_send_options) - Updated code to add priority to the appropriate header - Fixes the problem of Priority not set in outgoing mails - -2005-03-07 Sivaiah Nallagatla <snallagatla@novell.com> - - * camel-gw-listner.c (add_addressbook_sources) : - don't free container list here. It is chaced in - connection and will be frred later. - - Fixes #72807 - -2005-02-24 Björn Torkelsson <torkel@acc.umu.se> - * org-gnome-shared-folder.eplug.in: Added Groupwise to name. - Fixed description and added author. - Added xml tag. - -2005-02-24 Björn Torkelsson <torkel@acc.umu.se> - - * org-gnome-gw-account-setup.eplug.in: Added author and fixed - description. - -2005-02-23 JP Rosevear <jpr@novell.com> - - * org-gnome-gw-account-setup.eplug.in: add account wizard item - - -2005-02-23 Hans Petter Jansson <hpj@novell.com> - - * camel-gw-listener.c: Include <libedataserverui/e-passwords.h>. - -2005-02-17 Vivek Jain <jvivek@novell.com> - - * share-folder-common.c : (get_cnc): - - use ssl when "always" and "whenever possible" is enabled - changed "soap_ssl" to "use_ssl" - use the default port "7191" instead of "7181" - - 2005-02-16 Not Zed <NotZed@Ximian.com> - - * groupwise-account-setup.c (org_gnome_gw_account_setup): return - NULL, not an invisible, so it doesn't interfere with account - editor. - -2005-02-16 Not Zed <NotZed@Ximian.com> - - * groupwise-account-setup.c (org_gnome_gw_account_setup): return - NULL, not an invisible, so it doesn't interfere with account - editor. - -2005-02-03 Chenthill Palanisamy <pchenthill@novell.com> - - * send-options.c: (add_day_to_time), (send_options_commit), - (org_gnome_compose_send_options):Added functions to destroy - the dialog when the composer is destroyed to solve the crash. - Removed the return statement so that the send options gets - added to the composer headers. Made modification in setting - the values for some headers. - Changing the file name from Changelog to ChangeLog. - -2005-01-28 Sivaiah Nallagatla <snallagatla@novell.com> - - * camel-gw-listner.c (get_address_book_names_from_server) - : Remove leading "%s" in the message. Similar to - #36137 - - * camel-gw-listener.c (add_esource) - (modify_esource) (add_addressbook_sources) : - Don't set offline_sync value taken from camel url - instead set "1" or "0" depending upon offline is enabled - or not - -2005-01-24 Vivek Jain <jvivek@novell.com> - - * properties.glade : changed the layout of the widgets - * share-folder.[ch]: removed the checkbuttons for display of rights - : removed new_list, update_list and remove_list - added users_list - * share-folder.c : removed function (update_list_update) - (share_folder_construct) : added gtk_cell_renderer_toggle for - displaying rights - added one structure SharedUsers to have a single list instead of three - different lists. Made corresponding changes in all functions. - * share-folder-common.c : (new_folder_response): use - gtk_widget_reparent to pack the widget - added two files - * org-gnome-shared-folder-errors.xml - * org-gnome-shared-folder-errors.xml.h : to display error message - * Makefile.am : included error data - -2005-01-21 Sivaiah Nallagatla <snallagtla@novell.com> - - * org-gnome-gw-account-setup.eplug.in : changed - the item type from "item" to "item_table". avoids - some debug spew on the console - -2005-01-20 Sivaiah Nallagatla <snallagatla@novell.com> - - * camel-gw-listener.c: (add_calendar_tasks_sources): - Assiged value to URL. - -2005-01-19 Vivek Jain <jvivek@novell.com> - *install-shared.c - (org_gnome_popup_wizard): fixed a crash, caused by g_free - (install_folder_response): free the memory - -2005-01-18 Vivek Jain <jvivek@novell.com> - *install-shared.c - (org_gnome_popup_wizard): removed unnecessary stuff for the display of - wizard - -2005-01-18 Parthasarathi Susarla <sparthasarathi@novell.com> - - *install-shared.c - (org_gnome_popup_wizard): displays the message without the - mime headers - -2005-01-17 Vivek Jain <jvivek@novell.com> - - *install-shared.c : (org_gnome_popup_wizard): included a condition - (null check) to fix a crash - * shared-folder-common.c :(org_gnome_shared_folder_factory): some - condition checks to avoid the possible crashes - (get_container_id): included code to return top level container id if - folder name is passed as null - -2005-01-15 Sivaiah Nallagatla <snallagatla@novell.com> - - * camel-gw-listner.c : use url->host instead of reading "poa" - parameter everywhere. use "use_ssl" param instead of soap_ssl - We not longer have separate settings for soap as we use soap for mail - now - - -2005-01-13 Vivek Jain <jvivek@novell.com> - - * share-folder.c :changed the function find_node to return user node - corresponding to the mail address given. - (add_clicked): added a condition so that user can't share folder to itself. - (user_selected): modified to display proper rights when owner is selected. - * share-folder-common.c : calling share_folder with a cnc in it. - -2005-01-10 Vivek Jain <jvivek@novell.com> Included - - * install-shared.c : opens up a wizard on reading a shared folder - notification and installs shared folder at the recepient end. - * share-folder-common.c : added - (refresh_folder_tree) : to refresh the folder tree when a folder is shared or - a shared folder is created so that different icons are displayed - (get_cnc): to get a connection - (get_container_id):to get the container id of the folder user selects - * share-folder.c : minor changes to fix the crash - * Makefile.am : including install-shared.c in sources - * org-gnome-shared-folder.eplug.in : added a plugin to the e-plugin list for - the message-read event - -2004-12-17 Sivaiah Nallagatla <snallagatla@novell.com> - - * camel-gw-listner.c (add_esource) : read "soap_ssl" from - the camel url instead of "use_ssl" - -2004-12-15 Vivek Jain <jvivek@novell.com> - - Added (Create a shared folder) functionality in the plugin - * org-gnome-shared-folder.eplug.in : added a plugin in the plugin list - * share-folder-common.c : included functions to create a shared folder - -2004-12-15 Vivek Jain <jvivek@novell.com> - - * shared-folder-common.c : (org_gnome_shared_folder_factory) - * shared-folder.c : some whitespace changes, typecasting widgets, - in (on_add_clicked) removed assigning the rights portion diff --git a/plugins/groupwise-features/camel-gw-listener.c b/plugins/groupwise-features/camel-gw-listener.c index b9385ab390..17d904b549 100644 --- a/plugins/groupwise-features/camel-gw-listener.c +++ b/plugins/groupwise-features/camel-gw-listener.c @@ -26,7 +26,8 @@ #include "camel-gw-listener.h" #include <string.h> -#include <camel/camel-i18n.h> +#include <glib/gi18n.h> +#include <camel/camel.h> #include <e-gw-connection.h> #include <libedataserverui/e-passwords.h> #include "e-util/e-alert-dialog.h" diff --git a/plugins/groupwise-features/camel-gw-listener.h b/plugins/groupwise-features/camel-gw-listener.h index 1c4cedbe5a..cc545def61 100644 --- a/plugins/groupwise-features/camel-gw-listener.h +++ b/plugins/groupwise-features/camel-gw-listener.h @@ -27,7 +27,6 @@ #include <libedataserver/e-account-list.h> #include<libedataserver/e-source.h> #include<libedataserver/e-source-list.h> -#include <camel/camel-url.h> G_BEGIN_DECLS diff --git a/plugins/groupwise-features/gw-ui.c b/plugins/groupwise-features/gw-ui.c index c1146ff4d1..41529b5d41 100644 --- a/plugins/groupwise-features/gw-ui.c +++ b/plugins/groupwise-features/gw-ui.c @@ -384,7 +384,7 @@ update_cal_entries_cb (EShellView *shell_view, gpointer user_data) ECalendarViewEvent *event = (ECalendarViewEvent *) selected->data; const gchar *uri; - uri = event->comp_data ? e_cal_get_uri (event->comp_data->client) : NULL; + uri = is_comp_data_valid (event) ? e_cal_get_uri (event->comp_data->client) : NULL; if (uri && g_ascii_strncasecmp (uri, "groupwise://", 12) == 0) { visible = e_cal_util_component_has_attendee (event->comp_data->icalcomp); diff --git a/plugins/groupwise-features/install-shared.c b/plugins/groupwise-features/install-shared.c index b570d6486d..d2addbf095 100644 --- a/plugins/groupwise-features/install-shared.c +++ b/plugins/groupwise-features/install-shared.c @@ -33,17 +33,9 @@ #include <shell/e-shell.h> #include <mail/em-config.h> #include <mail/em-event.h> -#include <camel/camel-mime-message.h> -#include <camel/camel-folder.h> -#include <camel/camel-stream.h> -#include <camel/camel-session.h> -#include <camel/camel-stream-mem.h> -#include <camel/camel-data-wrapper.h> -#include <camel/camel-multipart.h> #include <mail/em-folder-tree.h> #include <mail/mail-config.h> #include <mail/em-folder-selector.h> -#include <camel/camel-medium.h> #include <e-gw-connection.h> #include <share-folder.h> @@ -138,7 +130,7 @@ install_folder_response (EMFolderSelector *emfs, gint response, gpointer *data) } em_folder_tree_model_add_store (model, store, account->name); - camel_object_unref (store); + g_object_unref (store); } } @@ -153,7 +145,7 @@ accept_free(gpointer data) { struct AcceptData *accept_data = data; - camel_object_unref(accept_data->msg); + g_object_unref (accept_data->msg); g_free(accept_data); } @@ -177,7 +169,7 @@ apply_clicked (GtkAssistant *assistant, CamelMimeMessage *msg) em_folder_selector_set_selected ((EMFolderSelector *) dialog, uri); g_free(uri); accept_data->msg = msg; - camel_object_ref(msg); + g_object_ref (msg); accept_data->model = EM_FOLDER_TREE_MODEL (gtk_tree_view_get_model (GTK_TREE_VIEW (folder_tree))); g_object_set_data_full((GObject *)dialog, "accept-data", accept_data, accept_free); g_signal_connect (dialog, "response", G_CALLBACK (install_folder_response), accept_data); @@ -190,12 +182,13 @@ apply_clicked (GtkAssistant *assistant, CamelMimeMessage *msg) void org_gnome_popup_wizard (EPlugin *ep, EMEventTargetMessage *target) { - const CamelInternetAddress *from_addr = NULL; + CamelInternetAddress *from_addr = NULL; const gchar *name; const gchar *email; CamelMimeMessage *msg = (CamelMimeMessage *) target->message; - CamelStreamMem *content; + CamelStream *stream; CamelDataWrapper *dw; + GByteArray *byte_array; gchar *start_message; if (!msg) @@ -204,18 +197,19 @@ org_gnome_popup_wizard (EPlugin *ep, EMEventTargetMessage *target) if (((gchar *)camel_medium_get_header (CAMEL_MEDIUM(msg),"X-notification")) == NULL || (from_addr = camel_mime_message_get_from ((CamelMimeMessage *)target->message)) == NULL || !camel_internet_address_get(from_addr, 0, &name, &email) - || (dw = camel_medium_get_content_object (CAMEL_MEDIUM (msg))) == NULL) { + || (dw = camel_medium_get_content (CAMEL_MEDIUM (msg))) == NULL) { return; } else { if (CAMEL_IS_MULTIPART (dw)) { - dw = camel_medium_get_content_object((CamelMedium *)camel_multipart_get_part((CamelMultipart *)dw, 0)); + dw = camel_medium_get_content ((CamelMedium *)camel_multipart_get_part((CamelMultipart *)dw, 0)); if (dw == NULL) return; } - content = (CamelStreamMem *)camel_stream_mem_new(); - camel_data_wrapper_write_to_stream(dw, (CamelStream *)content); - camel_stream_write((CamelStream *)content, "", 1); + byte_array = g_byte_array_new (); + stream = camel_stream_mem_new_with_byte_array (byte_array); + camel_data_wrapper_write_to_stream (dw, stream); + camel_stream_write (stream, "", 1); from_addr = camel_mime_message_get_from ((CamelMimeMessage *)target->message); if (from_addr && camel_internet_address_get(from_addr, 0, &name, &email)) { @@ -226,7 +220,7 @@ org_gnome_popup_wizard (EPlugin *ep, EMEventTargetMessage *target) "Message from '%s'\n\n\n" "%s\n\n\n" "Click 'Apply' to install the shared folder\n\n"), - name, name, content->buffer->data); + name, name, byte_array->data); page = gtk_label_new (start_message); gtk_label_set_line_wrap (GTK_LABEL (page), TRUE); @@ -241,8 +235,8 @@ org_gnome_popup_wizard (EPlugin *ep, EMEventTargetMessage *target) gtk_window_set_title (GTK_WINDOW (assistant), _("Shared Folder Installation")); gtk_window_set_position (GTK_WINDOW (assistant) , GTK_WIN_POS_CENTER_ALWAYS); - camel_object_ref (msg); - g_object_set_data_full((GObject *)page, "msg", msg, camel_object_unref); + g_object_ref (msg); + g_object_set_data_full((GObject *)page, "msg", msg, g_object_unref); g_signal_connect (assistant, "apply", G_CALLBACK (apply_clicked), msg); @@ -252,7 +246,7 @@ org_gnome_popup_wizard (EPlugin *ep, EMEventTargetMessage *target) } else g_warning ("Could not get the sender name"); - camel_object_unref(content); + g_object_unref (stream); } } diff --git a/plugins/groupwise-features/junk-mail-settings.c b/plugins/groupwise-features/junk-mail-settings.c index b868e28c5a..6e72b67320 100644 --- a/plugins/groupwise-features/junk-mail-settings.c +++ b/plugins/groupwise-features/junk-mail-settings.c @@ -62,6 +62,7 @@ void gw_junk_mail_settings_cb (GtkAction *action, EShellView *shell_view) { GtkWidget *dialog ,*w, *notebook, *box; + GtkWidget *content_area; JunkSettings *junk_tab; gint page_count =0; EGwConnection *cnc; @@ -76,7 +77,7 @@ gw_junk_mail_settings_cb (GtkAction *action, EShellView *shell_view) folder = e_mail_reader_get_folder (reader); g_return_if_fail (folder != NULL); - cnc = get_cnc (folder->parent_store); + cnc = get_cnc (camel_folder_get_parent_store (folder)); dialog = gtk_dialog_new_with_buttons (_("Junk Settings"), NULL, @@ -86,9 +87,10 @@ gw_junk_mail_settings_cb (GtkAction *action, EShellView *shell_view) GTK_STOCK_OK, GTK_RESPONSE_ACCEPT, NULL); + content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog)); gtk_window_set_default_size ((GtkWindow *) dialog, 292, 260); gtk_widget_ensure_style (dialog); - gtk_container_set_border_width ((GtkContainer *) ((GtkDialog *) dialog)->vbox, 12); + gtk_container_set_border_width (GTK_CONTAINER (content_area), 12); box = gtk_vbox_new (FALSE, 6); w = gtk_label_new (""); msg = g_strdup_printf("<b>%s</b>", _("Junk Mail Settings")); @@ -105,12 +107,12 @@ gw_junk_mail_settings_cb (GtkAction *action, EShellView *shell_view) notebook = gtk_notebook_new (); gtk_notebook_append_page ((GtkNotebook *)notebook, box, NULL); gtk_box_pack_start ( - (GtkBox *) ((GtkDialog *) dialog)->vbox, - notebook, TRUE, TRUE, 0); + GTK_BOX (content_area), notebook, TRUE, TRUE, 0); } if (page_count == 0) - gtk_box_pack_start ((GtkBox *) ((GtkDialog *) dialog)->vbox, box, TRUE, TRUE, 0); + gtk_box_pack_start ( + GTK_BOX (content_area), box, TRUE, TRUE, 0); g_signal_connect (dialog, "response", G_CALLBACK (junk_dialog_response), junk_tab); gtk_widget_show_all (dialog); diff --git a/plugins/groupwise-features/junk-settings.h b/plugins/groupwise-features/junk-settings.h index d4b59ae480..2e67b8cc8c 100644 --- a/plugins/groupwise-features/junk-settings.h +++ b/plugins/groupwise-features/junk-settings.h @@ -25,7 +25,6 @@ #define __JUNK_SETTINGS_H__ #include <gtk/gtk.h> -#include <camel/camel-store.h> #include <e-gw-connection.h> #define _JUNK_SETTINGS_TYPE (junk_settings_get_type ()) diff --git a/plugins/groupwise-features/mail-retract.c b/plugins/groupwise-features/mail-retract.c index 3de31b6838..466da1cb23 100644 --- a/plugins/groupwise-features/mail-retract.c +++ b/plugins/groupwise-features/mail-retract.c @@ -26,8 +26,6 @@ #include <glib/gi18n-lib.h> #include <e-gw-connection.h> -#include <camel/camel-store.h> -#include <camel/camel-folder.h> #include <e-util/e-alert-dialog.h> @@ -65,29 +63,35 @@ gw_retract_mail_cb (GtkAction *action, EShellView *shell_view) { EGwConnection *cnc; CamelFolder *folder; - CamelStore *store; + CamelStore *parent_store; gchar *id = NULL; GtkWidget *confirm_dialog, *confirm_warning; + GtkWidget *content_area; gint n; g_return_if_fail (get_selected_info (shell_view, &folder, &id)); g_return_if_fail (folder != NULL); - store = folder->parent_store; + parent_store = camel_folder_get_parent_store (folder); - cnc = get_cnc (store); + cnc = get_cnc (parent_store); if (cnc && E_IS_GW_CONNECTION(cnc)) { - confirm_dialog = gtk_dialog_new_with_buttons (_("Message Retract"), GTK_WINDOW (e_shell_view_get_shell_window (shell_view)), - GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT, - GTK_STOCK_YES, GTK_RESPONSE_YES, - GTK_STOCK_NO, GTK_RESPONSE_NO, NULL); + confirm_dialog = gtk_dialog_new_with_buttons ( + _("Message Retract"), + GTK_WINDOW (e_shell_view_get_shell_window (shell_view)), + GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT, + GTK_STOCK_YES, GTK_RESPONSE_YES, + GTK_STOCK_NO, GTK_RESPONSE_NO, NULL); + + content_area = gtk_dialog_get_content_area ( + GTK_DIALOG (confirm_dialog)); confirm_warning = gtk_label_new (_("Retracting a message may remove it from the recipient's mailbox. Are you sure you want to do this?")); gtk_label_set_line_wrap (GTK_LABEL (confirm_warning), TRUE); gtk_label_set_selectable (GTK_LABEL (confirm_warning), TRUE); - gtk_container_add (GTK_CONTAINER ((GTK_DIALOG(confirm_dialog))->vbox), confirm_warning); + gtk_container_add (GTK_CONTAINER (content_area), confirm_warning); gtk_widget_set_size_request (confirm_dialog, 400, 100); gtk_widget_show_all (confirm_dialog); diff --git a/plugins/groupwise-features/process-meeting.c b/plugins/groupwise-features/process-meeting.c index 5a2b55c2c9..3eb8d59424 100644 --- a/plugins/groupwise-features/process-meeting.c +++ b/plugins/groupwise-features/process-meeting.c @@ -144,13 +144,19 @@ process_meeting (ECalendarView *cal_view, icalparameter_partstat status) selected = e_calendar_view_get_selected_events (cal_view); if (selected) { ECalendarViewEvent *event = (ECalendarViewEvent *) selected->data; - ECalComponent *comp = e_cal_component_new (); - ReceiveData *r_data = g_new0 (ReceiveData, 1); + ECalComponent *comp; + ReceiveData *r_data; gboolean recurring = FALSE; GThread *thread = NULL; GError *error = NULL; gchar *address = NULL; + if (!is_comp_data_valid (event)) + return; + + comp = e_cal_component_new (); + r_data = g_new0 (ReceiveData, 1); + e_cal_component_set_icalcomponent (comp, icalcomponent_new_clone (event->comp_data->icalcomp)); address = itip_get_comp_attendee (comp, event->comp_data->client); @@ -373,7 +379,7 @@ gw_resend_meeting_cb (GtkAction *action, EShellView *shell_view) selected = e_calendar_view_get_selected_events (cal_view); if (selected) { ECalendarViewEvent *event = (ECalendarViewEvent *) selected->data; - ECalComponent *comp = e_cal_component_new (); + ECalComponent *comp; ECalComponent *new_comp = NULL; gboolean recurring = FALSE; CalObjModType mod = CALOBJ_MOD_THIS; @@ -383,6 +389,10 @@ gw_resend_meeting_cb (GtkAction *action, EShellView *shell_view) /* inserting the boolean to share the code between resend and retract */ gboolean resend = TRUE; + if (!is_comp_data_valid (event)) + return; + + comp = e_cal_component_new (); e_cal_component_set_icalcomponent (comp, icalcomponent_new_clone (event->comp_data->icalcomp)); if (e_cal_component_has_recurrences (comp) || e_cal_component_is_instance (comp)) recurring = TRUE; diff --git a/plugins/groupwise-features/properties.ui b/plugins/groupwise-features/properties.ui index ca39309ff4..941c9a5ae8 100644 --- a/plugins/groupwise-features/properties.ui +++ b/plugins/groupwise-features/properties.ui @@ -167,7 +167,7 @@ <child> <object class="GtkLabel" id="users"> <property name="visible">True</property> - <property name="label" translatable="yes"><b>Users:</b></property> + <property name="label" translatable="yes">Users:</property> <property name="use_underline">False</property> <property name="use_markup">True</property> <property name="justify">GTK_JUSTIFY_LEFT</property> @@ -177,6 +177,9 @@ <property name="yalign">0.5</property> <property name="xpad">0</property> <property name="ypad">0</property> + <attributes> + <attribute name="weight" value="bold"/> + </attributes> </object> <packing> <property name="padding">6</property> diff --git a/plugins/groupwise-features/proxy-login-dialog.ui b/plugins/groupwise-features/proxy-login-dialog.ui index a18acf988d..a8c33317ca 100644 --- a/plugins/groupwise-features/proxy-login-dialog.ui +++ b/plugins/groupwise-features/proxy-login-dialog.ui @@ -155,7 +155,7 @@ <child type="label"> <object class="GtkLabel" id="label2"> <property name="visible">True</property> - <property name="label" translatable="yes"><b>Account Name</b></property> + <property name="label" translatable="yes">Account Name</property> <property name="use_underline">False</property> <property name="use_markup">True</property> <property name="justify">GTK_JUSTIFY_LEFT</property> @@ -169,6 +169,9 @@ <property name="width_chars">-1</property> <property name="single_line_mode">False</property> <property name="angle">0</property> + <attributes> + <attribute name="weight" value="bold"/> + </attributes> </object> </child> </object> diff --git a/plugins/groupwise-features/proxy-login.c b/plugins/groupwise-features/proxy-login.c index f85bc2b946..6fd97d99aa 100644 --- a/plugins/groupwise-features/proxy-login.c +++ b/plugins/groupwise-features/proxy-login.c @@ -34,8 +34,6 @@ #include <mail/mail-config.h> #include <mail/em-folder-selector.h> #include <mail/em-account-editor.h> -#include <camel/camel-url.h> -#include <camel/camel-store.h> #include <mail/mail-ops.h> #include <libedataserver/e-account.h> #include <e-util/e-util.h> diff --git a/plugins/groupwise-features/proxy.c b/plugins/groupwise-features/proxy.c index 6654844bb7..1507e08af0 100644 --- a/plugins/groupwise-features/proxy.c +++ b/plugins/groupwise-features/proxy.c @@ -45,8 +45,6 @@ #include <libedataserver/e-account-list.h> #include <e-util/e-icon-factory.h> -#include <camel/camel-url.h> -#include <camel/camel-offline-store.h> #include <libedataserverui/e-passwords.h> #include <libedataserverui/e-name-selector.h> #include <proxy.h> @@ -700,7 +698,7 @@ org_gnome_proxy (EPlugin *epl, EConfigHookItemFactoryData *data) } /*To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation*/ - gtk_notebook_append_page ((GtkNotebook *)(data->parent), (GtkWidget *)priv->tab_dialog, gtk_label_new("Proxy")); + gtk_notebook_append_page ((GtkNotebook *)(data->parent), (GtkWidget *)priv->tab_dialog, gtk_label_new (C_("GW", "Proxy"))); g_signal_connect ((GtkNotebook *)(data->parent), "switch-page", G_CALLBACK (proxy_page_changed_cb), account); pag_num = gtk_notebook_page_num ((GtkNotebook *)(data->parent), (GtkWidget *)priv->tab_dialog); g_object_set_data ((GObject *) account, "proxy_tab_num", GINT_TO_POINTER (pag_num)); @@ -718,7 +716,7 @@ org_gnome_proxy (EPlugin *epl, EConfigHookItemFactoryData *data) } } - camel_object_unref (store); + g_object_unref (store); camel_exception_clear (&ex); return NULL; } diff --git a/plugins/groupwise-features/send-options.c b/plugins/groupwise-features/send-options.c index 6e75f9153e..e20be7353b 100644 --- a/plugins/groupwise-features/send-options.c +++ b/plugins/groupwise-features/send-options.c @@ -33,7 +33,6 @@ #include <misc/e-send-options.h> #include <mail/em-config.h> #include <e-gw-connection.h> -#include <camel/camel-url.h> #include <libecal/e-cal-time-util.h> #include <libedataserver/e-source-list.h> #include <libedataserverui/e-passwords.h> diff --git a/plugins/groupwise-features/share-folder-common.c b/plugins/groupwise-features/share-folder-common.c index 992664f863..91758da535 100644 --- a/plugins/groupwise-features/share-folder-common.c +++ b/plugins/groupwise-features/share-folder-common.c @@ -38,11 +38,6 @@ #include <mail/mail-vfolder.h> #include <mail/em-vfolder-rule.h> #include <filter/e-filter-rule.h> -#include <camel/camel-store.h> -#include <camel/camel-session.h> -#include <camel/camel-store.h> -#include <camel/camel-vee-store.h> -#include <camel/camel-folder.h> #include <e-gw-container.h> #include <e-gw-connection.h> #include <shell/e-shell-sidebar.h> @@ -91,19 +86,21 @@ refresh_folder_tree (EMFolderTreeModel *model, CamelStore *store) if (!(provider->flags & CAMEL_PROVIDER_IS_STORAGE)) return; em_folder_tree_model_add_store (model, store, account->name); - /* camel_object_unref (store); */ + /* g_object_unref (store); */ } void shared_folder_commit (EPlugin *ep, EConfigTarget *tget) { EMConfigTargetFolder *target = (EMConfigTargetFolder *)tget->config->target; - CamelFolder *folder = target->folder; - CamelStore *store = folder->parent_store; + CamelStore *parent_store; EMFolderTreeModel *model = NULL; /*mail_component_peek_tree_model (mail_component_peek ())*/; + + parent_store = camel_folder_get_parent_store (target->folder); + if (common) { share_folder (common); - refresh_folder_tree (model, store); + refresh_folder_tree (model, parent_store); g_object_run_dispose ((GObject *)common); common = NULL; } @@ -176,7 +173,7 @@ static void create_folder_free (struct _EMCreateFolder *m) { camel_store_free_folder_info (m->store, m->fi); - camel_object_unref (m->store); + g_object_unref (m->store); g_free (m->full_name); g_free (m->parent); g_free (m->name); @@ -222,7 +219,7 @@ create_folder (CamelStore *store, const gchar *full_name, void (* done) (struct } m = mail_msg_new (&create_folder_info); - camel_object_ref (store); + g_object_ref (store); m->store = store; m->full_name = g_strdup (full_name); m->parent = g_strdup (parent); @@ -264,7 +261,7 @@ users_dialog_response(GtkWidget *dialog, gint response, struct ShareInfo *ssi) if (!(si = em_folder_tree_model_lookup_store_info (ssi->model, store))) { g_assert_not_reached (); - camel_object_unref (store); + g_object_unref (store); return; } @@ -284,13 +281,14 @@ users_dialog_response(GtkWidget *dialog, gint response, struct ShareInfo *ssi) create_folder (si->store, path, new_folder_created_cb, ssi); } - camel_object_unref (store); + g_object_unref (store); } static void new_folder_response (EMFolderSelector *emfs, gint response, EMFolderTreeModel *model) { GtkWidget *users_dialog; + GtkWidget *content_area; GtkWidget *w; struct ShareInfo *ssi; const gchar *uri; @@ -317,18 +315,19 @@ new_folder_response (EMFolderSelector *emfs, gint response, EMFolderTreeModel *m _("Users"), NULL, GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_NO_SEPARATOR, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,GTK_STOCK_OK, GTK_RESPONSE_OK, NULL); w = gtk_label_new_with_mnemonic (_("Enter the users and set permissions")); gtk_widget_show(w); - gtk_box_pack_start(GTK_BOX (GTK_DIALOG (users_dialog)->vbox), (GtkWidget *) w, TRUE, TRUE, 6); + content_area = gtk_dialog_get_content_area (GTK_DIALOG (users_dialog)); + gtk_box_pack_start(GTK_BOX (content_area), (GtkWidget *) w, TRUE, TRUE, 6); ssi->sf = share_folder_new (cnc, NULL); gtk_widget_set_sensitive (GTK_WIDGET ((ssi->sf)->table), TRUE); ssi->model = model; ssi->emfs = emfs; - gtk_widget_reparent (GTK_WIDGET ((ssi->sf)->table), GTK_DIALOG (users_dialog)->vbox); + gtk_widget_reparent (GTK_WIDGET ((ssi->sf)->table), content_area); gtk_widget_hide((GtkWidget*) emfs); gtk_window_resize (GTK_WINDOW (users_dialog), 350, 300); gtk_widget_show(users_dialog); g_signal_connect (users_dialog, "response", G_CALLBACK (users_dialog_response), ssi); - camel_object_unref (store); + g_object_unref (store); return; } @@ -373,7 +372,7 @@ org_gnome_shared_folder_factory (EPlugin *ep, EConfigHookItemFactoryData *hook_d EMConfigTargetFolder *target= (EMConfigTargetFolder *)hook_data->config->target; CamelFolder *folder = target->folder; - folder_name = g_strdup (folder->full_name); + folder_name = g_strdup (camel_folder_get_full_name (folder)); folderuri = g_strdup(target->uri); if (folderuri && folder_name) account = g_strrstr(folderuri, "groupwise"); @@ -399,8 +398,10 @@ org_gnome_shared_folder_factory (EPlugin *ep, EConfigHookItemFactoryData *hook_d } if (account) { - CamelStore *store = folder->parent_store; - cnc = get_cnc (store); + CamelStore *parent_store; + + parent_store = camel_folder_get_parent_store (folder); + cnc = get_cnc (parent_store); if (E_IS_GW_CONNECTION (cnc)) id = get_container_id (cnc, folder_name); diff --git a/plugins/groupwise-features/share-folder.h b/plugins/groupwise-features/share-folder.h index 138266ccef..4df979d4ef 100644 --- a/plugins/groupwise-features/share-folder.h +++ b/plugins/groupwise-features/share-folder.h @@ -25,7 +25,7 @@ #define __SHARE_FOLDER_H__ #include <gtk/gtk.h> -#include <camel/camel-store.h> +#include <camel/camel.h> #include <e-gw-connection.h> #include <libedataserverui/e-name-selector.h> diff --git a/plugins/groupwise-features/status-track.c b/plugins/groupwise-features/status-track.c index d8cddd03fe..83ecf6c1bf 100644 --- a/plugins/groupwise-features/status-track.c +++ b/plugins/groupwise-features/status-track.c @@ -32,11 +32,6 @@ #include <time.h> #include <gtk/gtk.h> -#include <camel/camel-folder.h> -#include <camel/camel-mime-utils.h> -#include <camel/camel-medium.h> -#include <camel/camel-mime-message.h> - #include <mail/e-mail-reader.h> #include <mail/em-utils.h> #include <mail/message-list.h> @@ -93,12 +88,13 @@ gw_track_message_status_cb (GtkAction *action, CamelMimeMessage *msg = NULL; CamelFolder *folder = NULL; gchar *selected_uid = NULL; - const CamelInternetAddress *from; + CamelInternetAddress *from; const gchar *namep, *addp; GtkDialog *d; GtkTable *table; GtkWidget *widget; + GtkWidget *content_area; GtkScrolledWindow *win; GtkVBox *vbox; @@ -122,12 +118,13 @@ gw_track_message_status_cb (GtkAction *action, /* Create the dialog */ d = (GtkDialog *) gtk_dialog_new (); + content_area = gtk_dialog_get_content_area (d); gtk_dialog_add_button (d, GTK_STOCK_OK, GTK_RESPONSE_OK); gtk_window_set_title (GTK_WINDOW (d), _("Message Status")); table = (GtkTable *) gtk_table_new (1, 2, FALSE); win = (GtkScrolledWindow *) gtk_scrolled_window_new (NULL, NULL); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG(d)->vbox), GTK_WIDGET (win)); + gtk_container_add (GTK_CONTAINER (content_area), GTK_WIDGET (win)); vbox = (GtkVBox *) gtk_vbox_new (FALSE, 12); gtk_scrolled_window_add_with_viewport (win, GTK_WIDGET(vbox)); gtk_box_pack_start (GTK_BOX (vbox), GTK_WIDGET (table), FALSE, TRUE, 0); @@ -187,7 +184,7 @@ gw_track_message_status_cb (GtkAction *action, gtk_table_set_col_spacings (table ,12); gtk_table_set_row_spacings (table, 6); gtk_box_pack_start (GTK_BOX (vbox), GTK_WIDGET (table), FALSE, TRUE, 0); - cnc = get_cnc (folder->parent_store); + cnc = get_cnc (camel_folder_get_parent_store (folder)); if (E_IS_GW_CONNECTION(cnc)) { GSList *recipient_list; diff --git a/plugins/hula-account-setup/ChangeLog b/plugins/hula-account-setup/ChangeLog deleted file mode 100644 index 99def86394..0000000000 --- a/plugins/hula-account-setup/ChangeLog +++ /dev/null @@ -1,64 +0,0 @@ -2008-09-02 Sankar P <psankar@novell.com> - -License Changes - - * camel-hula-listener.c: - -2008-08-27 Sankar P <psankar@novell.com> - -License Changes - - * camel-hula-listener.h: - * hula-account-setup.c: - -2008-07-31 Matthew Barnes <mbarnes@redhat.com> - - ** Fixes part of bug #545568 - - * org-gnome-hula-account-setup.eplug.xml: - Add "system_plugin=true" so it's not shown in the Plugin Manager. - This plugin is not designed to be disabled by the user. - -2007-10-26 Kjartan Maraas <kmaraas@gnome.org> - - * camel-hula-listener.c: (camel_hula_listener_new): - ANSIfication of function declaration. - -2007-05-25 Matthew Barnes <mbarnes@redhat.com> - - * camel-hula-listener.c (remove_esource), (modify_esource): - Don't assume the relative URI is non-NULL (#427232). - -2006-09-18 Matthew Barnes <mbarnes@redhat.com> - - * camel-hula-listener.c: (finalize) - Chain up to parent's finalize() method. - -2006-01-09 Kjartan Maraas <kmaraas@gnome.org> - - * camel-hula-listener.c: (is_hula_caldav_account), (add_esource), - (modify_esource), (account_added), (account_removed), - (account_changed): Try to fix caldav and normal account setup. This - definitely needs review. - -2006-01-06 Simon Zheng <simon.zheng@sun.com> - - * camel-hula-listener.c: - * camel-hula-listener.h: - use libedataserver/e-account-list.h instead of e-util/e-account-list.h. - use libedataserver/e-account.h instead of e-util/e-account.h. - -2005-12-12 Harish Krishnaswamy <kharish@novell.com> - - * Makefile.am: Fix make-clean issues. - -2005-12-07 Funda Wang <fundawang@linux.net.cn> - - * org-gnome-evolution-hula-account-setup.eplug.xml: i18nlized. - -2005-11-14 Harish Krishnaswamy <kharish@novell.com> - - * Makefile.am, camel-hula-listener.[ch], hula-account-setup.c, - org-gnome-evolution-hula-account-setup.eplug.xml: Hula Account - setup - initial commits. - diff --git a/plugins/hula-account-setup/Makefile.am b/plugins/hula-account-setup/Makefile.am deleted file mode 100644 index 8997f5b48e..0000000000 --- a/plugins/hula-account-setup/Makefile.am +++ /dev/null @@ -1,35 +0,0 @@ -@EVO_PLUGIN_RULE@ - -plugin_DATA = org-gnome-evolution-hula-account-setup.eplug - -plugin_LTLIBRARIES = liborg-gnome-evolution-hula-account-setup.la - -liborg_gnome_evolution_hula_account_setup_la_CPPFLAGS = \ - $(AM_CPPFLAGS) \ - -I$(top_srcdir) \ - $(GNOME_PLATFORM_CFLAGS) \ - $(EVOLUTION_MAIL_CFLAGS) \ - $(EVOLUTION_CALENDAR_CFLAGS) \ - -DEVOLUTION_UIDIR=\""$(uidir)"\" - -liborg_gnome_evolution_hula_account_setup_la_SOURCES = \ - camel-hula-listener.c \ - camel-hula-listener.h \ - hula-account-setup.c - -liborg_gnome_evolution_hula_account_setup_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED) - -liborg_gnome_evolution_hula_account_setup_la_LIBADD= \ - $(top_builddir)/e-util/libeutil.la \ - $(top_builddir)/widgets/misc/libemiscwidgets.la \ - $(top_builddir)/filter/libfilter.la \ - $(EVOLUTION_CALENDAR_LIBS) \ - $(EVOLUTION_MAIL_LIBS) \ - $(GNOME_PLATFORM_LIBS) - -EXTRA_DIST = org-gnome-evolution-hula-account-setup.eplug.xml - -BUILT_SOURCES = $(plugin_DATA) -CLEANFILES = $(BUILT_SOURCES) - --include $(top_srcdir)/git.mk diff --git a/plugins/hula-account-setup/camel-hula-listener.c b/plugins/hula-account-setup/camel-hula-listener.c deleted file mode 100644 index 3b1c3bfb43..0000000000 --- a/plugins/hula-account-setup/camel-hula-listener.c +++ /dev/null @@ -1,594 +0,0 @@ -/* - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) version 3. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> - * - * - * Authors: - * Harish Krishnaswamy <kharish@novell.com> - * - * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) - * - */ - -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif - -#include <string.h> -#include <camel/camel-i18n.h> -#include <libedataserverui/e-passwords.h> -#include <libedataserver/e-account.h> -#include "camel-hula-listener.h" - -static GList *hula_accounts = NULL; - -struct _CamelHulaListenerPrivate { - GConfClient *gconf_client; - /* we get notification about mail account changes form this object */ - EAccountList *account_list; -}; - -struct _HulaAccountInfo { - gchar *uid; - gchar *name; - gchar *source_url; -}; - -typedef struct _HulaAccountInfo HulaAccountInfo; - -#define HULA_CALDAV_URI_PREFIX "caldav://" -#define HULA_CALDAV_PREFIX_LENGTH 9 -#define HULA_URI_PREFIX "hula://" -#define HULA_PREFIX_LENGTH 7 -#define PARENT_TYPE G_TYPE_OBJECT - -static GObjectClass *parent_class = NULL; - -static void dispose (GObject *object); -static void finalize (GObject *object); - -static void -camel_hula_listener_class_init (CamelHulaListenerClass *class) -{ - GObjectClass *object_class; - - parent_class = g_type_class_ref (PARENT_TYPE); - object_class = G_OBJECT_CLASS (class); - - /* virtual method override */ - object_class->dispose = dispose; - object_class->finalize = finalize; -} - -static void -camel_hula_listener_init (CamelHulaListener *config_listener, CamelHulaListenerClass *class) -{ - config_listener->priv = g_new0 (CamelHulaListenerPrivate, 1); -} - -static void -dispose (GObject *object) -{ - CamelHulaListener *config_listener = CAMEL_HULA_LISTENER (object); - - g_object_unref (config_listener->priv->gconf_client); - g_object_unref (config_listener->priv->account_list); - - G_OBJECT_CLASS (parent_class)->dispose (object); -} - -static void -finalize (GObject *object) -{ - CamelHulaListener *config_listener = CAMEL_HULA_LISTENER (object); - GList *list; - HulaAccountInfo *info; - - if (config_listener->priv) { - g_free (config_listener->priv); - } - - for ( list = g_list_first (hula_accounts); list; list = g_list_next (list) ) { - - info = (HulaAccountInfo *) (list->data); - - if (info) { - - g_free (info->uid); - g_free (info->name); - g_free (info->source_url); - g_free (info); - } - } - - g_list_free (hula_accounts); - - G_OBJECT_CLASS (parent_class)->finalize (object); -} - -/*determines whehter the passed in account is hula or not by looking at source url */ - -static gboolean -is_hula_account (EAccount *account) -{ - if (account->source->url != NULL) { - return (strncmp (account->source->url, HULA_URI_PREFIX, HULA_PREFIX_LENGTH ) == 0); - } else { - return FALSE; - } -} - -static gboolean -is_hula_caldav_account (EAccount *account) -{ - if (account->source->url != NULL) { - return (strncmp (account->source->url, HULA_CALDAV_URI_PREFIX, HULA_CALDAV_PREFIX_LENGTH ) == 0); - } else { - return FALSE; - } -} - -/* looks up for an existing hula account info in the hula_accounts list based on uid */ - -static HulaAccountInfo* -lookup_account_info (const gchar *key) -{ - GList *list; - HulaAccountInfo *info; - gint found = 0; - - if (!key) - return NULL; - - info = NULL; - - for (list = g_list_first (hula_accounts); list; list = g_list_next (list)) { - info = (HulaAccountInfo *) (list->data); - found = (strcmp (info->uid, key) == 0); - if (found) - break; - } - if (found) - return info; - return NULL; -} - -#define CALENDAR_SOURCES "/apps/evolution/calendar/sources" -#define SELECTED_CALENDARS "/apps/evolution/calendar/display/selected_calendars" - -static void -add_esource (const gchar *conf_key, const gchar *group_name, const gchar *source_name, CamelURL *url) -{ - ESourceList *source_list; - ESourceGroup *group; - ESource *source; - GConfClient *client; - GSList *ids, *temp; - gboolean result; - const gchar *source_selection_key; - gchar *relative_uri; - const gchar *cal_port = "8081"; - /* const gchar *use_ssl = ""; */ - /* offline_sync to come soon */ - - /* TODO use_ssl = camel_url_get_param (url, "use_ssl"); */ - - client = gconf_client_get_default(); - if (!client) { - g_message ("could not get a valid gconf client\n"); - return; - } - source_list = e_source_list_new_for_gconf (client, conf_key); - - group = e_source_group_new (group_name, HULA_CALDAV_URI_PREFIX); - result = e_source_list_add_group (source_list, group, -1); - - if (result == FALSE) { - g_warning ("Could not add Hula source group!"); - } else { - e_source_list_sync (source_list, NULL); - } - - /* caldav://localhost:8081/dav/kharish/calendar/Personal */ - - relative_uri = g_strdup_printf ("%s@%s:%s/dav/%s/calendar/Personal", url->user, url->host, cal_port, url->user); - g_message ("Relative uri is %s\n", relative_uri); - - source = e_source_new (source_name, relative_uri); - /* e_source_set_property (source, "port", camel_url_get_param (url, - * "port")); - e_source_set_property (source, "auth-domain", "Hula"); - e_source_set_property (source, "use_ssl", use_ssl); */ - e_source_group_add_source (group, source, -1); - e_source_list_sync (source_list, NULL); - - if (!strcmp (conf_key, CALENDAR_SOURCES)) - source_selection_key = SELECTED_CALENDARS; - else source_selection_key = NULL; - if (source_selection_key) { - ids = gconf_client_get_list (client, source_selection_key , GCONF_VALUE_STRING, NULL); - ids = g_slist_append (ids, g_strdup (e_source_peek_uid (source))); - gconf_client_set_list (client, source_selection_key, GCONF_VALUE_STRING, ids, NULL); - temp = ids; - for (; temp != NULL; temp = g_slist_next (temp)) - g_free (temp->data); - g_slist_free (ids); - } - - g_object_unref (source); - g_object_unref (group); - g_object_unref (source_list); - g_object_unref (client); - g_free (relative_uri); -} - -static void -remove_esource (const gchar *conf_key, const gchar *group_name, gchar * source_name, const gchar * relative_uri) -{ - ESourceList *list; - GSList *groups; - gboolean found_group; - GConfClient* client; - GSList *ids; - GSList *node_tobe_deleted; - const gchar *source_selection_key; - - client = gconf_client_get_default(); - list = e_source_list_new_for_gconf (client, conf_key); - groups = e_source_list_peek_groups (list); - - found_group = FALSE; - - for (; groups != NULL && !found_group; groups = g_slist_next (groups)) { - ESourceGroup *group = E_SOURCE_GROUP (groups->data); - - if (strcmp (e_source_group_peek_name (group), group_name) == 0 && - strcmp (e_source_group_peek_base_uri (group), HULA_CALDAV_URI_PREFIX ) == 0) { - GSList *sources = e_source_group_peek_sources (group); - - for (; sources != NULL; sources = g_slist_next (sources)) { - ESource *source = E_SOURCE (sources->data); - const gchar *source_relative_uri; - - source_relative_uri = e_source_peek_relative_uri (source); - if (source_relative_uri == NULL) - continue; - if (strcmp (source_relative_uri, relative_uri) == 0) { - - if (!strcmp (conf_key, CALENDAR_SOURCES)) - source_selection_key = SELECTED_CALENDARS; - else source_selection_key = NULL; - if (source_selection_key) { - ids = gconf_client_get_list (client, source_selection_key , - GCONF_VALUE_STRING, NULL); - node_tobe_deleted = g_slist_find_custom (ids, e_source_peek_uid (source), (GCompareFunc) strcmp); - if (node_tobe_deleted) { - g_free (node_tobe_deleted->data); - ids = g_slist_delete_link (ids, node_tobe_deleted); - } - gconf_client_set_list (client, source_selection_key, - GCONF_VALUE_STRING, ids, NULL); - - } - e_source_list_remove_group (list, group); - e_source_list_sync (list, NULL); - found_group = TRUE; - break; - - } - } - - } - - } - - g_object_unref (list); - g_object_unref (client); - -} - -/* looks for e-source with the same info as old_account_info and changes its values to the values passed in */ - -static void -modify_esource (const gchar * conf_key, HulaAccountInfo *old_account_info, const gchar * new_group_name, CamelURL *new_url) -{ - ESourceList *list; - GSList *groups; - gchar *old_relative_uri; - CamelURL *url; - gboolean found_group; - GConfClient* client; - - url = camel_url_new (old_account_info->source_url, NULL); - if (!url->host || strlen (url->host) ==0) - return; - - old_relative_uri = g_strdup_printf ("%s@%s:%d/dav/%s/calendar/Personal", url->user, url->host, url->port, url->user); - client = gconf_client_get_default (); - list = e_source_list_new_for_gconf (client, conf_key); - groups = e_source_list_peek_groups (list); - - found_group = FALSE; - - for (; groups != NULL && !found_group; groups = g_slist_next (groups)) { - - ESourceGroup *group = E_SOURCE_GROUP (groups->data); - - if (strcmp (e_source_group_peek_name (group), old_account_info->name) == 0 && - strcmp (e_source_group_peek_base_uri (group), HULA_CALDAV_URI_PREFIX) == 0) { - GSList *sources = e_source_group_peek_sources (group); - - for (; sources != NULL; sources = g_slist_next (sources)) { - ESource *source = E_SOURCE (sources->data); - const gchar *source_relative_uri; - - source_relative_uri = e_source_peek_relative_uri (source); - if (source_relative_uri == NULL) - continue; - if (strcmp (source_relative_uri, old_relative_uri) == 0) { - gchar *new_relative_uri; - - new_relative_uri = g_strdup_printf ("%s@%s:%d/dav/%s/calendar/Personal", new_url->user, new_url->host, new_url->port, new_url->user); - e_source_group_set_name (group, new_group_name); - e_source_set_relative_uri (source, new_relative_uri); - e_source_set_property (source, "username", new_url->user); - e_source_set_property (source, "port", camel_url_get_param (new_url,"port")); - e_source_set_property (source, "use_ssl", camel_url_get_param (url, "use_ssl")); - e_source_list_sync (list, NULL); - found_group = TRUE; - g_free (new_relative_uri); - break; - } - } - } - } - - g_object_unref (list); - g_object_unref (client); - camel_url_free (url); - g_free (old_relative_uri); - -} -/* add sources for calendar if the account added is HULA account - adds the new account info to HULA accounts list */ - -static void -add_calendar_sources (HulaAccountInfo *info) -{ - CamelURL *url; - - url = camel_url_new (info->source_url, NULL); - add_esource ("/apps/evolution/calendar/sources", info->name, _("Calendar"), url); - - camel_url_free (url); - -} - -/* removes calendar sources if the account removed is HULA account - removes the the account info from HULA_account list */ - -static void -remove_calendar_sources (HulaAccountInfo *info) -{ - CamelURL *url; - gchar *relative_uri; - const gchar *address; - const gchar *caldav_port; - - url = camel_url_new (info->source_url, NULL); - - address = url->host; - if (!address || strlen (address) ==0) - return; - - caldav_port = camel_url_get_param (url, "caldav_port"); - if (!caldav_port || strlen (caldav_port) == 0) - caldav_port = "8081"; - - relative_uri = g_strdup_printf ("%s@%s:%s/dav/%s/calendar/Personal", url->user, url->host, caldav_port, url->user); - remove_esource ("/apps/evolution/calendar/sources", info->name, _("Calendar"), relative_uri); - camel_url_free (url); - g_free (relative_uri); - -} - -static void -account_added (EAccountList *account_listener, EAccount *account) -{ - - HulaAccountInfo *info; - EAccount *parent; - - if (!is_hula_account (account) || !is_hula_caldav_account (account)) - return; - - info = g_new0 (HulaAccountInfo, 1); - info->uid = g_strdup (account->uid); - info->name = g_strdup (account->name); - info->source_url = g_strdup (account->source->url); - if (account->parent_uid) { - parent = (EAccount *)e_account_list_find (account_listener, E_ACCOUNT_FIND_UID, account->parent_uid); - - if (!parent) - return; - - } else - add_calendar_sources (info); - - hula_accounts = g_list_append (hula_accounts, info); -} - -static void -account_removed (EAccountList *account_listener, EAccount *account) -{ - HulaAccountInfo *info; - - if (!is_hula_account (account) || !is_hula_caldav_account (account)) - return; - - info = lookup_account_info (account->uid); - if (info == NULL) - return; - - remove_calendar_sources (info); - hula_accounts = g_list_remove (hula_accounts, info); - g_free (info->uid); - g_free (info->name); - g_free (info->source_url); - g_free (info); -} - -static void -account_changed (EAccountList *account_listener, EAccount *account) -{ - gboolean is_hula; - CamelURL *old_url, *new_url; - const gchar *old_caldav_port, *new_caldav_port; - HulaAccountInfo *existing_account_info; - const gchar *old_use_ssl, *new_use_ssl; - const gchar *old_address, *new_address; - - is_hula = is_hula_account (account); - if (is_hula == FALSE) - is_hula = is_hula_caldav_account (account); - - existing_account_info = lookup_account_info (account->uid); - - if (existing_account_info == NULL && is_hula) { - - if (!account->enabled) - return; - - /* some account of other type is changed to hula */ - account_added (account_listener, account); - - } else if (existing_account_info != NULL && !is_hula) { - - /* hula account is changed to some other type */ - remove_calendar_sources (existing_account_info); - hula_accounts = g_list_remove (hula_accounts, existing_account_info); - g_free (existing_account_info->uid); - g_free (existing_account_info->name); - g_free (existing_account_info->source_url); - g_free (existing_account_info); - - } else if (existing_account_info != NULL && is_hula) { - - if (!account->enabled) { - account_removed (account_listener, account); - return; - } - - /* some info of hula account is changed. update the sources with new info if required */ - old_url = camel_url_new (existing_account_info->source_url, NULL); - old_address = old_url->host; - old_caldav_port = camel_url_get_param (old_url, "caldav_port"); - old_use_ssl = camel_url_get_param (old_url, "use_ssl"); - new_url = camel_url_new (account->source->url, NULL); - new_address = new_url->host; - - if (!new_address || strlen (new_address) ==0) - return; - - new_caldav_port = camel_url_get_param (new_url, "caldav_port"); - - if (!new_caldav_port || strlen (new_caldav_port) == 0) - new_caldav_port = "8081"; - - new_use_ssl = camel_url_get_param (new_url, "use_ssl"); - - if ((old_address && strcmp (old_address, new_address)) - || (old_caldav_port && strcmp (old_caldav_port, new_caldav_port)) - || strcmp (old_url->user, new_url->user) - || strcmp (old_use_ssl, new_use_ssl)) { - - account_removed (account_listener, account); - account_added (account_listener, account); - } else if (strcmp (existing_account_info->name, account->name)) { - - modify_esource ("/apps/evolution/calendar/sources", existing_account_info, account->name, new_url); - - } - - g_free (existing_account_info->name); - g_free (existing_account_info->source_url); - existing_account_info->name = g_strdup (account->name); - existing_account_info->source_url = g_strdup (account->source->url); - camel_url_free (old_url); - camel_url_free (new_url); - } -} - -static void -camel_hula_listener_construct (CamelHulaListener *config_listener) -{ - EIterator *iter; - EAccount *account; - HulaAccountInfo *info; - - config_listener->priv->account_list = e_account_list_new (config_listener->priv->gconf_client); - - for ( iter = e_list_get_iterator (E_LIST ( config_listener->priv->account_list) ); e_iterator_is_valid (iter); e_iterator_next (iter) ) { - - account = E_ACCOUNT (e_iterator_get (iter)); - - if ( is_hula_account (account) && account->enabled) { - - info = g_new0 (HulaAccountInfo, 1); - info->uid = g_strdup (account->uid); - info->name = g_strdup (account->name); - info->source_url = g_strdup (account->source->url); - hula_accounts = g_list_append (hula_accounts, info); - - } - - } - g_signal_connect (config_listener->priv->account_list, "account_added", G_CALLBACK (account_added), NULL); - g_signal_connect (config_listener->priv->account_list, "account_changed", G_CALLBACK (account_changed), NULL); - g_signal_connect (config_listener->priv->account_list, "account_removed", G_CALLBACK (account_removed), NULL); -} - -GType -camel_hula_listener_get_type (void) -{ - static GType camel_hula_listener_type = 0; - - if (!camel_hula_listener_type) { - static GTypeInfo info = { - sizeof (CamelHulaListenerClass), - (GBaseInitFunc) NULL, - (GBaseFinalizeFunc) NULL, - (GClassInitFunc) camel_hula_listener_class_init, - NULL, NULL, - sizeof (CamelHulaListener), - 0, - (GInstanceInitFunc) camel_hula_listener_init - }; - camel_hula_listener_type = g_type_register_static (PARENT_TYPE, "CamelHulaListener", &info, 0); - } - - return camel_hula_listener_type; -} - -CamelHulaListener* -camel_hula_listener_new (void) -{ - CamelHulaListener *config_listener; - - config_listener = g_object_new (CAMEL_TYPE_HULA_LISTENER, NULL); - config_listener->priv->gconf_client = gconf_client_get_default(); - - camel_hula_listener_construct (config_listener); - - return config_listener; -} diff --git a/plugins/hula-account-setup/camel-hula-listener.h b/plugins/hula-account-setup/camel-hula-listener.h deleted file mode 100644 index 97c1b33919..0000000000 --- a/plugins/hula-account-setup/camel-hula-listener.h +++ /dev/null @@ -1,59 +0,0 @@ -/* - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) version 3. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> - * - * - * Authors: - * Harish Krishnaswamy <kharish@novell.com> - * - * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) - * - */ - -#ifndef CAMEL_HULA_LISTENER_H -#define CAMEL_HULA_LISTENER_H - -#include <libedataserver/e-account-list.h> -#include<libedataserver/e-source.h> -#include<libedataserver/e-source-list.h> -#include <camel/camel-url.h> - -G_BEGIN_DECLS - -#define CAMEL_TYPE_HULA_LISTENER (camel_hula_listener_get_type ()) -#define CAMEL_HULA_LISTENER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), CAMEL_TYPE_HULA_LISTENER, CamelHulaListener)) -#define CAMEL_HULA_LISTENER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), CAMEL_TYPE_HULA_LISTENER, CamelHULAListenerClass)) -#define CAMEL_IS_HULALISTENER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), CAMEL_TYPE_HULA_LISTENER)) -#define CAMEL_IS_HULA_LISTENER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), CAMEL_TYPE_HULA_LISTENER)) - -typedef struct _CamelHulaListener CamelHulaListener; -typedef struct _CamelHulaListenerClass CamelHulaListenerClass; -typedef struct _CamelHulaListenerPrivate CamelHulaListenerPrivate; - -struct _CamelHulaListener { - GObject parent; - - CamelHulaListenerPrivate *priv; -}; - -struct _CamelHulaListenerClass { - GObjectClass parent_class; -}; - -GType camel_hula_listener_get_type (void); -CamelHulaListener *camel_hula_listener_new (void); - -G_END_DECLS - -#endif diff --git a/plugins/hula-account-setup/hula-account-setup.c b/plugins/hula-account-setup/hula-account-setup.c deleted file mode 100644 index 34427f3b71..0000000000 --- a/plugins/hula-account-setup/hula-account-setup.c +++ /dev/null @@ -1,56 +0,0 @@ -/* - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) version 3. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> - * - * - * Authors: - * Harish Krishnaswamy <kharish@novell.com> - * - * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) - * - */ - -#include "camel-hula-listener.h" -#include <gtk/gtk.h> -#include "mail/em-config.h" - -static CamelHulaListener *config_listener = NULL; - -gint e_plugin_lib_enable (EPlugin *ep, gint enable); -GtkWidget* org_gnome_evolution_hula_account_setup (struct _EPlugin *epl, struct _EConfigHookItemFactoryData *data); - -static void -free_hula_listener ( void ) -{ - g_object_unref (config_listener); -} - -gint -e_plugin_lib_enable (EPlugin *ep, gint enable) -{ - if (!config_listener) { - config_listener = camel_hula_listener_new (); - g_atexit ( free_hula_listener ); - } - - return 0; -} - -GtkWidget * -org_gnome_evolution_hula_account_setup (struct _EPlugin *epl, struct _EConfigHookItemFactoryData *data) -{ - if (data->old) - return data->old; - return NULL; -} diff --git a/plugins/hula-account-setup/org-gnome-evolution-hula-account-setup.eplug.xml b/plugins/hula-account-setup/org-gnome-evolution-hula-account-setup.eplug.xml deleted file mode 100644 index e90ce650cb..0000000000 --- a/plugins/hula-account-setup/org-gnome-evolution-hula-account-setup.eplug.xml +++ /dev/null @@ -1,26 +0,0 @@ -<?xml version="1.0"?> -<e-plugin-list> - <e-plugin id="org.gnome.evolution.plugin.hula-account-setup" type="shlib" _name="Hula Support" - location="@PLUGINDIR@/liborg-gnome-evolution-hula-account-setup@SOEXT@" load-on-startup="true" system_plugin="true"> - <author name="Harish Krishnaswamy" email="kharish@novell.com"/> - <_description>Add Hula support to Evolution.</_description> - - <hook class="org.gnome.evolution.mail.config:1.0"> - <group target="account" id="org.gnome.evolution.mail.config.accountAssistant"> - <item type="item_table" path="20.receive_options/30.soapport/50.dummy" factory="org_gnome_evolution_hula_account_setup"/> - </group> - </hook> - <hook class="org.gnome.evolution.mail.config:1.0"> - <group target="account" id="org.gnome.evolution.mail.config.accountEditor"> - <item type="item_table" path="20.receive_options/30.soapport/50.dummy" factory="org_gnome_evolution_hula_account_setup"/> - </group> - </hook> - - <hook class="org.gnome.evolution.mail.config:1.0"> - <group target="account" id="org.gnome.evolution.mail.config.accountWizard"> - <item type="item_table" path="20.receive_options/30.soapport/50.dummy" factory="org_gnome_evolution_hula_account_setup"/> - </group> - </hook> - - </e-plugin> -</e-plugin-list> diff --git a/plugins/image-inline/image-inline.c b/plugins/image-inline/image-inline.c index 5ea1070afb..21688dbf94 100644 --- a/plugins/image-inline/image-inline.c +++ b/plugins/image-inline/image-inline.c @@ -26,9 +26,6 @@ #include <stdlib.h> #include <gtk/gtk.h> #include <glib/gi18n-lib.h> -#include <camel/camel-medium.h> -#include <camel/camel-mime-part.h> -#include <camel/camel-stream-mem.h> #include <gtkhtml/gtkhtml-embedded.h> #include <gtkimageview/gtkimagescrollwin.h> @@ -235,6 +232,7 @@ size_allocate_cb (GtkHTMLEmbedded *embedded, GtkAllocation *allocation, ImageInlinePObject *image_object) { + GtkAllocation image_allocation; GtkWidget *widget; gint pixbuf_width; gint pixbuf_height; @@ -243,7 +241,8 @@ size_allocate_cb (GtkHTMLEmbedded *embedded, gdouble zoom = 1.0; widget = GTK_WIDGET (image_object->object.format->html); - widget_width = widget->allocation.width - 12; + gtk_widget_get_allocation (widget, &image_allocation); + widget_width = image_allocation.width - 12; pixbuf_width = gdk_pixbuf_get_width (image_object->pixbuf); pixbuf_height = gdk_pixbuf_get_height (image_object->pixbuf); @@ -310,7 +309,7 @@ org_gnome_image_inline_pobject_free (EMFormatHTMLPObject *object) image_object = (ImageInlinePObject *) object; if (image_object->mime_part != NULL) { - camel_object_unref (image_object->mime_part); + g_object_unref (image_object->mime_part); image_object->mime_part = NULL; } @@ -360,7 +359,7 @@ org_gnome_image_inline_decode (ImageInlinePObject *image_object) /* Stream takes ownership of the byte array. */ stream = camel_stream_mem_new_with_byte_array (array); - data_wrapper = camel_medium_get_content_object (medium); + data_wrapper = camel_medium_get_content (medium); camel_data_wrapper_decode_to_stream (data_wrapper, stream); /* Don't trust the content type in the MIME part. It could @@ -390,7 +389,7 @@ org_gnome_image_inline_decode (ImageInlinePObject *image_object) } exit: - camel_object_unref (stream); + g_object_unref (stream); g_object_unref (loader); } @@ -459,7 +458,7 @@ org_gnome_image_inline_format (gpointer ep, EMFormatHookTarget *target) classid, target->part, org_gnome_image_inline_embed); - camel_object_ref (target->part); + g_object_ref (target->part); image_object->mime_part = target->part; image_object->object.free = org_gnome_image_inline_pobject_free; diff --git a/plugins/imap-features/ChangeLog b/plugins/imap-features/ChangeLog deleted file mode 100644 index 647f059f22..0000000000 --- a/plugins/imap-features/ChangeLog +++ /dev/null @@ -1,80 +0,0 @@ -2008-10-03 Sankar P <psankar@novell.com> - -License Changes - - * imap-headers.c: - -2008-01-18 Srinivasa Ragavan <sragavan@novell.com> - - * imap-headers.c: (imap_headers_commit), (org_gnome_imap_headers): - Such a useful IMAP plugin. But doesn't detect USE_IMAP for GW users. - Fixed it. - -2007-12-02 Tobias Mueller <tobiasmue@svn.gnome.org> - * imap-headers.glade: - Make it selectable, fixes bug 401523, patch by - Lucky Wankhede <wlakke@novell.com> - -2007-11-08 Gilles Dartiguelongue <gdartigu@svn.gnome.org> - - * imap-headers.c: (imap_headers_abort), (imap_headers_commit), - (epif_header_is_valid), (epif_add_sensitivity), (epif_add_header), - (epif_remove_header_clicked), (epif_fetch_all_headers_toggled), - (epif_entry_changed), (org_gnome_imap_headers): - * imap-headers.glade: - Remove useless GtkVBox, - remove the useless popup to have an inline header entry field, - concentrate all UI elements in a structure, added a prefix to - relevant functions. - -2007-07-30 Andre Klapper <a9016009@gmx.de> - - * imap-headers.glade: - remove "window1" string from translation - -2007-07-20 Johnny Jacob <jjohnny@novell.com> - - * imap-headers.c : (org_gnome_imap_headers) : - GtkTreeView should have a model. - Fixes #445248 - -2007-07-09 Sankar P <psankar@novell.com> - - * Committed on behalf of Gilles Dartiguelongue <dartigug@esiee.fr> - - * imap-headers.c: (add_header_clicked), (remove_header_clicked), - (org_gnome_imap_headers): - * imap-headers.glade: - HIGify. Disable the Delete button when there are no headers. - See bug #437892 - -2007-05-14 Sankar P <psankar@novell.com> - - ** Committed on behalf of Xiurong Simon Zheng <simon.zheng@sun.com> - - * imap-headers.c: - Evolution crashes when clicking "Edit" button - Fixes #425506 - -2007-01-30 Sankar P <psankar@novell.com> - - * imap-headers.c: (imap_headers_commit): - Fixes a memory leak and a scenario where, - some IMAP servers doesnt return headers if - the string contains more than one consecutive - embedded spaces in the HEADER. - -2007-01-27 Nickolay V. Shmyrev <nshmyrev@yandex.ru> - - * imap-headers.c: (org_gnome_imap_headers): - mark strings as translatable. See bug #399381 for details. - -2007-01-22 Sankar P <psankar@novell.com> - - * ChangeLog - * imap-headers.c - * imap-headers.glade - * Makefile.am - * org-gnome-imap-features.eplug.xml: - - Initial list of files for the imap-features plugin diff --git a/plugins/imap-features/imap-headers.c b/plugins/imap-features/imap-headers.c index df567aa020..910986e592 100644 --- a/plugins/imap-features/imap-headers.c +++ b/plugins/imap-features/imap-headers.c @@ -34,9 +34,6 @@ #include <e-util/e-util.h> #include <e-util/e-account-utils.h> -#include <camel/camel-url.h> -#include <camel/camel-exception.h> - #include <glib/gi18n.h> typedef struct _epif_data EPImapFeaturesData; @@ -62,6 +59,13 @@ static EPImapFeaturesData *ui = NULL; void imap_headers_abort (EPlugin *efp, EConfigHookItemFactoryData *data); void imap_headers_commit (EPlugin *efp, EConfigHookItemFactoryData *data); GtkWidget * org_gnome_imap_headers (EPlugin *epl, EConfigHookItemFactoryData *data); +gint e_plugin_lib_enable (EPlugin *ep, gint enable); + +gint +e_plugin_lib_enable (EPlugin *ep, gint enable) +{ + return 0; +} void imap_headers_abort (EPlugin *efp, EConfigHookItemFactoryData *data) diff --git a/plugins/itip-formatter/ChangeLog b/plugins/itip-formatter/ChangeLog deleted file mode 100644 index 2d07d56a14..0000000000 --- a/plugins/itip-formatter/ChangeLog +++ /dev/null @@ -1,1121 +0,0 @@ -2009-02-16 Milan Crha <mcrha@redhat.com> - - ** Fix for bug #571721 - - * itip-view.c: (itip_view_init): Added translators comment. - -2009-02-02 Srinivasa Ragavan <sragavan@novell.com> - - ** Fix for bug #548787 - - * itip-view.c (set_info_items), (itip_view_init), - (itip_view_set_source_list): Enable CnP for all the text info present - in calendar related messages. - -2009-01-21 Suman Manjunath <msuman@novell.com> - - ** Fix for bug #541209 - - ** Adapt to the new APIs from upstream libical. Changes made include - using the "_r" counterpart for the following APIs: - + icalproperty_as_ical_string () - + icalvalue_as_ical_string () - + icalcomponent_as_ical_string () - + icalparameter_as_ical_string () - + icaldurationtype_as_ical_string () - + icalenum_reqstat_code () - + icallangbind_property_eval_string () - + icallangbind_quote_as_ical () - + icalmime_text_end_part () - + icalperiodtype_as_ical_string () - + icalproperty_enum_to_string () - + icalproperty_get_parameter_as_string () - + icalproperty_get_value_as_string () - + icalproperty_get_property_name () - + icalrecurrencetype_as_string () - + icaltime_as_ical_string () - + icalreqstattype_as_string () - + icalvalue_binary_as_ical_string () - + icalvalue_int_as_ical_string () - + icalvalue_utcoffset_as_ical_string () - + icalvalue_string_as_ical_string () - + icalvalue_recur_as_ical_string () - + icalvalue_text_as_ical_string () - + icalvalue_attach_as_ical_string () - + icalvalue_duration_as_ical_string () - + icalvalue_date_as_ical_string () - + icalvalue_datetime_as_ical_string () - + icalvalue_float_as_ical_string () - + icalvalue_geo_as_ical_string () - + icalvalue_datetimeperiod_as_ical_string () - + icalvalue_period_as_ical_string () - + icalvalue_trigger_as_ical_string () - + icalvalue_as_ical_string () - - * itip-formatter.c (find_attendee), (find_to_address), - (find_from_address), (update_item): - -2009-01-19 Milan Crha <mcrha@redhat.com> - - ** Fix for bug #225712 - - * itip-view.h: - * itip-view.c: (itip_view_set_show_keep_alarm_check), - (itip_view_get_keep_alarm_check_state), - (itip_view_set_show_inherit_alarm_check), - (itip_view_get_inherit_alarm_check_state): New functions to new - options to either inherit reminder from the incoming event or to - preserve users reminders in already existing event in the calendar. - * itip-view.c: (struct _ItipViewPrivate), (alarm_check_toggled_cb), - (itip_view_init): Properly initialize new option's members. - * itip-formatter.c: (find_cal_opened_cb), (update_item), - (send_comp_to_attendee), (update_attendee_status), (send_item), - (extract_itip_data), (view_response_cb), (format_itip_object): - Setup new options based on the actual data. - -2008-11-28 Suman Manjunath <msuman@novell.com> - - ** Fix for bug #561467 - - * itip-formatter.c (update_x), (update_attendee_status): Copy - required X-* properties . This might be needed for special cases - in certain backends. - -2008-11-06 Patrick Ohly <patrick.ohly@gmx.de> - - ** Fix for bug #541121 - - * itip-formatter.c: don't allow sending a response to meeting - invitation replies - -2008-10-20 Milan Crha <mcrha@redhat.com> - - ** Fix for bug #514989 - - * itip-view.c: (format_date_and_time_x): - Calculate tomorrow from current time, not from the date to convert. - -2008-10-14 Srinivasa Ragavan <sragavan@novell.com> - - ** Fix for bug #550441 - - * itip-formatter.c: (view_response_cb): Ignore if summary not there. - -2008-10-13 Milan Crha <mcrha@redhat.com> - - ** Fix for bug #550441 - - * itip-formatter.c: (view_response_cb): - Use the proper functions to traverse messages in a folder's summary. - -2008-10-10 Patrick Ohly <patrick.ohly@gmx.de> - - ** #541121: improved itip formatter: allow replying to forwarded - and already imported invitations; honor RVSP flag in invitation - - * itip-formatter.c: the whole logic for "reply to organize" was - improved. - - If an organizer exists, replying is enabled. Sending a reply is - enabled by default if the event looks like a meeting (= has - attendees). The wish of the organizer to not get replies is - checked (previous Evolution releases ignored it); in this case the - default is to not send a reply. In all cases the user can override - the default. - -2008-10-08 Sankar P <psankar@novell.com> - -License Changes - - * itip-formatter.c: - -2008-10-03 Sankar P <psankar@novell.com> - -License Changes - - * itip-view.c: - -2008-10-01 Milan Crha <mcrha@redhat.com> - - ** Fix for bug #519491 - - * itip-view.c: (ensure_utf8), (itip_view_set_organizer), - (itip_view_set_organizer_sentby), (itip_view_set_attendee), - (itip_view_set_attendee_sentby), (itip_view_set_proxy), - (itip_view_set_delegator), (itip_view_set_summary), - (itip_view_set_location), (itip_view_set_status), - (itip_view_set_comment), (itip_view_set_description), - (itip_view_add_upper_info_item), (itip_view_add_lower_info_item): - Convert texts to valid UTF-8 texts before passing them to Gtk+ - functions which requires that. - -2008-09-24 Milan Crha <mcrha@redhat.com> - - ** Part of fix for bug #313225 - - * itip-formatter.c: (format_itip): Set the user flag '$has_cal' - on the message when formatting a calendar attachment. - -2008-08-27 Sankar P <psankar@novell.com> - -License Changes - - * itip-view.h: - -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 - - * itip-view.c: (itip_view_init): Word-wrap the summary if necessary; - expand also value-labels in the table, thus the text will be aligned - on the left; align action buttons on the left too. - -2008-07-17 Chenthill Palanisamy <pchenthill@novell.com> - - * itip-formatter.c: (view_response_cb): Added some - FIXME's for code cleanup. - -2008-07-16 Sankar P <psankar@novell.com> - - Pushing disk summary changes from the madagascar branch - - * itip-formatter.c (view_response_cb): - -2008-05-29 Milan Crha <mcrha@redhat.com> - - ** Fix for bug #535459 - - * itip-formatter.c: (extract_itip_data): - Do not use component when sanity check fails. - -2008-05-22 Matthew Barnes <mbarnes@redhat.com> - - ** Fixes part of bug #534360 - - * itip-view.c: - Migrate from deprecated GtkObject symbols to GObject equivalents. - -2008-04-30 Chenthill Palanisamy <pchenthill@novell.com> - - ** Fixes #338330 (bnc) - Internet Based Calendar Events Are Declined By Evolution/GroupWise - - * itip-formatter.c: (view_response_cb): - -2008-04-28 Srinivasa Ragavan <sragavan@novell.com> - - ** Fix for BNC bug #382687 - - * plugins/itip-formatter/itip-formatter.c: Don't download contents in - main thread, which causes deadlock - -2008-03-27 Milan Crha <mcrha@redhat.com> - - ** Fix for bug #523541 - - * itip-formatter.c: (find_server): - Do not leak memory returned by e_cal_component_get_recurid_as_string. - -2008-02-25 Chenthill Palanisamy <pchenthill@novell.com> - - * itip-formatter.c: (find_server), (update_attendee_status): Free - the memory returned by e_cal_component_get_recurid_as_string. - -2008-02-25 Chenthill Palanisamy <pchenthill@novell.com> - - Fixes#516408 - * itip-formatter.c (find_attendee), (find_to_address), - (find_from_address), (update_item): Free the memory returned - by libical. - -2008-02-20 Paul Bolle <pebolle@tiscali.nl> - - ** Follow up on bug #517072 - - * itip-view.c: (set_calendar_sender_text), (set_tasklist_sender_text), - (set_journal_sender_text): Properly escape text here too. - -2008-02-19 Paul Bolle <pebolle@tiscali.nl> - - ** Fix for bug #517072 - - * itip-view.c: (set_summary_text): - Properly escape summary text. - -2008-02-18 Milan Crha <mcrha@redhat.com> - - ** Part of fix for bug #515744 - - * itip-formatter.c: (idle_open_cb): Memory Leak fix. - -2008-02-05 Srinivasa Ragavan <sragavan@novell.com> - - ** Rewrite of itip-formatter bits. It was written around carrying - EMFormatHTMLPobject. But that would be freed just after the formatter - thread ends. So all the time, it was working on dead pointer. Now I - have made EMFormatPURI and carried it around well. It might need a - good review though. - - ** Fix for bug #468427 - Fixes a lot of crashes around itip-formatter. - - * itip-formatter.c: (find_to_address), (find_from_address), - (get_real_item), (adjust_item), (set_buttons_sensitive), - (cal_opened_cb), (start_calendar_server), - (start_calendar_server_by_uid), (source_selected_cb), - (find_cal_opened_cb), (find_server), (update_item), - (remove_delegate), (update_attendee_status), (send_item), - (set_itip_error), (extract_itip_data), (idle_open_cb), - (view_response_cb), (format_itip_object), (puri_free), - (format_itip), (itip_attachment_frame): - -2008-01-25 Milan Crha <mcrha@redhat.com> - - ** Fix for bug #475781 - - * itip-formatter.c: (format_itip_object): - Fix memory leaks around ECalComponentDateTime. - -2007-12-20 Matthew Barnes <mbarnes@redhat.com> - - ** Fixes part of bug #362638 - - * itip-formatter.c: - Use the new MailMsg API for messages. - -2007-12-04 Milan Crha <mcrha@redhat.com> - - ** Fix for bug #220846 - - * itip-view.h: - * itip-view.c: (itip_view_set_show_free_time_check), - (itip_view_get_free_time_check_state), (struct _ItipViewPrivate), - (itip_view_init): - * itip-formatter.c: (view_response_cb), (format_itip_object): - New option to accept meeting request as free time. - -2007-11-23 Milan Crha <mcrha@redhat.com> - - ** Fix for bug #458237 - - * itip-formatter.c: (start_calendar_server), (source_selected_cb): - Check for non-NULL source before using it to prevent a crash. - -2007-10-26 Kjartan Maraas <kmaraas@gnome.org> - - * itip-view.c: (itip_view_get_source_list), (itip_view_get_source), - (itip_view_get_rsvp_comment): Fix NULL vs FALSE warnings. - -2007-10-22 Matthew Barnes <mbarnes@redhat.com> - - ** Fixes part of bug #417999 - - * itip-view.c: - Use ESourceComboBox instead of ESourceOptionMenu (deprecated). - -2007-10-04 Milan Crha <mcrha@redhat.com> - - ** Fix for bug #331578 - - * itip-formatter.c: (struct _opencal_msg), (open_calendar_desc), - (open_calendar_do), (open_calendar_done), (open_calendar_free), - (struct _mail_msg_op open_calendar_op): - New functions and structures to run command line in other thread. - * itip-formatter.c: (idle_open_cb): - Run command line in other thread rather than in main thread. - -2007-10-03 Milan Crha <mcrha@redhat.com> - - ** Fix for bug #346146 - - * itip-view.h: (enum ItipViewMode): Added ITIP_VIEW_MODE_HIDE_ALL. - * itip-view.c: (set_buttons): Don't add buttons when in this mode. - * itip-formatter.c: (in_proper_folder): New helper function. - * itip-formatter.c: (format_itip_object): Check if the mail is in - proper folder and allow response in this case, otherwise only show - info from calendar and don't check in local calendar for anything. - -2007-10-01 Milan Crha <mcrha@redhat.com> - - ** Fix for bug #428402 - - * itip-formatter.c: (extract_itip_data): First move to next component, then - remove last alarm and then free that last component. - -2007-09-07 Chenthill Palanisamy <pchenthill@novell.com> - - Fixes #273417 - * itip-formatter.c: (idle_open_cb): Removed the base version - while invoking evolution calendar. - -2007-08-23 Milan Crha <mcrha@redhat.com> - - ** Fix for bug #329746 - - * itip-formatter.c: (send_item), (format_itip_object): - Marked strings to localize and renamed 'Journal' to 'Memo'. - * itip-formatter.c: (find_cal_opened_cb): - Renamed 'Journal' to 'Memo'. - -2007-08-21 Suman Manjunath <msuman@novell.com> - - ** Fix for bug #301835 (BNC) - - * itip-formatter.c: (find_from_address): - Fixed crash when no SENTBY parameter present. - -2007-08-06 Srinivasa Ragavan <sragavan@novell.com> - - ** Fix for bug #460326 - - * itip-formatter.c: (extract_itip_data): If the vcalendar isn't there - don't crash but report invalid. - -2007-07-20 Claude Paroz <claude@2xlibre.net> - - * itip-view.c: (set_tasklist_sender_text): Added omitted %s formatter. - -2007-07-09 Chenthill Palanisamy <pchenthill@novell.com> - - * itip-formatter.c: (format_itip_object): Fixed a build break. - -2007-07-09 Chenthill Palanisamy <pchenthill@novell.com> - - reviewed by: Veerapuram Varadhan <vvaradhan@novell.com> - - * itip-formatter.c: (find_attendee), (find_attendee_if_sentby): - Finds the address of the account owner in the attendees list. - (find_to_address), (find_from_address): Establishes the current - account id. - (extract_itip_data), (view_response_cb), (format_itip_object), - (pitip_free): Sets the corresponding itip-view components. - * itip-view.h: - * itip-view.c: (set_calendar_sender_text), - (set_tasklist_sender_text), (set_journal_sender_text), - (itip_view_destroy), (itip_view_set_organizer_sentby), - (itip_view_get_organizer_sentby), (itip_view_set_attendee_sentby), - (itip_view_get_attendee_sentby), (itip_view_set_proxy), - (itip_view_get_proxy): Sets the message appropriately in the itip-view. - - Committing on behalf of Suman Manjunath <msuman@novell.com> - -2006-09-14 Andre Klapper <a9016009@gmx.de> - - * itip-view.c: fix some bad mnemonics, mark string for - translation. Fixes bug #439186. - -2007-06-02 Matthew Barnes <mbarnes@redhat.com> - - * itip-formatter.c: Fix a compilation warning. (#437584) - Patch from Gilles Dartiguelongue. - -2007-05-11 Gilles Dartiguelongue <dartigug@esiee.fr> - - * itip-view.c: (set_one_button): Fixes casts, - fixes part of bug #437584. - -2007-04-19 Matthew Barnes <mbarnes@redhat.com> - - ** Fixes part of bug #429422 - - * itip-view.c (set_one_button): - e_gtk_button_new_with_icon() is dead; just do it manually. - - * itip-view.c (itip_view_class_init): - Use g_cclosure_marshal_VOID__INT instead of gtk_marshal_NONE__INT. - -2007-03-29 Matthew Barnes <mbarnes@redhat.com> - - * itip-formatter.c: - Fix "incompatible pointer type" warnings (#360619). - -2007-03-20 Matthew Barnes <mbarnes@redhat.com> - - ** Fixes part of bug #419524 - - * Include <glib/gi18n.h> instead of <libgnome/gnome-i18n.h>. - -2007-02-09 Sankar P <psankar@novell.com> - - * itip-formatter.c: (update_item), (view_response_cb): - Deletes all instances of a recurrence appointment as soon as the - invitation is accepted/declined adn applied-to-all. - Fixes #312301 - -2006-09-14 Andre Klapper <a9016009@gmx.de> - - * itip-view.c: correct display of time. Fixes bug #343686. - -2006-08-23 Srinivasa Ragavan <sragavan@novell.com> - - ** Fix for bug #347248 - - * itip-formatter.c: (update_item): Update the - em_utils_temp_save_part to use readwrite mode. - -2006-08-23 Matthew Barnes <mbarnes@redhat.com> - - * itip-formatter.c: - fix an uninitialized GError - fixes bug 352423. - -2006-08-23 Srinivasa Ragavan <sragavan@novell.com> - - ** Fix for bug #350395 by Øystein Gisnås - - * itip-view.c: (format_date_and_time_x): The patch adds some extra - checks to avoid the crash. - -2006-08-18 Chenthill Palanisamy <pchenthill@novell.com> - - Fixes #328268 - * itip-formatter.c: (start_calendar_server): Check - for the presence of ecal before connecting the signal. - -2006-08-11 Harish Krishnaswamy <kharish@novell.com> - - * itip-formatter.c: (send_comp_to_attendee): - Add missing argument in the call to itip_send_comp. - -2006-07-22 Chenthill Palanisamy <pchenthill@novell.com> - - * itip-formatter.c: (cal_opened_cb), (source_selected_cb), - (find_cal_opened_cb), (extract_itip_data), (view_response_cb), - (format_itip_object): - * itip-view.c: (set_journal_sender_text), (set_sender_text), - (set_buttons), (itip_view_set_source_list), - (itip_view_get_rsvp_comment), (itip_view_set_needs_decline): - * itip-view.h: Added support shared Memos. - -2006-07-06 Harish Krishnaswamy <kharish@novell.com> - - * itip-formatter.c: (format_itip_object): - Handle ICAL_X methods from Microsoft Live as - request methods. - -2006-06-19 Harish Krishnaswamy <kharish@novell.com> - - * itip-formatter.c (update_item): - Free GSList and its data after calling - e_cal_component_get_attachment_list. - -2006-06-16 Sankar P <psankar@novell.com> - - * itip-formatter.c: (view_response_cb): - Deletes a GroupWise appointment if accepted or deleted. - -2006-06-16 Chenthill Palanisamy <pchenthill@novell.com> - - Fixes #179774 (b.n.c) - * itip-formatter.c: (cal_opened_cb), (find_cal_opened_cb): - Reset the current_ecal and disable the buttons if the calendar - is not opened properly. - -2006-06-09 Chris Heath <chris@heathens.co.nz> - - * itip-view.c (itip_view_destroy): Fix memory leak. - Fixes bug #335423. - -2006-05-31 Chenthill Palanisamy <pchenthill@novell.com> - - Fixes #340296 - * itip-formatter.c: (cal_opened_cb), (start_calendar_server), - (find_cal_opened_cb): Set the default timezone before the calendar - is opened. - (find_server), (format_itip_object): If the mail account has the associated - calendar, then do not open all the calendars. Open the current calendar - and other calendars marked for conflict search. - -2006-02-14 Veerapuram Varadhan <vvaradhan@novell.com> - - * itip-formatter.c (itip_formatter_page_factory): A typo fix from - gfree to g_free. - -2006-02-12 Karsten Bräckelmann <guenther@rudersport.de> - - * itip-formatter.c (itip_formatter_page_factory): - Removing unnecessary markup in translateable string. - Fixes part of bug #272789. - -2006-02-11 Karsten Bräckelmann <guenther@rudersport.de> - - * itip-formatter.c (itip_formatter_page_factory): - Change a11y names. Fixes part of bug #330723. - -2006-01-09 Kjartan Maraas <kmaraas@gnome.org> - - * itip-formatter.c: (find_cal_opened_cb), (message_foreach_part), - (update_attendee_status), (view_response_cb), (check_is_instance), - (format_itip_object): Add some comments and remove unused code. - * itip-view.c: (itip_view_class_init), (recur_toggled_cb), - (itip_view_add_upper_info_item_printf), - (itip_view_add_lower_info_item_printf): Remove more cruft. - -2006-01-10 Simon Zheng <simon.zheng@sun.com> - - * itip-view.c: use e_utf8_strftime() in evolution-data-server/ - libedataserver/e-data-server-util.c instead of the copy in - evolution/e-util/e-util.c. - -2006-01-06 Andre Klapper <a9016009@gmx.de> - - * evolution/plugins/itip-formatter/itip-formatter.c: - * evolution/plugins/itip-formatter/itip-view.c: - changing "cancelled" (British English) - to "canceled" (American English). Fixes bug 325334. - -2006-01-06 Simon Zheng <simon.zheng@sun.com> - - * itip-formatter.c: - * itip-view.c: - use libedataserver/e-account-list.h instead of e-util/e-account-list.h. - use libedataserver/e-account.h instead of e-util/e-account.h. - -2006-01-02 Harish Krishnaswamy <kharish@novell.com> - - * itip-formatter.c: (source_selected_cb): - Check for static capability only if the ecal - already exists. Fixes another critical warning - crasher. - -2005-12-30 Andre Klapper <a9016009@gmx.de> - - * itip-formatter.c: added a missing word. Fixes bug 325128. - -2005-12-30 Andre Klapper <a9016009@gmx.de> - - * itip-formatter.c, itip-view.c: Marked missing strings translatable. - Fixes bug 313554 in CVS HEAD. - -2005-12-17 Tor Lillqvist <tml@novell.com> - - * itip-formatter.c: Use g_ascii_strcasecmp() instead of - g_strcasecmp(). - -2005-11-24 Tor Lillqvist <tml@novell.com> - - * itip-view.c: Drop extra inclusion of e-util/e-time-utils.h, - which is going away anyway. - -2005-11-07 Dinesh Layek <ldinesh@novell.com> - - Fixes #308752 - * itip-formatter.c: (itip_formatter_page_factory): changed the label - "Meetings and Tasks" as "Calendar and Tasks" - -2005-09-12 Chenthill Palanisamy <pchenthill@novell.com> - - Fixes #315345 - * itip-view.c: (format_date_and_time_x): Send the - month as it as without subtracting one. - -2005-08-29 Chenthill Palanisamy <pchenthill@novell.com> - - Fixes #313534 - * itip-formatter.c: (cal_opened_cb), (find_cal_opened_cb): - Moved the code to display recur check box to cal_opened_cb. - -2005-08-23 Not Zed <NotZed@Ximian.com> - - * itip-view.c: add missing headers. - -2005-08-21 Chenthill Palanisamy <pchenthill@novell.com> - - * itip-formatter.c: - (update_attendee_status): removed the unwanted brackets. - (format_itip_object): Applied the patch from - Christian Kellner <Christian.Kellner@scalix.com> which - fixes a memory leak and make deference of url - much simpler. - -2005-08-20 Carsten Guenther <carsten.guenther@scalix.com> - - * itip-formatter.c: (cal_opened_cb, final_cal_opened_cb): - Put back in warning messages about calendar not being opened. - -2005-08-18 Carsten Guenther <carsten.guenther@scalix.com> - - * itip-formatter.c: (update_attendee_status): NULL-terminate - calls to e_error_run; fixed typos in if-statement; some code - cleanup. - (cal_opened_cb, final_cal_opened_cb): Removed unnecessary - message about not being able to open the calendar. - -2005-08-11 Dinesh Layek <LDinesh@novell.com> - - Fixes #305627 - * itip-formatter.c: (format_itip_object): set the source calendar - of an appointment from the url information of CamelFolder. - -2005-08-09 Chenthill Palanisamy <pchenthill@novell.com> - - Fixes #307841 - * itip-formatter.c: (view_response_cb): Check - if the transparency is set and if not set it as - Opaque. - -2005-07-27 Vivek Jain <jvivek@novell.com> - - * itip-formatter.c : (update_item) - applied patch submitted by <tommi.komulainen@iki.fi> - do not send "cid:" to get the part. - check part for NULL before using it. - (message_foreach_part): do nothing if part is NULL - saves crash. - **Fixes #272632 - -2005-07-20 Chenthill Palanisamy <pchenthill@novell.com> - - * itip-formatter.c: (format_itip_object): Fixed a memory - leak and a crash when start date does is not present. - -2005-07-19 Chenthill Palanisamy <pchenthill@novell.com> - - * itip-formatter.c: - (source_selected_cb), (find_cal_opened_cb): Check if - the component is a recurring and show the recurring check box. - (view_response_cb): Set the MOD-TYPE property while accepting - all instances. - (check_is_instance): Checks if its a recurring event. - (format_itip_object): - (find_server): Set the recurrence id. - -2005-07-11 Harish Krishnaswamy <kharish@novell.com> - - * itip-formatter.c (source_selected_cb), - (find_cal_opened_cb), (extract_itip_data): enable the - 'Apply to all instances' option for gw recurrence instances. - (view_response_cb): embed X-GW-RECUR-INSTANCE-MOD-TYPE property in the - component to indicate whether the accept/decline status applies - to the instance or the entire group. - * itip-view.[ch]: (set_buttons), (recur_toggled_cb), (itip_view_init), - (itip_view_get_recur_check_state), (itip_view_set_show_recur_check): - utility methods to manipulate the recur_check widget. - -2005-06-27 Tor Lillqvist <tml@novell.com> - - * Makefile.am: Use NO_UNDEFINED. Link with more libraries. - -2005-06-20 Chenthill Palanisamy <pchenthill@novell.com> - - * itip-formatter.c: (find_my_address), (set_attendee), - (send_comp_to_attendee), (remove_delegate), - (update_attendee_status), (extract_itip_data), - (format_itip_object): Set the delegator address. If the - organizer refuses to add the new delegate, send a cancel - method to the delegate and request to the attendee. - * itip-view.h: - * itip-view.c: (set_calendar_sender_text), (itip_view_init), - (itip_view_get_show_rsvp), (itip_view_set_update), - (itip_view_get_update), (itip_view_set_show_update), - (itip_view_get_show_update): Added functions to show an - option to send updates to attendees. - * org-gnome-itip-formatter.error.xml: Added the error - message to add a new delegate. - -2005-06-18 Tor Lillqvist <tml@novell.com> - - * org-gnome-itip-formatter.eplug.xml: Use SOEXT. - -2005-05-16 Not Zed <NotZed@Ximian.com> - - * itip-formatter.c: moved e-error to e-util - -2005-05-11 Not Zed <NotZed@Ximian.com> - - * Makefile.am: setup cleanfiles & fix extra_dist - -2005-05-06 Not Zed <NotZed@Ximian.com> - - * org-gnome-itip-formatter.error.xml: s/-errors.xml/.error.xml/ - - * Makefile.am: - * org-gnome-itip-formatter.eplug.xml: s/.in/.xml/ & i18n. - -2005-04-08 Chenthill Palanisamy <pchenthill@novell.com> - - Fixes #74265 - * itip-view.c (format_date_and_time_x): In time_days_in_month - the months are indexed from 0, so subtract one from the month - argument and send it. - -2005-04-07 JP Rosevear <jpr@novell.com> - - Fixes #74291 - - * itip-view.c (itip_view_init): remove comment to re-enable - description display - -2005-03-31 JP Rosevear <jpr@novell.com> - - Fixes #73844 - - * itip-formatter.c (extract_itip_data): make sure we check the - kind of the correct item - -2005-03-30 Li Yuan <li.yuan@sun.com> - - * itip-formatter.c: (itip_formatter_page_factory): - add a11y name to Conflict Search Table - Fixes #73914 - -2005-03-11 JP Rosevear <jpr@novell.com> - - * itip-formatter.c (extract_itip_data): set the type appropriately - so that assigned tasks can be handled - -2005-02-24 Björn Torkelsson <torkel@acc.umu.se> - - * org-gnome-itip-formatter.eplug.in: Added author and description. - s/bbdb/itip/ - Added xml tag. - -2005-02-07 JP Rosevear <jpr@novell.com> - - * org-gnome-itip-formatter.eplug.in: specify id for config page - -2005-03-03 Rodney Dawes <dobey@novell.com> - - * itip-view.c (itip_view_init): Set the spacing for ourself to 12 - to be HIG compliant as we are a GtkHBox derivative - Align the icon at 0.5 in the X direction to be HIG compliant - Set the spacing between table rows/columns to be HIG compliant - Fix the spacing/padding for all the boxes and packing calls to be - HIG compliant - - Fixes #41235 - -2005-02-02 Chenthill Palanisamy <pchenthill@novell.com> - - reviewed by Harish Krishnaswamy <kharish@novell.com> - - Fixes #71460 - * itip-formatter.c: (view_response_cb): If the my_address - is not set. Set it from the backend. - -2005-01-27 JP Rosevear <jpr@novell.com> - - * itip-view.c (format_date_and_time_x): make tomorrow and this - week strings work properly - -2005-01-27 JP Rosevear <jpr@novell.com> - - * itip-formatter.c (find_cal_opened_cb): remove debug test - -442005-01-27 JP Rosevear <jpr@novell.com> - - * itip-formatter.c: add some debugging spew - -2005-01-27 Rodrigo Moya <rodrigo@novell.com> - - * itip-formatter.c (update_attendee_status): deal with the itip - message having an individual instance. - -2005-01-26 JP Rosevear <jpr@novell.com> - - Fixes #71485 - - * itip-formatter.c (update_attendee_status): fix message paste-o - - * itip-view.c (format_date_and_time_x): improve translator - comments - -2005-01-25 JP Rosevear <jpr@novell.com> - - * itip-formatter.c (pitip_free): actually destroy the client - hashes so the signals get cleaned up - (format_itip): create a proper unique classid for the pobject - -2005-01-14 JP Rosevear <jpr@novell.com> - - * itip-formatter.c (extract_itip_data): use - camel_data_wrapper_decode_to_stream instead of - camel_data_wrapper_write_to_stream - -2005-01-14 JP Rosevear <jpr@novell.com> - - * itip-formatter.c (format_itip_object): handle UTC dtstart/dtend - properly - -2005-01-11 JP Rosevear <jpr@novell.com> - - Fixes #29985 - - * itip-formatter.c (view_response_cb): set the message flags to - answered if we send successfully - -2005-01-11 Harish Krishnaswamy <kharish@novell.com> - - * itip-formatter.c (update_item): Fixed a compiler warning. - -2005-01-10 JP Rosevear <jpr@novell.com> - - * itip-formatter.c (update_item): set to the new items, duh - -2005-01-10 JP Rosevear <jpr@novell.com> - - * itip-formatter.c (update_item): compare pointers instead of - content id - -2005-01-10 JP Rosevear <jpr@novell.com> - - * itip-formatter.c (update_item): first crack at saving - attachments for the backend - (extract_itip_data): tell the user what to do for more than one - attachment - -2005-01-09 JP Rosevear <jpr@novell.com> - - * itip-view.h: remove error mode - - * itip-formatter.c (set_itip_error): show error information to the - user - (extract_itip_data): use above - (format_itip_object): no more "error" mode - -2005-01-09 JP Rosevear <jpr@novell.com> - - * itip-view.c (itip_view_set_delegator): accessor - (itip_view_get_delegator): ditto - - * itip-view.h: new protos - - * itip-formatter.c (extract_itip_data): put delegate sections back - in and handle default reminder - (format_itip_object): set the delegator for requests, find the - delegator calendar if necessary - -2005-01-09 JP Rosevear <jpr@novell.com> - - * itip-formatter.c (idle_open_cb): launch an evolution window - pointing at the calendar date of the appointment - (view_response_cb): use it - -2005-01-09 JP Rosevear <jpr@novell.com> - - * itip-formatter.c (find_cal_opened_cb): only check for conflicts - if the source has the conflict property - (initialize_selection): select the "conflict" sources in the - selector - (source_selection_changed): update the source properties - (itip_formatter_page_factory): include the source selector for - selecting conflict checking calendars - -2005-01-08 Harish Krishnaswamy <kharish@novell.com> - - * itip-formatter.c: (send_item), (view_response_cb): - update itip_send_comp calls with the new prototype. - -2005-01-07 JP Rosevear <jpr@novell.com> - - * itip-view.h: new protos - - * itip-view.c (set_tasklist_sender_text): task sender messages - (set_calendar_sender_text): calendar sender messages - (set_sender_text): select above as appropriate - (itip_view_set_item_type): accessor - (itip_view_get_item_type): ditto - - * itip-formatter.c (find_cal_opened_cb): messages for - meetings/tasks/journals - (send_item): ditto - (format_itip_object): ditto - (itip_formatter_page_factory): change page title - -2005-01-07 JP Rosevear <jpr@novell.com> - - * itip-formatter.c (view_response_cb): ensure there is only one - attendee in the RSVP even if the user is duplicated - -2005-01-07 JP Rosevear <jpr@novell.com> - - * itip-view.h: protos - - * itip-view.c (rsvp_toggled_cb): set comment sensitivity - (itip_view_init): add comment entry - (itip_view_set_rsvp): make comment entry sensitive when rsvp is - (itip_view_set_rsvp_comment): accessor - (itip_view_get_rsvp_comment): ditto - - * itip-formatter.c (find_cal_opened_cb): set error message if we - can't find the item - (view_response_cb): add comment if the user sets one - -2005-01-07 JP Rosevear <jpr@novell.com> - - * itip-view.h: add protos - - * itip-view.c (set_sender_text): update descriptions better - (set_status_text): show/hide status - (set_comment_text): show/hide comment - (set_buttons): update buttons for add an refresh - (itip_view_destroy): free comment/status - (itip_view_init): add status/comment widgets - (itip_view_set_status): accessor - (itip_view_get_status): ditto - (itip_view_set_comment): ditto - (itip_view_get_comment): ditto - - * itip-formatter.c (find_cal_opened_cb): make sure rsvp is off for - publish - (format_itip_object): decline counter is sent by an organizer; set - status and comment when appropriate - -2005-01-05 Rodney Dawes <dobey@novell.com> - - * Makefile.am: Dist the errors data properly, and add the .eplug - output file to BUILT_SOURCES - -2005-01-03 Rodney Dawes <dobey@novell.com> - - * itip-formatter.c (format_itip_object): Don't do set_usize () - on the container - -2005-01-03 JP Rosevear <jpr@novell.com> - - * itip-formatter.c (format_itip_object): load accounts - -2005-01-03 JP Rosevear <jpr@novell.com> - - * org-gnome-itip-formatter-errors.xml: remove unused message - - * itip-formatter.c (update_item): use info item, not e-error - -2005-01-03 JP Rosevear <jpr@novell.com> - - * itip-formatter.c (view_response_cb): implement cancel - (update_item): add cancel info item - -2005-01-03 JP Rosevear <jpr@novell.com> - - * itip-view.c (itip_view_add_upper_info_item_printf): utility - routine to make it easier to add info items - (itip_view_add_lower_info_item_printf): ditto - - * itip-view.h: new protos - - * itip-formatter.c: use new printf routines everyhwere it makes - sense - -2005-01-03 JP Rosevear <jpr@novell.com> - - * itip-formatter.c (find_cal_opened_cb): move the adjust item work - here when we actually have the calendar - (pitip_free): implement a free function - (find_cal_opened_cb): check the methods instead of the show - selector member - (find_cal_opened_cb): default to true for the rsvp setting - -2005-01-03 JP Rosevear <jpr@novell.com> - - * itip-view.h: add response enums - - * itip-view.c (set_buttons): fiddle with button names and response enums - - * itip-formatter.c (find_server): don't include our uid in the - conflicts search - (update_attendee_status): update the status of the attendee and - save it out - (adjust_item): get relevant properties for items that might - contain them if sent from an attendee - (get_real_item): get the actual, current item - (send_item): send the item - (view_response_cb): handle REPLY and REFRESH requests - (format_itip_object): adjust the item if necessary and set the - attendee for reply/refresh; prevent crash if no description - (pitip_free): skeleton free function - (format_itip): load delete message setting - (delete_toggled_cb): set delete message setting based on toggle - (itip_formatter_page_factory): make the delete message check box - work - - * Makefile.am: install e-error messages - -2005-01-03 JP Rosevear <jpr@novell.com> - - * itip-view.h: new protos, signal - - * itip-view.c (set_info_items): be more generic so both upper and - lower setting can use it - (set_upper_info_items): set the upper info items - (set_lower_info_items): ditto for lower items - (itip_view_destroy): clear both sets of info items - (itip_view_class_init): add source selected signalo - (itip_view_init): add separate upper and lower info item areas and - a detail area - (itip_view_add_upper_info_item): add upper info item - (itip_view_remove_upper_info_item): remove a singal upper area - info item - (itip_view_clear_upper_info_items): clear them all - (itip_view_add_lower_info_item): as above - (itip_view_remove_lower_info_item): ditto - (itip_view_clear_lower_info_items): ditto - (source_selected_cb): emit the source selected signal when the - source in the option menu changes - (itip_view_set_source_list): take a source list and create an - e-source-option-menu if its non-null - (itip_view_get_source_list): get source list - (itip_view_set_source): set a specific source in the source option - menu - (itip_view_get_source): obtain that source - (itip_view_set_rsvp): get the rsvp status - (itip_view_get_rsvp): set it - (itip_view_set_show_rsvp): set visibility of rsvp check box - (itip_view_get_show_rsvp): get the visibility of rsvp check box - (itip_view_set_buttons_sensitive): set button sensitivity - (itip_view_get_buttons_sensitive): get button sensitivity - - * itip-formatter.c (find_my_address): find the user's address in - the list of attendees - (set_buttons_sensitive): set the action buttons sensitivity - appropriately - (cal_opened_cb): use above - (start_calendar_server): ditto - (start_calendar_server_by_uid): de-sensitize buttons to start - (source_selected_cb): ditto - (find_cal_opened_cb): check for conflicting appointments; set - informative info area items - (find_server): create the sexp for determining conflicts - (update_item): oset informative info area items - (view_response_cb): implement some of the responses, start on - implementing rsvp - (format_itip_object): load the source lists properly - -2004-12-29 JP Rosevear <jpr@novell.com> - - * itip-view.h: new protos - - * itip-view.c (format_date_and_time_x): don't draw the leading - zero in 12hr clock mode for the hour - (set_sender_text): make intro statements closer to the UI design - (set_description_text): display description - (set_info_items): show info items, messages with icons - (set_progress_text): show progress text item (for - loading/searching calendars) - (set_one_button): add a response button - (set_buttons): set response buttons based on mode - (itip_view_destroy): clear info items - (itip_view_class_init): add response signal - (itip_view_init): new areas for description, info items, buttons - (itip_view_set_description): accessor - (itip_view_get_description): ditto - (itip_view_add_info_item): add an info item to the display - (itip_view_clear_info_items): clear all items - (itip_view_set_progress): set the progress message - - * itip-formatter.c: move over calendar loading, searching code, - set more itip view properties - - * org-gnome-itip-formatter.eplug.in: add a config page item, - doesn't do much right now - -2004-12-22 JP Rosevear <jpr@novell.com> - - * Initial checkin of new itip formatter - diff --git a/plugins/itip-formatter/itip-formatter.c b/plugins/itip-formatter/itip-formatter.c index 526af07b1a..c2e38464ec 100644 --- a/plugins/itip-formatter/itip-formatter.c +++ b/plugins/itip-formatter/itip-formatter.c @@ -29,17 +29,6 @@ #include <gtk/gtk.h> #include <glib/gi18n.h> #include <gconf/gconf-client.h> -#include <camel/camel-stream.h> -#include <camel/camel-stream-mem.h> -#include <camel/camel-medium.h> -#include <camel/camel-mime-utils.h> -#include <camel/camel-mime-message.h> -#include <camel/camel-folder.h> -#include <camel/camel-vee-folder.h> -#include <camel/camel-multipart.h> -#include <camel/camel-service.h> -#include <camel/camel-store.h> -#include <camel/camel-db.h> #include <libecal/e-cal.h> #include <libecal/e-cal-time-util.h> #include <libedataserverui/e-source-selector.h> @@ -144,6 +133,7 @@ struct _itip_puri { void format_itip (EPlugin *ep, EMFormatHookTarget *target); GtkWidget *itip_formatter_page_factory (EPlugin *ep, EConfigHookItemFactoryData *hook_data); static void itip_attachment_frame(EMFormat *emf, CamelStream *stream, EMFormatPURI *puri); +gint e_plugin_lib_enable (EPlugin *ep, gint enable); typedef struct { struct _itip_puri *puri; @@ -159,6 +149,12 @@ typedef void (* FormatItipOpenFunc) (ECal *ecal, ECalendarStatus status, gpointe static gboolean check_is_instance (icalcomponent *icalcomp); +gint +e_plugin_lib_enable (EPlugin *ep, gint enable) +{ + return 0; +} + static icalproperty * find_attendee (icalcomponent *ical_comp, const gchar *address) { @@ -820,6 +816,7 @@ find_server (struct _itip_puri *pitip, ECalComponent *comp) GSList *groups, *l, *sources_conflict = NULL, *all_sources = NULL; const gchar *uid; gchar *rid = NULL; + CamelStore *parent_store; CamelURL *url; gchar *uri; ESource *source = NULL, *current_source = NULL; @@ -827,8 +824,10 @@ find_server (struct _itip_puri *pitip, ECalComponent *comp) e_cal_component_get_uid (comp, &uid); rid = e_cal_component_get_recurid_as_string (comp); - url = CAMEL_SERVICE (pitip->folder->parent_store)->url; - uri = camel_url_to_string (url, CAMEL_URL_HIDE_ALL); + parent_store = camel_folder_get_parent_store (pitip->folder); + + url = CAMEL_SERVICE (parent_store)->url; + uri = camel_url_to_string (url, CAMEL_URL_HIDE_ALL); itip_view_set_buttons_sensitive (ITIP_VIEW (pitip->view), FALSE); @@ -988,7 +987,7 @@ message_foreach_part (CamelMimePart *part, GSList **part_list) *part_list = g_slist_append (*part_list, part); - containee = camel_medium_get_content_object (CAMEL_MEDIUM (part)); + containee = camel_medium_get_content (CAMEL_MEDIUM (part)); if (containee == NULL) return; @@ -1985,8 +1984,10 @@ view_response_cb (GtkWidget *widget, ItipViewResponse response, gpointer data) tag = camel_message_info_user_tag (mi, "recurrence-key"); camel_message_info_free (mi); if (tag) { - gint i = 0, count; + CamelStore *parent_store; GSList *list = NULL; + const gchar *full_name; + gint i = 0, count; count = camel_folder_summary_count (pitip->folder->summary); for (i = 0; i < count; i++) { @@ -2005,7 +2006,10 @@ view_response_cb (GtkWidget *widget, ItipViewResponse response, gpointer data) } camel_message_info_free (mi); } - camel_db_delete_uids (pitip->folder->parent_store->cdb_w, pitip->folder->full_name, list, NULL); + + full_name = camel_folder_get_full_name (pitip->folder); + parent_store = camel_folder_get_parent_store (pitip->folder); + camel_db_delete_uids (parent_store->cdb_w, full_name, list, NULL); g_slist_free (list); } } else { @@ -2013,7 +2017,7 @@ view_response_cb (GtkWidget *widget, ItipViewResponse response, gpointer data) camel_folder_summary_remove_uid(pitip->folder->summary, pitip->uid); camel_folder_change_info_remove_uid (changes, pitip->uid); } - camel_object_trigger_event (pitip->folder, "folder_changed", changes); + camel_folder_changed (pitip->folder, changes); camel_folder_change_info_free (changes); } } @@ -2535,7 +2539,8 @@ format_itip (EPlugin *ep, EMFormatHookTarget *target) gchar *classid; struct _itip_puri *puri; CamelDataWrapper *content; - CamelStream *mem; + CamelStream *stream; + GByteArray *byte_array; classid = g_strdup_printf("itip:///%s", ((EMFormat *) target->format)->part_id->str); @@ -2560,15 +2565,19 @@ format_itip (EPlugin *ep, EMFormatHookTarget *target) g_object_unref (gconf); /* This is non-gui thread. Download the part for using in the main thread */ - content = camel_medium_get_content_object ((CamelMedium *) target->part); - mem = camel_stream_mem_new (); - camel_data_wrapper_decode_to_stream (content, mem); + content = camel_medium_get_content ((CamelMedium *) target->part); - if (((CamelStreamMem *) mem)->buffer->len == 0) + byte_array = g_byte_array_new (); + stream = camel_stream_mem_new_with_byte_array (byte_array); + camel_data_wrapper_decode_to_stream (content, stream); + + if (byte_array->len == 0) puri->vcalendar = NULL; else - puri->vcalendar = g_strndup ((gchar *)((CamelStreamMem *) mem)->buffer->data, ((CamelStreamMem *) mem)->buffer->len); - camel_object_unref (mem); + puri->vcalendar = g_strndup ( + (gchar *) byte_array->data, byte_array->len); + + g_object_unref (stream); camel_stream_printf (target->stream, "<table border=0 width=\"100%%\" cellpadding=3><tr>"); camel_stream_printf (target->stream, "<td valign=top><object classid=\"%s\"></object></td><td width=100%% valign=top>", classid); @@ -2653,7 +2662,7 @@ itip_formatter_page_factory (EPlugin *ep, EConfigHookItemFactoryData *hook_data) /* Create a new notebook page */ page = gtk_vbox_new (FALSE, 0); - GTK_CONTAINER (page)->border_width = 12; + gtk_container_set_border_width (GTK_CONTAINER (page), 12); tab_label = gtk_label_new (_("Calendar and Tasks")); gtk_notebook_append_page (GTK_NOTEBOOK (hook_data->parent), page, tab_label); @@ -2666,7 +2675,7 @@ itip_formatter_page_factory (EPlugin *ep, EConfigHookItemFactoryData *hook_data) str = g_strdup_printf ("<span weight=\"bold\">%s</span>", _("General")); gtk_label_set_markup (GTK_LABEL (frame_label), str); g_free (str); - GTK_MISC (frame_label)->xalign = 0.0; + gtk_misc_set_alignment (GTK_MISC (frame_label), 0.0, 0.5); gtk_box_pack_start (GTK_BOX (frame), frame_label, FALSE, FALSE, 0); /* Indent/padding */ @@ -2692,7 +2701,7 @@ itip_formatter_page_factory (EPlugin *ep, EConfigHookItemFactoryData *hook_data) str = g_strdup_printf ("<span weight=\"bold\">%s</span>", _("Conflict Search")); gtk_label_set_markup (GTK_LABEL (frame_label), str); g_free (str); - GTK_MISC (frame_label)->xalign = 0.0; + gtk_misc_set_alignment (GTK_MISC (frame_label), 0.0, 0.5); gtk_box_pack_start (GTK_BOX (frame), frame_label, FALSE, FALSE, 0); /* Indent/padding */ @@ -2741,7 +2750,7 @@ itip_attachment_frame(EMFormat *emf, CamelStream *stream, EMFormatPURI *puri) struct _itip_puri *info = (struct _itip_puri *)puri; d(printf("writing to frame content, handler is '%s'\n", info->handle->mime_type)); - info->handle->handler(emf, stream, info->puri.part, info->handle); + info->handle->handler(emf, stream, info->puri.part, info->handle, FALSE); camel_stream_close(stream); } diff --git a/plugins/itip-formatter/itip-view.c b/plugins/itip-formatter/itip-view.c index f4368dde3f..6ade3cabe3 100644 --- a/plugins/itip-formatter/itip-view.c +++ b/plugins/itip-formatter/itip-view.c @@ -27,10 +27,6 @@ #include <string.h> #include <glib/gi18n.h> #include <gconf/gconf-client.h> -#include <camel/camel-stream.h> -#include <camel/camel-stream-mem.h> -#include <camel/camel-medium.h> -#include <camel/camel-mime-message.h> #include <libedataserver/e-time-utils.h> #include <libedataserver/e-data-server-util.h> #include <libedataserverui/e-source-combo-box.h> @@ -337,6 +333,22 @@ format_date_and_time_x (struct tm *date_tm, buffer[0] = '\0'; } +static gchar * +dupe_first_bold (const gchar *format, const gchar *first, const gchar *second) +{ + gchar *f, *s, *res; + + f = g_markup_printf_escaped ("<b>%s</b>", first ? first : ""); + s = g_markup_escape_text (second ? second : "", -1); + + res = g_strdup_printf (format, f, s); + + g_free (f); + g_free (s); + + return res; +} + static void set_calendar_sender_text (ItipView *view) { @@ -352,64 +364,64 @@ set_calendar_sender_text (ItipView *view) /* The current account ID (i.e. the delegatee) is receiving a copy of the request/response. Here we ask the delegatee to respond/accept on behalf of the delegator. */ if (priv->organizer && priv->proxy) - on_behalf_of = g_markup_printf_escaped (_("Please respond on behalf of <b>%s</b>"), priv->proxy); + on_behalf_of = dupe_first_bold (_("Please respond on behalf of %s"), priv->proxy, NULL); else if (priv->attendee && priv->proxy) - on_behalf_of = g_markup_printf_escaped (_("Received on behalf of <b>%s</b>"), priv->proxy); + on_behalf_of = dupe_first_bold (_("Received on behalf of %s"), priv->proxy, NULL); switch (priv->mode) { case ITIP_VIEW_MODE_PUBLISH: if (priv->organizer_sentby) - sender = g_markup_printf_escaped (_("<b>%s</b> through %s has published the following meeting information:"), organizer, priv->organizer_sentby); + sender = dupe_first_bold (_("%s through %s has published the following meeting information:"), organizer, priv->organizer_sentby); else - sender = g_markup_printf_escaped (_("<b>%s</b> has published the following meeting information:"), organizer); + sender = dupe_first_bold (_("%s has published the following meeting information:"), organizer, NULL); break; case ITIP_VIEW_MODE_REQUEST: /* FIXME is the delegator stuff handled correctly here? */ if (priv->delegator) { - sender = g_markup_printf_escaped (_("<b>%s</b> has delegated the following meeting to you:"), priv->delegator); + sender = dupe_first_bold (_("%s has delegated the following meeting to you:"), priv->delegator, NULL); } else { if (priv->organizer_sentby) - sender = g_markup_printf_escaped (_("<b>%s</b> through %s requests your presence at the following meeting:"), organizer, priv->organizer_sentby); + sender = dupe_first_bold (_("%s through %s requests your presence at the following meeting:"), organizer, priv->organizer_sentby); else - sender = g_markup_printf_escaped (_("<b>%s</b> requests your presence at the following meeting:"), organizer); + sender = dupe_first_bold (_("%s requests your presence at the following meeting:"), organizer, NULL); } break; case ITIP_VIEW_MODE_ADD: /* FIXME What text for this? */ if (priv->organizer_sentby) - sender = g_markup_printf_escaped (_("<b>%s</b> through %s wishes to add to an existing meeting:"), organizer, priv->organizer_sentby); + sender = dupe_first_bold (_("%s through %s wishes to add to an existing meeting:"), organizer, priv->organizer_sentby); else - sender = g_markup_printf_escaped (_("<b>%s</b> wishes to add to an existing meeting:"), organizer); + sender = dupe_first_bold (_("%s wishes to add to an existing meeting:"), organizer, NULL); break; case ITIP_VIEW_MODE_REFRESH: if (priv->attendee_sentby) - sender = g_markup_printf_escaped (_("<b>%s</b> through %s wishes to receive the latest information for the following meeting:"), attendee, priv->attendee_sentby); + sender = dupe_first_bold (_("%s through %s wishes to receive the latest information for the following meeting:"), attendee, priv->attendee_sentby); else - sender = g_markup_printf_escaped (_("<b>%s</b> wishes to receive the latest information for the following meeting:"), attendee); + sender = dupe_first_bold (_("%s wishes to receive the latest information for the following meeting:"), attendee, NULL); break; case ITIP_VIEW_MODE_REPLY: if (priv->attendee_sentby) - sender = g_markup_printf_escaped (_("<b>%s</b> through %s has sent back the following meeting response:"), attendee, priv->attendee_sentby); + sender = dupe_first_bold (_("%s through %s has sent back the following meeting response:"), attendee, priv->attendee_sentby); else - sender = g_markup_printf_escaped (_("<b>%s</b> has sent back the following meeting response:"), attendee); + sender = dupe_first_bold (_("%s has sent back the following meeting response:"), attendee, NULL); break; case ITIP_VIEW_MODE_CANCEL: if (priv->organizer_sentby) - sender = g_markup_printf_escaped (_("<b>%s</b> through %s has canceled the following meeting:"), organizer, priv->organizer_sentby); + sender = dupe_first_bold (_("%s through %s has canceled the following meeting:"), organizer, priv->organizer_sentby); else - sender = g_markup_printf_escaped (_("<b>%s</b> has canceled the following meeting."), organizer); + sender = dupe_first_bold (_("%s has canceled the following meeting."), organizer, NULL); break; case ITIP_VIEW_MODE_COUNTER: if (priv->attendee_sentby) - sender = g_markup_printf_escaped (_("<b>%s</b> through %s has proposed the following meeting changes."), attendee, priv->attendee_sentby); + sender = dupe_first_bold (_("%s through %s has proposed the following meeting changes."), attendee, priv->attendee_sentby); else - sender = g_markup_printf_escaped (_("<b>%s</b> has proposed the following meeting changes."), attendee); + sender = dupe_first_bold (_("%s has proposed the following meeting changes."), attendee, NULL); break; case ITIP_VIEW_MODE_DECLINECOUNTER: if (priv->organizer_sentby) - sender = g_markup_printf_escaped (_("<b>%s</b> through %s has declined the following meeting changes:"), organizer, priv->organizer_sentby); + sender = dupe_first_bold (_("%s through %s has declined the following meeting changes:"), organizer, priv->organizer_sentby); else - sender = g_markup_printf_escaped (_("<b>%s</b> has declined the following meeting changes."), organizer); + sender = dupe_first_bold (_("%s has declined the following meeting changes."), organizer, NULL); break; default: break; @@ -440,64 +452,64 @@ set_tasklist_sender_text (ItipView *view) /* The current account ID (i.e. the delegatee) is receiving a copy of the request/response. Here we ask the delegatee to respond/accept on behalf of the delegator. */ if (priv->organizer && priv->proxy) - on_behalf_of = g_markup_printf_escaped (_("Please respond on behalf of <b>%s</b>"), priv->proxy); + on_behalf_of = dupe_first_bold (_("Please respond on behalf of %s"), priv->proxy, NULL); else if (priv->attendee && priv->proxy) - on_behalf_of = g_markup_printf_escaped (_("Received on behalf of <b>%s</b>"), priv->proxy); + on_behalf_of = dupe_first_bold (_("Received on behalf of %s"), priv->proxy, NULL); switch (priv->mode) { case ITIP_VIEW_MODE_PUBLISH: if (priv->organizer_sentby) - sender = g_markup_printf_escaped (_("<b>%s</b> through %s has published the following task:"), organizer, priv->organizer_sentby); + sender = dupe_first_bold (_("%s through %s has published the following task:"), organizer, priv->organizer_sentby); else - sender = g_markup_printf_escaped (_("<b>%s</b> has published the following task:"), organizer); + sender = dupe_first_bold (_("%s has published the following task:"), organizer, NULL); break; case ITIP_VIEW_MODE_REQUEST: /* FIXME is the delegator stuff handled correctly here? */ if (priv->delegator) { - sender = g_markup_printf_escaped (_("<b>%s</b> requests the assignment of %s to the following task:"), organizer, priv->delegator); + sender = dupe_first_bold (_("%s requests the assignment of %s to the following task:"), organizer, priv->delegator); } else { if (priv->organizer_sentby) - sender = g_markup_printf_escaped (_("<b>%s</b> through %s has assigned you a task:"), organizer, priv->organizer_sentby); + sender = dupe_first_bold (_("%s through %s has assigned you a task:"), organizer, priv->organizer_sentby); else - sender = g_markup_printf_escaped (_("<b>%s</b> has assigned you a task:"), organizer); + sender = dupe_first_bold (_("%s has assigned you a task:"), organizer, NULL); } break; case ITIP_VIEW_MODE_ADD: /* FIXME What text for this? */ if (priv->organizer_sentby) - sender = g_markup_printf_escaped (_("<b>%s</b> through %s wishes to add to an existing task:"), organizer, priv->organizer_sentby); + sender = dupe_first_bold (_("%s through %s wishes to add to an existing task:"), organizer, priv->organizer_sentby); else - sender = g_markup_printf_escaped (_("<b>%s</b> wishes to add to an existing task:"), organizer); + sender = dupe_first_bold (_("%s wishes to add to an existing task:"), organizer, NULL); break; case ITIP_VIEW_MODE_REFRESH: if (priv->attendee_sentby) - sender = g_markup_printf_escaped (_("<b>%s</b> through %s wishes to receive the latest information for the following assigned task:"), attendee, priv->attendee_sentby); + sender = dupe_first_bold (_("%s through %s wishes to receive the latest information for the following assigned task:"), attendee, priv->attendee_sentby); else - sender = g_markup_printf_escaped (_("<b>%s</b> wishes to receive the latest information for the following assigned task:"), attendee); + sender = dupe_first_bold (_("%s wishes to receive the latest information for the following assigned task:"), attendee, NULL); break; case ITIP_VIEW_MODE_REPLY: if (priv->attendee_sentby) - sender = g_markup_printf_escaped (_("<b>%s</b> through %s has sent back the following assigned task response:"), attendee, priv->attendee_sentby); + sender = dupe_first_bold (_("%s through %s has sent back the following assigned task response:"), attendee, priv->attendee_sentby); else - sender = g_markup_printf_escaped (_("<b>%s</b> has sent back the following assigned task response:"), attendee); + sender = dupe_first_bold (_("%s has sent back the following assigned task response:"), attendee, NULL); break; case ITIP_VIEW_MODE_CANCEL: if (priv->organizer_sentby) - sender = g_markup_printf_escaped (_("<b>%s</b> through %s has canceled the following assigned task:"), organizer, priv->organizer_sentby); + sender = dupe_first_bold (_("%s through %s has canceled the following assigned task:"), organizer, priv->organizer_sentby); else - sender = g_markup_printf_escaped (_("<b>%s</b> has canceled the following assigned task:"), organizer); + sender = dupe_first_bold (_("%s has canceled the following assigned task:"), organizer, NULL); break; case ITIP_VIEW_MODE_COUNTER: if (priv->attendee_sentby) - sender = g_markup_printf_escaped (_("<b>%s</b> through %s has proposed the following task assignment changes:"), attendee, priv->attendee_sentby); + sender = dupe_first_bold (_("%s through %s has proposed the following task assignment changes:"), attendee, priv->attendee_sentby); else - sender = g_markup_printf_escaped (_("<b>%s</b> has proposed the following task assignment changes:"), attendee); + sender = dupe_first_bold (_("%s has proposed the following task assignment changes:"), attendee, NULL); break; case ITIP_VIEW_MODE_DECLINECOUNTER: if (priv->organizer_sentby) - sender = g_markup_printf_escaped (_("<b>%s</b> through %s has declined the following assigned task:"), organizer, priv->organizer_sentby); + sender = dupe_first_bold (_("%s through %s has declined the following assigned task:"), organizer, priv->organizer_sentby); else - sender = g_markup_printf_escaped (_("<b>%s</b> has declined the following assigned task:"), organizer); + sender = dupe_first_bold (_("%s has declined the following assigned task:"), organizer, NULL); break; default: break; @@ -527,29 +539,29 @@ set_journal_sender_text (ItipView *view) /* The current account ID (i.e. the delegatee) is receiving a copy of the request/response. Here we ask the delegatee to respond/accept on behalf of the delegator. */ if (priv->organizer && priv->proxy) - on_behalf_of = g_markup_printf_escaped (_("Please respond on behalf of <b>%s</b>"), priv->proxy); + on_behalf_of = dupe_first_bold (_("Please respond on behalf of %s"), priv->proxy, NULL); else if (priv->attendee && priv->proxy) - on_behalf_of = g_markup_printf_escaped (_("Received on behalf of <b>%s</b>"), priv->proxy); + on_behalf_of = dupe_first_bold (_("Received on behalf of %s"), priv->proxy, NULL); switch (priv->mode) { case ITIP_VIEW_MODE_PUBLISH: if (priv->organizer_sentby) - sender = g_markup_printf_escaped (_("<b>%s</b> through %s has published the following memo:"), organizer, priv->organizer_sentby); + sender = dupe_first_bold (_("%s through %s has published the following memo:"), organizer, priv->organizer_sentby); else - sender = g_markup_printf_escaped (_("<b>%s</b> has published the following memo:"), organizer); + sender = dupe_first_bold (_("%s has published the following memo:"), organizer, NULL); break; case ITIP_VIEW_MODE_ADD: /* FIXME What text for this? */ if (priv->organizer_sentby) - sender = g_markup_printf_escaped (_("<b>%s</b> through %s wishes to add to an existing memo:"), organizer, priv->organizer_sentby); + sender = dupe_first_bold (_("%s through %s wishes to add to an existing memo:"), organizer, priv->organizer_sentby); else - sender = g_markup_printf_escaped (_("<b>%s</b> wishes to add to an existing memo:"), organizer); + sender = dupe_first_bold (_("%s wishes to add to an existing memo:"), organizer, NULL); break; case ITIP_VIEW_MODE_CANCEL: if (priv->organizer_sentby) - sender = g_markup_printf_escaped (_("<b>%s</b> through %s has canceled the following shared memo:"), organizer, priv->organizer_sentby); + sender = dupe_first_bold (_("%s through %s has canceled the following shared memo:"), organizer, priv->organizer_sentby); else - sender = g_markup_printf_escaped (_("<b>%s</b> has canceled the following shared memo:"), organizer); + sender = dupe_first_bold (_("%s has canceled the following shared memo:"), organizer, NULL); break; default: break; @@ -835,19 +847,19 @@ set_buttons (ItipView *view) /* FIXME Is this really the right button? */ if (priv->needs_decline) set_one_button (view, _("_Decline"), GTK_STOCK_CANCEL, ITIP_VIEW_RESPONSE_DECLINE); - set_one_button (view, _("_Accept"), GTK_STOCK_APPLY, ITIP_VIEW_RESPONSE_ACCEPT); + set_one_button (view, _("A_ccept"), GTK_STOCK_APPLY, ITIP_VIEW_RESPONSE_ACCEPT); break; case ITIP_VIEW_MODE_REQUEST: set_one_button (view, is_recur_set ? _("_Decline all") : _("_Decline"), GTK_STOCK_CANCEL, ITIP_VIEW_RESPONSE_DECLINE); set_one_button (view, is_recur_set ? _("_Tentative all") : _("_Tentative"), GTK_STOCK_DIALOG_QUESTION, ITIP_VIEW_RESPONSE_TENTATIVE); - set_one_button (view, is_recur_set ? _("_Accept all") : _("_Accept"), GTK_STOCK_APPLY, ITIP_VIEW_RESPONSE_ACCEPT); + set_one_button (view, is_recur_set ? _("A_ccept all") : _("A_ccept"), GTK_STOCK_APPLY, ITIP_VIEW_RESPONSE_ACCEPT); break; case ITIP_VIEW_MODE_ADD: if (priv->type != E_CAL_SOURCE_TYPE_JOURNAL) { set_one_button (view, _("_Decline"), GTK_STOCK_CANCEL, ITIP_VIEW_RESPONSE_DECLINE); set_one_button (view, _("_Tentative"), GTK_STOCK_DIALOG_QUESTION, ITIP_VIEW_RESPONSE_TENTATIVE); } - set_one_button (view, _("_Accept"), GTK_STOCK_APPLY, ITIP_VIEW_RESPONSE_ACCEPT); + set_one_button (view, _("A_ccept"), GTK_STOCK_APPLY, ITIP_VIEW_RESPONSE_ACCEPT); break; case ITIP_VIEW_MODE_REFRESH: /* FIXME Is this really the right button? */ @@ -863,12 +875,12 @@ set_buttons (ItipView *view) case ITIP_VIEW_MODE_COUNTER: set_one_button (view, _("_Decline"), GTK_STOCK_CANCEL, ITIP_VIEW_RESPONSE_DECLINE); set_one_button (view, _("_Tentative"), GTK_STOCK_DIALOG_QUESTION, ITIP_VIEW_RESPONSE_TENTATIVE); - set_one_button (view, _("_Accept"), GTK_STOCK_APPLY, ITIP_VIEW_RESPONSE_ACCEPT); + set_one_button (view, _("A_ccept"), GTK_STOCK_APPLY, ITIP_VIEW_RESPONSE_ACCEPT); break; case ITIP_VIEW_MODE_DECLINECOUNTER: set_one_button (view, _("_Decline"), GTK_STOCK_CANCEL, ITIP_VIEW_RESPONSE_DECLINE); set_one_button (view, _("_Tentative"), GTK_STOCK_DIALOG_QUESTION, ITIP_VIEW_RESPONSE_TENTATIVE); - set_one_button (view, _("_Accept"), GTK_STOCK_APPLY, ITIP_VIEW_RESPONSE_ACCEPT); + set_one_button (view, _("A_ccept"), GTK_STOCK_APPLY, ITIP_VIEW_RESPONSE_ACCEPT); break; default: break; @@ -970,11 +982,7 @@ alarm_check_toggled_cb (GtkWidget *check1, GtkWidget *check2) g_return_if_fail (check1 != NULL); g_return_if_fail (check2 != NULL); -#if GTK_CHECK_VERSION(2,19,7) gtk_widget_set_sensitive (check2, !(gtk_widget_get_visible (check1) && gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (check1)))); -#else - gtk_widget_set_sensitive (check2, !(GTK_WIDGET_VISIBLE (check1) && gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (check1)))); -#endif } static void diff --git a/plugins/itip-formatter/org-gnome-itip-formatter.error.xml b/plugins/itip-formatter/org-gnome-itip-formatter.error.xml index 1a47eda38c..e5d84c67af 100644 --- a/plugins/itip-formatter/org-gnome-itip-formatter.error.xml +++ b/plugins/itip-formatter/org-gnome-itip-formatter.error.xml @@ -2,14 +2,16 @@ <error-list domain="org.gnome.itip-formatter"> <error id="add-unknown-attendee" type="question"> - <_primary>This response is not from a current attendee. Add the sender as an attendee?</_primary> + <_primary>This response is not from a current attendee. Add the sender as an attendee?</_primary> + <button stock="gtk-yes" response="GTK_RESPONSE_YES"/> + <button stock="gtk-no" response="GTK_RESPONSE_NO"/> </error> <error id="add-delegate" type="question"> <_primary>This meeting has been delegated</_primary> - <_secondary>"{0}" has delegated the meeting. Do you want to add the delegate "{1}"?</_secondary> - <button _label="Yes" response="GTK_RESPONSE_YES"/> - <button _label="No" response="GTK_RESPONSE_NO"/> + <_secondary>'{0}' has delegated the meeting. Do you want to add the delegate '{1}'?</_secondary> + <button stock="gtk-yes" response="GTK_RESPONSE_YES"/> + <button stock="gtk-no" response="GTK_RESPONSE_NO"/> </error> </error-list> diff --git a/plugins/mail-notification/ChangeLog b/plugins/mail-notification/ChangeLog deleted file mode 100644 index f14ef84080..0000000000 --- a/plugins/mail-notification/ChangeLog +++ /dev/null @@ -1,217 +0,0 @@ -2009-02-19 Matthew Barnes <mbarnes@redhat.com> - - ** Fixes part of bug #572348 - - * mail-notification.c (new_notify_status): - Call gtk_status_icon_set_tooltip_text() instead of - gtk_status_icon_set_tooltip() (decprecated). - -2009-01-28 Tor Lillqvist <tml@novell.com> - - * Makefile.am: Use -no-undefined and link with more libraries on - Windows. - -2008-11-19 Srinivasa Ragavan <sragavan@novell.com> - - * mail-notification.c: Fix compilation error. - -2008-11-19 Srinivasa Ragavan <sragavan@novell.com> - - ** Fix for BNC bug #434320 - - * plugins/mail-notification/mail-notification.c: When the popup is - clicked close the status icon. - -2008-09-16 Sankar P <psankar@novell.com> - -License Changes - - * mail-notification.c: - -2008-09-15 Milan Crha <mcrha@redhat.com> - - ** Fix for bug #514299 - - * mail-notification.c: (new_notify_status): - Connect to signals only once, when creating new status icon. - -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 - - * apps-evolution-mail-notification.schemas.in: - Quote literal values. - -2008-08-01 Milan Crha <mcrha@redhat.com> - - ** Part of fix for bug #353927 - - * mail-notification.c: (icon_activated), (stop_blinking_cb), - (new_notify_status): Do not blink the icon more than 15 seconds. - -2008-07-22 Milan Crha <mcrha@redhat.com> - - ** Part of fix for bug #544022 - - * Makefile.am: - * mail-notification.c: (send_dbus_message): Do not redefine - DBUS_VERSION define, it's supplied by dbus itself. - -2008-07-16 Milan Crha <mcrha@redhat.com> - - ** Fix for bug #543134 - - * mail-notification.c: (get_cfg_widget), (do_properties), - (popup_menu_status), (new_notify_status), - (e_plugin_lib_get_configure_widget): - Show popup menu when right-click over the status icon. - -2008-01-28 Johnny Jacob <jjohnny@novell.com> - - * mail-notification.c (new_notify_status): Adding proper - comments for strings. - -2008-01-28 Johnny Jacob <jjohnny@novell.com> - - ** Fixes Bug #511226. - - * apps-evolution-mail-notification.schemas.in: String fixes. - -2008-01-21 Johnny Jacob <jjohnny@novell.com> - - ** Fixes 504567. - - * mail-notification.c (new_notify_status): Add ngettext support for - strings. - -2008-01-09 Srinivasa Ragavan <sragavan@novell.com> - - ** Fix for bug #492702 - - * Makefile.am: - * mail-notification.c: (org_gnome_mail_new_notify), - (org_gnome_mail_read_notify), (e_plugin_lib_enable), - (e_plugin_lib_get_configure_widget): Make the dbus portion of the - plugin conditional if it is there. - -2008-01-02 Srinivasa Ragavan <sragavan@novell.com> - - * mail-notification.c: (new_notify_status): Show the actual displayed - folder name rather than the decoded/handled one from uri. - -2007-12-17 Milan Crha <mcrha@redhat.com> - - ** Fix for bug #504030 - - * mail-notification.c: (new_notify_sound): - Do not play sound on every new mail arrival in a row. - -2007-12-07 Milan Crha <mcrha@redhat.com> - - ** Fix for bug #492702 - - * apps-evolution-mail-notification.schemas.in: - * mail-notification.c: - * org-gnome-mail-notification.eplug.xml: - New-mail-notification plugin and sound notification has been merged - to this plugin, with couple of options in plugins Configuration tab. - -2007-10-11 Matthew Barnes <mbarnes@redhat.com> - - * mail-notification.c: - Put the notification_callback() declaration inside a - #ifdef HAVE_LIBNOTIFY block to avoid a potential compiler warning. - -2007-08-03 Johnny Jacob <jjohnny@novell.com> - - ** Fix for bug #458822 from Anand V M <avmuttagi@gmail.com> - - * org-gnome-mail-notification.eplug.xml: Description string Fix. - -2007-08-03 Anand V M <avmuttagi@gmail.com> - - ** Fix for bug #458822 - - * org-gnome-mail-notification.eplug.xml:Replacement of wrong - string in mail-notification plugin with the correct string. - - (Committed by Johnny <jjohnny@novell.com>) - -2007-07-20 Claude Paroz <claude@2xlibre.net> - - * mail-notification.c: (org_gnome_mail_new_notify): Fixed syntax of - ngettext. - -2007-07-05 Srinivasa Ragavan <sragavan@novell.com> - - ** Fix for byug #452900 from Cosimo Cecchi - - * mail-notification.c: (org_gnome_mail_read_notify), - (icon_activated), (notification_callback), - (org_gnome_mail_new_notify): - -2007-06-07 Gilles Dartiguelongue <dartigug@esiee.fr> - - * mail-notification.c: (org_gnome_mail_new_notify): - fix a printf warning - -2007-06-03 Srinivasa Ragavan <sragavan@novell.com> - - ** Fix for version removal from Installed files from Gilles Dartiguelongue - - * Makefile.am: - -2007-05-19 Matthew Barnes <mbarnes@redhat.com> - - * Makefile.am: Fix a couple distcheck errors. - -2007-05-18 Srinivasa Ragavan <sragavan@novell.com> - - ** Fix for bug #439316 - - * mail-notification.c: (org_gnome_mail_new_notify): Fixes translation - issues and some fixes around broken gtk. - -2007-05-18 Srinivasa Ragavan <sragavan@novell.com> - - ** Fix for bug #439146 and #438711 from Ross Burton and Daniel Gryniewicz - - * Makefile.am: - * apps-evolution-mail-notification.schemas.in.in: Schema to control - blink and notification. - * mail-notification.c: (org_gnome_mail_read_notify), - (org_gnome_mail_new_notify): More cleanups - -2007-05-11 Srinivasa Ragavan <sragavan@novell.com> - - * mail-notification.c: (org_gnome_mail_new_notify): Build error. - -2007-05-07 Srinivasa Ragavan <sragavan@novell.com> - - * mail-notification.c: Fix for a build error. - -2007-05-03 Srinivasa Ragavan <sragavan@novell.com> - - * mail-notification.c: (org_gnome_mail_new_notify): Make libnotify - notifications conditional. - -2006-08-21 Srinivasa Ragavan <sragavan@novell.com> - - ** Initial commit for Mail notification plugin. - - * mail-notification.c: - * Makefile.am: - * org-gnome-mail-notification.eplug.xml: diff --git a/plugins/mail-notification/mail-notification.c b/plugins/mail-notification/mail-notification.c index 72e3881b23..e6dd1a267d 100644 --- a/plugins/mail-notification/mail-notification.c +++ b/plugins/mail-notification/mail-notification.c @@ -39,8 +39,6 @@ #include <time.h> -#include <camel/camel-folder.h> - #include <e-util/e-binding.h> #include <e-util/e-config.h> #include <e-util/gconf-bridge.h> @@ -219,7 +217,10 @@ static void read_notify_dbus (EMEventTargetMessage *t) { if (bus != NULL) - send_dbus_message ("MessageReading", t->folder->name, 0, NULL, NULL, NULL); + send_dbus_message ( + "MessageReading", + camel_folder_get_name (t->folder), + 0, NULL, NULL, NULL); } static void @@ -335,6 +336,7 @@ static void do_properties (GtkMenuItem *item, gpointer user_data) { GtkWidget *cfg, *dialog, *vbox, *label, *hbox; + GtkWidget *content_area; gchar *text; cfg = get_cfg_widget (); @@ -369,8 +371,10 @@ do_properties (GtkMenuItem *item, gpointer user_data) GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE, NULL); + content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog)); + gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), vbox); + gtk_container_add (GTK_CONTAINER (content_area), vbox); gtk_container_set_border_width (GTK_CONTAINER (vbox), 10); gtk_widget_set_size_request (dialog, 400, -1); g_signal_connect_swapped ( diff --git a/plugins/mail-to-task/ChangeLog b/plugins/mail-to-task/ChangeLog deleted file mode 100644 index d2d10d1f93..0000000000 --- a/plugins/mail-to-task/ChangeLog +++ /dev/null @@ -1,241 +0,0 @@ -2009-04-24 Milan Crha <mcrha@redhat.com> - - ** Fix for bug #342296 - - * org-gnome-mail-to-task.eplug.xml: - * org-gnome-mail-to-task.xml: - * mail-to-task.c: (set_attendees), (set_organizer), (do_report_error), - (report_error_idle), (do_mail_to_event), (mail_to_event), - (org_gnome_mail_to_event), (org_gnome_mail_to_event_menu), - (org_gnome_mail_to_meeting), (org_gnome_mail_to_meeting_menu), - (org_gnome_mail_to_task), (org_gnome_mail_to_task_menu), - (org_gnome_mail_to_memo), (org_gnome_mail_to_memo_menu): - Extended to be able to save mail to event, meeting, task or memo. - -2009-03-26 Milan Crha <mcrha@redhat.com> - - ** Fix for bug #576696 - - * mail-to-task.c: (set_attendees): Set mandatory properties. - -2009-01-28 Tor Lillqvist <tml@novell.com> - - * Makefile.am: Remove a trailing space after the line continuation - backslash. - -2009-01-21 Milan Crha <mcrha@redhat.com> - - * Makefile.am: Use also EVOLUTION_CALENDAR_CFLAGS. - -2008-10-31 Matthew Barnes <mbarnes@redhat.com> - - ** Fixes part of bug #558726 (patch by Frederic van Starbmann) - - * mail-to-task.c (do_mail_to_task): - Fix a potential format string crash. - -2008-08-27 Sankar P <psankar@novell.com> - -License Changes - - * mail-to-task.c: - -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 - - * mail-to-task.c: (convert_to_task): Ask for destination source only - when have more than one writable source defined. - -2007-11-23 Milan Crha <mcrha@redhat.com> - - ** Fix for bug #353807 - - * mail-to-task.c: (do_mail_to_task): Notice user if any error occur - during opening calendar, calendar is readonly or when add fails. - -2007-11-05 Milan Crha <mcrha@redhat.com> - - ** Fix for bug #334675 - - * mail-to-task.c: (do_mail_to_task), (text_contains_nonwhitespace), - (get_selected_text), (convert_to_task), (org_gnome_mail_to_task), - (org_gnome_mail_to_task_menu): - When selected only one message, then try to use selected text in - preview as description, instead of whole message body. - -2007-11-05 Milan Crha <mcrha@redhat.com> - - ** Fix for bug #353779 - - * org-gnome-mail-to-task.eplug.xml: - Allow convert more than one mail to task with one click. - -2007-09-07 Milan Crha <mcrha@redhat.com> - - ** Fix for bug #473903 - - * mail-to-task.c: (set_attachments): - Fixes serious compiler warning. - -2007-08-16 Milan Crha <mcrha@redhat.com> - - ** Part of fix for bug #350539 - - * mail-to-task.c: (set_description): - Ensures non-NULL mime_part. - -2007-04-02 Sankar P <psankar@novell.com> - - * Committed on behalf of Gilles Dartiguelongue <dartigug@esiee.fr> - - * org-gnome-mail-to-task.eplug.xml: - Cleanup. - Fixes part of #301149 - -2006-07-31 Chenthill Palanisamy <pchenthill@novell.com> - - Fixes #310489 - * mail-to-task.c: - (set_attendees): - (set_organizer): Appended the mailto field - to the email values. - (do_mail_to_task):Set the ICAL_X parameter - so that no mail is sent to the recipients. - -2006-06-06 Hiroyuki Ikezoe <poincare@ikezoe.net> - - Fixes #332605. - * mail-to-task.c: - (set_description): Multipart message handling. - (set_attachments): New function. - Set attachment files to a task. - (clean_name): New function. - from plugins/save-attachments/save-attachments.c. - -2006-03-04 Chenthill Palanisamy <pchenthill@novell.com> - - Fixes #330974, 333688. - * mail-to-task.c: - (set_description): Check if the params are present, - before accessing the value. Fixes a crash. - (convert_to_task): Set the authentication function - while creating the ECal. - -2006-02-01 Chenthill Palanisamy <pchenthill@novell.com> - - * Makefile.am: Reverting the commit made by - Kjartan Maraas <kmaraas@gnome.org> so that - the file org-gnome-mail-to-task.xml is include in the - dist. - -2006-01-16 Harish Krishnaswamy <kharish@novell.com> - - * Makefile.am: Enumerate files for BUILT_SOURCES macro - as plugin_DATA now includes static files from the source - tree. - -2006-01-14 Srinivasa Ragavan <sragavan@novell.com> - - ** Fixes bug #323011 - - * Makefile.am: Added org-gnome-mail-to-task.xml to build - * mail-to-task.c (convert_to_task), (org_gnome_mail_to_task), - (org_gnome_mail_to_task_menu): Added Code to handle menu. - * org-gnome-mail-to-task.eplug.xml: Added plug to show Convert to Task - menu item under Message menu. - * org-gnome-mail-to-task.xml: Added UI files for menu item. - -2005-12-21 Chenthill Palanisamy <pchenthill@novell.com> - - Committing for Hiroyuki Ikezoe <poincare@ikezoe.net> - - Fixes #274433 - * mail-to-task.c: (set_description): Convert the string to utf8. - -2005-10-11 Mubeen Jukaku <jmubeen@novell.com> - - * mail-to-task.c (set_attendees): Re-implemented this funciton. - (add_attendee_cb): Removed this callback because of above change. - - Fixes bug #301081 - -2005-10-03 Chenthill Palanisamy <pchenthill@novell.com> - - Fixes #315752 - * mail-to-task.c: Created a new structure AsyncData to - store information passed to thread. - (do_mail_to_task): get the required contents from AsyncData and - free it at the end. - (copy_uids): Duplicate the uids from t->uids. - (org_gnome_mail_to_task): duplicated the t->uid and run - do_mail_to_task as a thread. - -2005-08-23 Not Zed <NotZed@Ximian.com> - - * mail-to-task.c (add_attendee_cb): use the right type for attendees. - -2005-05-11 Not Zed <NotZed@Ximian.com> - - * Makefile.am: added built_sources/cleanfiles - -2005-05-06 Not Zed <NotZed@Ximian.com> - - * Makefile.am: - * org-gnome-mail-to-task.eplug.xml: s/.in/.xml/ & i18n. - -2005-02-24 Björn Torkelsson <torkel@acc.umu.se> - - * org-gnome-mail-to-task.eplug.in: Shortened the name of the - plugin and added a . to the end of the description. - -2005-01-14 Rodrigo Moya <rodrigo@novell.com> - - * mail-to-task.c (set_description): new function to correctly - retrieve the body of the message. - (do_mail_to_task): call set_description. - -2004-11-04 Rodrigo Moya <rodrigo@novell.com> - - * org-gnome-mail-to-task.eplug.in: fixed description and added - author's info, to display correctly on the plugin manager. - -2004-11-03 Not Zed <NotZed@Ximian.com> - - * org-gnome-mail-to-task.eplug.in: revert rodrigo's last fix, it should - actually work now, i hope. - -2004-11-01 JP Rosevear <jpr@novell.com> - - * Makefile.am: dist .eplugin.in file - -2004-10-29 Rodrigo Moya <rodrigo@novell.com> - - * org-gnome-mail-to-task.eplug.in: fix folder view popup id again. - -2004-10-28 Not Zed <NotZed@Ximian.com> - - * org-gnome-mail-to-task.eplug.in: fix folder view popup id. - -2004-10-21 Rodrigo Moya <rodrigo@novell.com> - - * mail-to-task.c (set_attendees, set_organizer): new functions. - (do_mail_to_task): set attendees and organizer on the task from the - recipients in the mail message. - - * org-gnome-mail-to-task.eplug.in: use correct icon. - -2004-10-21 Rodrigo Moya <rodrigo@novell.com> - - * org-gnome-mail-to-task.eplug.in: fixed to make the plugin show - up in the correct place. - -2004-10-21 Rodrigo Moya <rodrigo@novell.com> - - * mail-to-task.c: implemented plugin for converting selected - mails to tasks. diff --git a/plugins/mail-to-task/mail-to-task.c b/plugins/mail-to-task/mail-to-task.c index 17bc6a995b..f2e3f98435 100644 --- a/plugins/mail-to-task/mail-to-task.c +++ b/plugins/mail-to-task/mail-to-task.c @@ -38,14 +38,6 @@ #include <libedataserver/e-account.h> #include <libedataserverui/e-source-selector-dialog.h> -#include <camel/camel-folder.h> -#include <camel/camel-medium.h> -#include <camel/camel-mime-message.h> -#include <camel/camel-multipart.h> -#include <camel/camel-stream.h> -#include <camel/camel-stream-mem.h> -#include <camel/camel-utf8.h> - #include <mail/e-mail-browser.h> #include <mail/em-utils.h> #include <mail/em-format-html.h> @@ -79,7 +71,7 @@ set_attendees (ECalComponent *comp, CamelMimeMessage *message, const gchar *orga { GSList *attendees = NULL, *to_free = NULL; ECalComponentAttendee *ca; - const CamelInternetAddress *from = NULL, *to, *cc, *bcc, *arr[4]; + CamelInternetAddress *from = NULL, *to, *cc, *bcc, *arr[4]; gint len, i, j; if (message->reply_to) @@ -149,7 +141,7 @@ prepend_from (CamelMimeMessage *message, gchar **text) { gchar *res, *tmp, *addr = NULL; const gchar *name = NULL, *eml = NULL; - const CamelInternetAddress *from = NULL; + CamelInternetAddress *from = NULL; g_return_val_if_fail (message != NULL, NULL); g_return_val_if_fail (text != NULL, NULL); @@ -179,16 +171,17 @@ static void set_description (ECalComponent *comp, CamelMimeMessage *message) { CamelDataWrapper *content; - CamelStream *mem; + CamelStream *stream; CamelContentType *type; CamelMimePart *mime_part = CAMEL_MIME_PART (message); ECalComponentText text; + GByteArray *byte_array; GSList sl; gchar *str, *convert_str = NULL; gsize bytes_read, bytes_written; gint count = 2; - content = camel_medium_get_content_object ((CamelMedium *) message); + content = camel_medium_get_content ((CamelMedium *) message); if (!content) return; @@ -197,7 +190,7 @@ set_description (ECalComponent *comp, CamelMimeMessage *message) */ while (CAMEL_IS_MULTIPART (content) && count > 0) { mime_part = camel_multipart_get_part (CAMEL_MULTIPART (content), 0); - content = camel_medium_get_content_object (CAMEL_MEDIUM (mime_part)); + content = camel_medium_get_content (CAMEL_MEDIUM (mime_part)); count--; } @@ -208,11 +201,11 @@ set_description (ECalComponent *comp, CamelMimeMessage *message) if (!camel_content_type_is (type, "text", "plain")) return; - mem = camel_stream_mem_new (); - camel_data_wrapper_decode_to_stream (content, mem); - - str = g_strndup ((const gchar *)((CamelStreamMem *) mem)->buffer->data, ((CamelStreamMem *) mem)->buffer->len); - camel_object_unref (mem); + byte_array = g_byte_array_new (); + stream = camel_stream_mem_new_with_byte_array (byte_array); + camel_data_wrapper_decode_to_stream (content, stream); + str = g_strndup ((gchar *) byte_array->data, byte_array->len); + g_object_unref (stream); /* convert to UTF-8 string */ if (str && content->mime_type->params && content->mime_type->params->value) { @@ -320,7 +313,7 @@ set_attachments (ECal *client, ECalComponent *comp, CamelMimeMessage *message) gboolean done; } status; - content = camel_medium_get_content_object ((CamelMedium *) message); + content = camel_medium_get_content ((CamelMedium *) message); if (!content || !CAMEL_IS_MULTIPART (content)) return; diff --git a/plugins/mailing-list-actions/ChangeLog b/plugins/mailing-list-actions/ChangeLog deleted file mode 100644 index 4c665ed4b6..0000000000 --- a/plugins/mailing-list-actions/ChangeLog +++ /dev/null @@ -1,142 +0,0 @@ -2009-01-11 Matthew Barnes <mbarnes@redhat.com> - - * mailing-list-actions.c (emla_list_action_do): - Call e_show_uri() instead of gnome_url_show(). - -2008-12-08 Jennifer Newman <jennifer.newman@tufts.edu> - - ** Fix for bug #549964 - - * org-gnome-mailing-list-actions.error.xml: Fix for an erroneous string - -2008-09-04 Sankar P <psankar@novell.com> - -License Changes - - * mailing-list-actions.c: - -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 - - * org-gnome-mailing-list-actions.error.xml: Do not use "handle" - -2008-04-02 Matthew Barnes <mbarnes@redhat.com> - - * mailing-list-actions.c (emla_list_action_do): - Adapt to streamlined EMsgComposer API. - -2007-12-20 Matthew Barnes <mbarnes@redhat.com> - - * mailing-list-actions.c: - Use the new MailMsg API for messages. - -2007-04-02 Sankar P <psankar@novell.com> - - * Committed on behalf of Gilles Dartiguelongue <dartigug@esiee.fr> - - * org-gnome-mailing-list-actions.eplug.xml: - Cleanup. - Fixes part of #301149 - -2006-08-23 Matthew Barnes <mbarnes@redhat.com> - - * mailing-list-actions.c: - fix an uninitialized GError - fixes bug 352423. - committed by Andre Klapper - -2006-07-08 Matthew Barnes <mbarnes@redhat.com> - - * org-gnome-mailing-list-actions.xml: Fixing header capitalization - in menu. Fixes bug #323952. (Committed by Andre Klapper) - -2005-10-19 Philip Van Hoof <pvanhoof@gnome.org> - composer/e-msg-composer-select-file.c, - composer/e-msg-composer.c, composer/e-msg-composer.h, - composer/evolution-composer.c, composer/listener.c, - mail/em-composer-utils.c, - plugins/mailing-list-actions/mailing-list-actions.c: - data hiding - -2005-10-18 Srinivasa Ragavan <sragavan@novell.com> - - * org-gnome-mailing-list-actions.eplug.xml: Changed visible to - enabled. Fixes the bug #314899 - -2005-08-08 Not Zed <NotZed@Ximian.com> - - ** See bug #312621. - - * mailing-list-actions.c (emla_list_action_do): noop if msg = - NULL. - -2005-08-02 Not Zed <NotZed@Ximian.com> - - * mailing-list-actions.c (emla_list_action_do): allocate enough - space for the url. May be related to #304461. - -2005-05-16 Not Zed <NotZed@Ximian.com> - - * mailing-list-actions.c: moved e-error to e-util - -2005-05-13 Rodney Dawes <dobey@novell.com> - - * org-gnome-mailing-list-actions.xml: Update for the new menu layout - -2005-05-11 Not Zed <NotZed@Ximian.com> - - * Makefile.am (CLEANFILES): setup cleanfiles. - -2005-05-06 Not Zed <NotZed@Ximian.com> - - * org-gnome-mailing-list-actions.error.xml: - s/-errors.xml/.error.xml/ & i18n tags. - - * Makefile.am: - * org-gnome-mailing-list-actions.eplug.xml: s/.in/.xml/, & i18n. - -2005-02-24 Björn Torkelsson <torkel@acc.umu.se> - - * org-gnome-mailing-list-actions.eplug.in: Fixed description and - added author. - Removed 'plugin' from the name. - -2004-11-24 JP Rosevear <jpr@novell.com> - - * mailing-list-actions.c: make sure GETTEXT_PACKAGE is defined - -2004-11-04 Meilof Veeningen <meilof@wanadoo.nl> - - * org-gnome-mailing-list-actions.eplug.in: Added author tag, fixed - description, removed "plugin" from name, changed position of item - in popup menu, using "enable" rather than "visible" for bonobo menus - - * org-gnome-mailing-list-actions.xml: Now place menus in - MailMessageActions placeholder; moved label to <commands> section - - * org-gnome-mailing-list-actions-errors.xml: fixed button order: - "Cancel" now leftmost button; added e-mail address to send confirm - dialog - - * mailing-list-actions.c: account guessing now first based on message; - added e-mail address to send confirm dialog - -2004-11-09 Rodney Dawes <dobey@novell.com> - - * Makefile.am: Add org-gnome-mailing-list-actions.xml to EXTRA_DIST - -2004-11-09 Rodney Dawes <dobey@novell.com> - - * Makefile.am: Add the eplug.in file to EXTRA_DIST - -2004-11-05 JP Rosevear <jpr@novell.com> - - * mailing-list-actions.c: include <config.h> for GETTEXT_PACKAGE - - Added mailing list actions plugin from Meilof Veeningen <meilof@wanadoo.nl> - diff --git a/plugins/mailing-list-actions/mailing-list-actions.c b/plugins/mailing-list-actions/mailing-list-actions.c index 699ec1efd9..33101db8cd 100644 --- a/plugins/mailing-list-actions/mailing-list-actions.c +++ b/plugins/mailing-list-actions/mailing-list-actions.c @@ -30,10 +30,6 @@ #include <gtk/gtk.h> #include <gconf/gconf-client.h> -#include "camel/camel-multipart.h" -#include "camel/camel-mime-part.h" -#include "camel/camel-exception.h" -#include "camel/camel-folder.h" #include "composer/e-msg-composer.h" #include "mail/e-mail-browser.h" #include "mail/e-mail-reader.h" @@ -93,6 +89,13 @@ gboolean mail_browser_init (GtkUIManager *ui_manager, EMailBrowser *browser); gboolean mail_shell_view_init (GtkUIManager *ui_manager, EShellView *shell_view); +gint e_plugin_lib_enable (EPlugin *ep, gint enable); + +gint +e_plugin_lib_enable (EPlugin *ep, gint enable) +{ + return 0; +} typedef struct { EMailReader *reader; diff --git a/plugins/mark-all-read/ChangeLog b/plugins/mark-all-read/ChangeLog deleted file mode 100644 index c3d927f105..0000000000 --- a/plugins/mark-all-read/ChangeLog +++ /dev/null @@ -1,98 +0,0 @@ -2008-09-02 Paul Bolle <pebolle@tiscali.nl> - - ** Fixes bug #550415 - - * mark-all-read.c (mar_got_folder): Do not leak an CamelFolderInfo. - Slightly change handling of CamelException. - -2008-08-27 Sankar P <psankar@novell.com> - -License Changes - - * mark-all-read.c: - -2008-08-07 Matthew Barnes <mbarnes@redhat.com> - - ** Fixes bug #530402 - - * mark-all-read.c (prompt_user): - Improve dialog wording, and don't use a window title (HIG). - -2008-05-16 Matthew Barnes <mbarnes@redhat.com> - - ** Fixes bug #514383 - - * mark-all-read.c: Add a Cancel button. - -2007-12-20 Matthew Barnes <mbarnes@redhat.com> - - ** Fixes part of bug #362638 - - * mark-all-read.c: - Use the new MailMsg API for messages. - -2007-11-18 Gilles Dartiguelongue <gdartigu@svn.gnome.org> - - ** Fix bug #495875 - - * org-gnome-mark-all-read.eplug.xml: - right click menu reordering - -2007-11-05 Michael Monreal <mmonreal@svn.gnome.org> - - ** Fix for bug #492102 - - * org-gnome-mark-all-read.eplug.xml: Use mail-mark-read icon. - -2007-05-14 Srinivasa Ragavan <sragavan@novell.com> - - ** Fix for bug #325965 from Ilkka Tuohela - - * mark-all-read.c: (mar_got_folder): - -2007-04-02 Sankar P <psankar@novell.com> - - * Committed on behalf of Gilles Dartiguelongue <dartigug@esiee.fr> - - * org-gnome-mark-all-read.eplug.xml: - Cleanup. - Fixes part of #301149 - -2007-03-20 Matthew Barnes <mbarnes@redhat.com> - - ** Fixes part of bug #419524 - - * Include <glib/gi18n.h> instead of <libgnome/gnome-i18n.h>. - -2006-07-04 Karsten Bräckelmann <guenther@rudersport.de> - - * org-gnome-mark-all-read.eplug.xml: Using proper header - capitalization for the menu entry. Fixes bug #318755. - -2005-12-25 Funda Wang <fundawang@linux.net.cn> - - * Makefile.am: Mark this plugin as translatable (bug#301149). - -2005-12-12 Harish Krishnaswamy <kharish@novell.com> - - * Makefile.am: Fix make-clean issues. - -2005-12-07 Funda Wang <fundawang@linux.net.cn> - - * org-gnome-mark-all-read.eplug.in: i18nlized. - -2005-06-27 Tor Lillqvist <tml@novell.com> - - * Makefile.am: Use NO_UNDEFINED. Link with more libraries. - -2005-06-18 Tor Lillqvist <tml@novell.com> - - * org-gnome-mark-all-read.eplug.in: Use SOEXT. - -2005-05-19 Chenthill Palanisamy <pchenthill@novell.com> - - * MakeFile.am: - * org-gnome-send-options.eplug.in: Plugin file to add - the Mark all Messages read menu item. - * send-options.c: Contains methods to mark messages as read. - diff --git a/plugins/mark-all-read/mark-all-read.c b/plugins/mark-all-read/mark-all-read.c index 24bc48521a..f22b2276f0 100644 --- a/plugins/mark-all-read/mark-all-read.c +++ b/plugins/mark-all-read/mark-all-read.c @@ -30,9 +30,9 @@ #include <glib/gi18n.h> #include <e-util/e-plugin-ui.h> #include <mail/em-folder-tree.h> +#include <mail/em-utils.h> #include <mail/mail-ops.h> #include <mail/mail-mt.h> -#include <camel/camel-vee-folder.h> #include <shell/e-shell-sidebar.h> #include <shell/e-shell-view.h> @@ -46,6 +46,13 @@ gboolean e_plugin_ui_init (GtkUIManager *ui_manager, EShellView *shell_view); +gint e_plugin_lib_enable (EPlugin *ep, gint enable); + +gint +e_plugin_lib_enable (EPlugin *ep, gint enable) +{ + return 0; +} static void button_clicked_cb (GtkButton *button, @@ -71,7 +78,7 @@ box_mapped_cb (GtkWidget *box, } static gint -prompt_user (void) +prompt_user (gboolean has_subfolders) { GtkWidget *container; GtkWidget *dialog; @@ -83,15 +90,21 @@ prompt_user (void) gchar *markup; gint response; + if (!has_subfolders) { + return em_utils_prompt_user (e_shell_get_active_window (e_shell_get_default ()), NULL, "mail:ask-mark-all-read", NULL) ? + GTK_RESPONSE_NO : GTK_RESPONSE_CANCEL; + } + dialog = gtk_dialog_new (); - gtk_widget_hide (GTK_DIALOG (dialog)->action_area); + widget = gtk_dialog_get_action_area (GTK_DIALOG (dialog)); + gtk_widget_hide (widget); gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE); gtk_window_set_title (GTK_WINDOW (dialog), ""); g_signal_connect ( dialog, "map", G_CALLBACK (gtk_widget_queue_resize), NULL); gtk_container_set_border_width (GTK_CONTAINER (dialog), 12); - vbox = GTK_DIALOG (dialog)->vbox; + vbox = gtk_dialog_get_content_area (GTK_DIALOG (dialog)); /* Table */ widget = gtk_table_new (3, 2, FALSE); @@ -341,8 +354,9 @@ mar_got_folder (gchar *folder_uri, gpointer data) { CamelFolderInfo *folder_info; - CamelStore *store; + CamelStore *parent_store; CamelException ex; + const gchar *full_name; gint response; /* FIXME we have to disable the menu item */ @@ -351,9 +365,11 @@ mar_got_folder (gchar *folder_uri, camel_exception_init (&ex); - store = folder->parent_store; + full_name = camel_folder_get_full_name (folder); + parent_store = camel_folder_get_parent_store (folder); + folder_info = camel_store_get_folder_info ( - store, folder->full_name, + parent_store, full_name, CAMEL_STORE_FOLDER_INFO_RECURSIVE | CAMEL_STORE_FOLDER_INFO_FAST, &ex); @@ -361,17 +377,17 @@ mar_got_folder (gchar *folder_uri, goto exit; if (scan_folder_tree_for_unread (folder_uri) > 1) - response = prompt_user (); + response = prompt_user (folder_info->child != NULL); else response = GTK_RESPONSE_NO; if (response == GTK_RESPONSE_NO) mark_all_as_read (folder); else if (response == GTK_RESPONSE_YES) - mar_all_sub_folders (store, folder_info, &ex); + mar_all_sub_folders (parent_store, folder_info, &ex); exit: - camel_store_free_folder_info (store, folder_info); + camel_store_free_folder_info (parent_store, folder_info); } static void diff --git a/plugins/plugin-manager/ChangeLog b/plugins/plugin-manager/ChangeLog deleted file mode 100644 index 45dd1105d6..0000000000 --- a/plugins/plugin-manager/ChangeLog +++ /dev/null @@ -1,184 +0,0 @@ -2008-10-31 Matthew Barnes <mbarnes@redhat.com> - - ** Fixes part of bug #558726 (patch by Frederic van Starbmann) - - * plugin-manager.c (eppm_enable_toggled): - Fix a potential format string crash. - -2008-09-04 Sankar P <psankar@novell.com> - -License Changes - - * plugin-manager.c: - -2008-06-18 Matthew Barnes <mbarnes@redhat.com> - - ** Fixes bug #530069 - - * plugin-manager.c: - Don't show the configuration tab unless the selected plugin - actually has configuration options (excluding options that get - crammed into the Preferences dialog). - -2008-05-23 Johnny Jacob <jjohnny@novell.com> - - ** Fixes Bug 496476. - - * plugin-manager.c (org_gnome_plugin_manager_manage): Let the - plugin configure widget expand. - -2008-03-20 Sankar P <psankar@novell.com> - - * org-gnome-plugin-manager.eplug.xml: - Use "true" instead of "yes" - -2008-03-19 Sankar P <psankar@novell.com> - - ** Fix for bug #496839 - - * org-gnome-plugin-manager.eplug.xml: - * plugin-manager.c: (org_gnome_plugin_manager_manage): - - Do not show all plugins in plugin-manager. - Hide the core system plugins. - -2008-01-11 Milan Crha <mcrha@redhat.com> - - ** Fix for bug #502303 - - * plugin-manager.c: (eppm_response): - Always destroy dialog and unset global variable. - * plugin-manager.c: (org_gnome_plugin_manager_manage): - Use G_TYPE_POINTER instead of GTK_TYPE_WIDGET in a list store - to get rid of reference counting troubles on configuration - widgets of plugins. Remember created dialog for future use. - -2008-02-01 Andre Klapper <a9016009@gmx.de> - - * plugin-manager.c: (org_gnome_plugin_manager_manage): - fix spelling. - -2007-12-04 Milan Crha <mcrha@redhat.com> - - ** Fix for bug #500210 - - * plugin-manager.c: Changed coding-style to be more accurate to other - sources, but the main change was to show configuration options of the - plugin into extra tab, instead of new popup under 'Configure' button. - -2007-11-19 Sankar P <psankar@novell.com> - - ** Fix for bug #498173 - - * plugin-manager.c: (eppm_response): - e_plugin_configure should be called only - when user clicks on Configure button. - -2007-10-26 Kjartan Maraas <kmaraas@gnome.org> - - * plugin-manager.c: (org_gnome_plugin_manager_manage): - Don't mix code and declarations. - -2007-10-26 Sankar P <psankar@novell.com> - - * plugin-manager.c: (eppm_selection_changed): - Ssssshhhhhhhh the compiler warning. - -2007-10-26 Sankar P <psankar@novell.com> - - ** Fix for bug #461272 - - * plugin-manager.c: (eppm_selection_changed), - (org_gnome_plugin_manager_manage): - Configure button should not be enabled for all. - configure button needs a hot-key. - -2007-07-26 Sankar P <psankar@novell.com> - - * plugin-manager.c: (eppm_response), - (org_gnome_plugin_manager_manage), (e_plugin_lib_configure): - Plugins should be configurable within the plugin-manager itself. - Fixes Preferences dialog bloating. - See bug #459522 - -2007-05-11 Sankar P <psankar@novell.com> - - * Committed on behalf of Gilles Dartiguelongue <dartigug@esiee.fr> - - * plugin-manager.c: (eppm_show_plugin), (eppm_selection_changed), - (eppm_enable_toggled), (eppm_free), - (org_gnome_plugin_manager_manage): - Sort the list of plugins based on name so that it is easy to use - -2006-01-25 Rajeev ramanathan <rajeevramanathan_2004@yahoo.co.in> - - ** Fixes Bug #314913 - - * plugin-manager.c : Removed id, path displayed in UI - -2006-01-16 Kjartan Maraas <kmaraas@gnome.org> - - * plugin-manager.c: (eppm_enable_toggled): Remove unused var. - -2006-01-13 Srinivasa Ragavan <sragavan@novell.com> - - ** Fixes bug #326265 - - * org-gnome-plugin-manager.xml: Added mnemonics to Plugin menu item. - -2005-12-30 Andre Klapper <a9016009@gmx.de> - - * evolution/plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml: - Fixing several typos and harmonizing - capital/small letters. Partially fixes bug 306117. - -2005-12-12 Harish Krishnaswamy <kharish@novell.com> - - * Makefile.am: Fix make-clean issues. - -2005-08-03 Li Yuan <li.yuan@sun.com> - - * plugin-manager.c: (org_gnome_plugin_manager_manage): - Add a11y name to Plugin Table. - -2005-07-21 Not Zed <NotZed@Ximian.com> - - * org-gnome-plugin-manager.xml: Remove the tools menu which - someone was too lazy to remove. - -2005-06-27 Tor Lillqvist <tml@novell.com> - - * Makefile.am: Use NO_UNDEFINED. Link with more libraries. - -2005-06-18 Tor Lillqvist <tml@novell.com> - - * org-gnome-plugin-manager.eplug.xml: Use SOEXT. - -2005-05-13 Rodney Dawes <dobey@novell.com> - - * org-gnome-plugin-manager.xml: Update for new menu layout - -2005-05-13 Rodney Dawes <dobey@novell.com> - - * Makefile.am: Add a backslash line separator to EXTRA_DIST - -2005-05-11 Not Zed <NotZed@Ximian.com> - - * Makefile.am: added built_sources/cleanfiles - -2005-05-06 Not Zed <NotZed@Ximian.com> - - * Makefile.am: - * org-gnome-plugin-manager.eplug.xml: s/.in/.xml/ & i18n. - -2004-11-09 Rodney Dawes <dobey@novell.com> - - * Makefile.am: Add the xml file to EXTRA_DIST - -2004-11-03 Not Zed <NotZed@Ximian.com> - - * Makefile.am: extra_dist the .eplug.in file. - -2004-10-20 Not Zed <NotZed@Ximian.com> - - * implemented a plugin manager plugin. - diff --git a/plugins/prefer-plain/ChangeLog b/plugins/prefer-plain/ChangeLog deleted file mode 100644 index 18e1b74300..0000000000 --- a/plugins/prefer-plain/ChangeLog +++ /dev/null @@ -1,136 +0,0 @@ -2009-01-14 Milan Crha <mcrha@redhat.com> - - ** Fix for bug #567687 - - * prefer-plain.c: (org_gnome_prefer_plain_multipart_alternative): - Force text/html part only when choosing between text/plain and it. - -2008-09-09 Milan Crha <mcrha@redhat.com> - - ** Fix for bug #551492 - - * prefer-plain.c: (org_gnome_prefer_plain_multipart_alternative): - Initialize variable before using it. - -2008-09-02 Sankar P <psankar@novell.com> - -License Changes - - * prefer-plain.c: - -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 - - * prefer-plain.c: (org_gnome_prefer_plain_multipart_alternative): - Choose the text/html part in normal mode only if the alrenative - multipart contains also a text/plain part. - -2008-04-17 Milan Crha <mcrha@redhat.com> - - ** Fix for bug #451976 - - * prefer-plain.c: (org_gnome_prefer_plain_multipart_alternative): Try - to find text/html part in multipart/alternative when in normal mode. - -2007-10-26 Kjartan Maraas <kmaraas@gnome.org> - - * prefer-plain.c: (e_plugin_lib_enable): - Fix NULL vs. 0. - -2007-10-30 Milan Crha <mcrha@redhat.com> - - ** Fix for bug #487922 - (Sometimes evolution does not recognize attachments) - - * prefer-plain.c: (export_as_attachments): New helper function to - export message parts as attachments. This will traverse whole - hierarchy of message's parts in multipart message. - * prefer-plain.c: (org_gnome_prefer_plain_multipart_alternative): - Use this function to export other parts as attachments. - -2007-09-05 Sankar P <psankar@novell.com> - - * prefer-plain.c: (e_plugin_lib_enable): - Fixes an invalid return type issue. - -2007-08-27 Srinivasa Ragavan <sragavan@novell.com> - - ** Fix for bug #431459 - - * prefer-plain.c: (e_plugin_lib_enable): Avoid reentrancy. - -2007-08-16 Milan Crha <mcrha@redhat.com> - - ** Part of fix for bug #350539 - - * prefer-plain.c: (org_gnome_prefer_plain_multipart_alternative): - Ensures non-NULL part. - -2007-08-05 Johnny Jacob <jjohnny@novell.com> - - * Committed on behalf of Anand V M <avmuttagi@gmail.com> - - ** Fix for bug #428125 - - * prefer-plain.c: Added mnemonic for "Plain Text Mode" in - preferences - -2007-04-02 Sankar P <psankar@novell.com> - - * Committed on behalf of Gilles Dartiguelongue <dartigug@esiee.fr> - - * org-gnome-prefer-plain.eplug.xml: - Cleanup. - Fixes part of #301149 - -2006-08-17 Kjartan Maraas <kmaraas@gnome.org> - - * prefer-plain.c: (e_plugin_lib_enable): Don't leak the key. - -2006-01-19 Andre Klapper <a9016009@gmx.de> - - * org-gnome-prefer-plain.eplug.xml - changed "mails" to "emails". Fixes bug 325569. - -2005-05-17 Not Zed <NotZed@Ximian.com> - - * org-gnome-prefer-plain.eplug.xml: make it clear this is a demonstration only. - -2005-05-12 Not Zed <NotZed@Ximian.com> - - * Makefile.am: fix built_sources/cleanfiles. - -2005-05-06 Not Zed <NotZed@Ximian.com> - - * Makefile.am: - * org-gnome-prefer-plain.eplug.xml: s/.in/.xml/, fix i18n tags. - -2005-02-13 Björn Torkelsson <torkel@acc.umu.se> - - * org-gnome-prefer-plain.eplug.in: Added author and moved the - description to it's own tag. - -2005-02-24 Björn Torkelsson <torkel@acc.umu.se> - - * org-gnome-prefer-plain.eplug.in: Removed plugin from the name. - Added a . to the end of the description. - -2004-11-01 JP Rosevear <jpr@novell.com> - - * Makefile.am: dist .eplug.in file - -2004-10-21 Not Zed <NotZed@Ximian.com> - - * prefer-plain.c (e_plugin_lib_enable): setup the right plugin - init function. - -2004-10-20 Not Zed <NotZed@Ximian.com> - - * Imported prefer-plain plugin. - diff --git a/plugins/prefer-plain/prefer-plain.c b/plugins/prefer-plain/prefer-plain.c index bd77e83a55..f4d5c168be 100644 --- a/plugins/prefer-plain/prefer-plain.c +++ b/plugins/prefer-plain/prefer-plain.c @@ -30,9 +30,6 @@ #include <string.h> #include <stdio.h> -#include <camel/camel-multipart.h> -#include <camel/camel-mime-part.h> - #include <em-format/em-format.h> #include <mail/em-config.h> #include <mail/em-format-hook.h> @@ -83,7 +80,7 @@ org_gnome_prefer_plain_text_html (gpointer ep, EMFormatHookTarget *t) if (epp_mode != EPP_TEXT || strstr (t->format->part_id->str, ".alternative-prefer-plain.") != NULL || em_format_is_inline (t->format, t->format->part_id->str, t->part, &(t->item->handler))) - t->item->handler.old->handler (t->format, t->stream, t->part, t->item->handler.old); + t->item->handler.old->handler (t->format, t->stream, t->part, t->item->handler.old, FALSE); else if (epp_show_suppressed) make_part_attachment (t->format, t->stream, t->part, -1); } @@ -102,7 +99,7 @@ export_as_attachments (CamelMultipart *mp, EMFormat *format, CamelStream *stream part = camel_multipart_get_part (mp, i); if (part != except) { - CamelMultipart *multipart = (CamelMultipart *)camel_medium_get_content_object((CamelMedium *)part); + CamelMultipart *multipart = (CamelMultipart *)camel_medium_get_content ((CamelMedium *)part); if (CAMEL_IS_MULTIPART (multipart)) { export_as_attachments (multipart, format, stream, except); @@ -116,7 +113,7 @@ export_as_attachments (CamelMultipart *mp, EMFormat *format, CamelStream *stream void org_gnome_prefer_plain_multipart_alternative(gpointer ep, EMFormatHookTarget *t) { - CamelMultipart *mp = (CamelMultipart *)camel_medium_get_content_object((CamelMedium *)t->part); + CamelMultipart *mp = (CamelMultipart *)camel_medium_get_content ((CamelMedium *)t->part); CamelMimePart *part, *display_part = NULL; gint i, nparts, partidlen, displayid = 0; @@ -161,7 +158,7 @@ org_gnome_prefer_plain_multipart_alternative(gpointer ep, EMFormatHookTarget *t) em_format_part_as (t->format, t->stream, display_part, "text/html"); g_string_truncate (t->format->part_id, partidlen); } else { - t->item->handler.old->handler (t->format, t->stream, t->part, t->item->handler.old); + t->item->handler.old->handler (t->format, t->stream, t->part, t->item->handler.old, FALSE); } return; } else if (!CAMEL_IS_MULTIPART(mp)) { @@ -241,7 +238,7 @@ org_gnome_prefer_plain_config_mode(struct _EPlugin *epl, struct _EConfigHookItem GtkCellRenderer *cell; GtkListStore *store; GtkWidget *dropdown_label, *info, *check; - gint i; + guint i; GtkTreeIter iter; if (data->old) @@ -280,7 +277,7 @@ org_gnome_prefer_plain_config_mode(struct _EPlugin *epl, struct _EConfigHookItem g_signal_connect (dropdown, "changed", G_CALLBACK(epp_mode_changed), info); - i = ((GtkTable *)data->parent)->nrows; + g_object_get (data->parent, "n-rows", &i, NULL); gtk_table_attach((GtkTable *)data->parent, check, 0, 2, i, i + 1, GTK_FILL | GTK_EXPAND, 0, 0, 0); gtk_table_attach((GtkTable *)data->parent, dropdown_label, 0, 1, i + 1, i + 2, 0, 0, 0, 0); gtk_table_attach((GtkTable *)data->parent, (GtkWidget *)dropdown, 1, 2, i + 1, i + 2, GTK_FILL | GTK_EXPAND, 0, 0, 0); diff --git a/plugins/profiler/ChangeLog b/plugins/profiler/ChangeLog deleted file mode 100644 index 16b77d5ba6..0000000000 --- a/plugins/profiler/ChangeLog +++ /dev/null @@ -1,30 +0,0 @@ -2008-09-02 Sankar P <psankar@novell.com> - -License Changes - - * profiler.c: - -2007-10-26 Kjartan Maraas <kmaraas@gnome.org> - - * profiler.c: Add missing includes. - -2007-04-02 Sankar P <psankar@novell.com> - - * Committed on behalf of Gilles Dartiguelongue <dartigug@esiee.fr> - - * org-gnome-evolution-profiler.eplug.xml: - Cleanup. - Fixes part of #301149 - -2005-12-25 Funda Wang <fundawang@linux.net.cn> - - * Makefile.am: Mark this plugin as translatable (bug#301149). - -2005-05-12 Not Zed <NotZed@Ximian.com> - - * Makefile.am: fix built_sources/cleanfiles. - -2005-04-26 Not Zed <NotZed@Ximian.com> - - * A profiler plugin. - diff --git a/plugins/profiler/profiler.c b/plugins/profiler/profiler.c index e3ecd07a9e..1a50b6e740 100644 --- a/plugins/profiler/profiler.c +++ b/plugins/profiler/profiler.c @@ -34,6 +34,14 @@ void org_gnome_evolution_profiler_event (EPlugin *ep, EProfileEventTarget *t); +gint e_plugin_lib_enable (EPlugin *ep, gint enable); + +gint +e_plugin_lib_enable (EPlugin *ep, gint enable) +{ + return 0; +} + void org_gnome_evolution_profiler_event(EPlugin *ep, EProfileEventTarget *t) { diff --git a/plugins/pst-import/ChangeLog b/plugins/pst-import/ChangeLog deleted file mode 100644 index 0f031b508d..0000000000 --- a/plugins/pst-import/ChangeLog +++ /dev/null @@ -1,22 +0,0 @@ -2009-01-28 Tor Lillqvist <tml@novell.com> - - * Makefile.am: On Windows use -no-undefined and link with all - required libraries. (Just throw in a bunch of libraries without - cherry-picking. Having "superfluous" ones just slows down the - linking a bit, but doesn't hurt at run-time.) - - Use LIBPST_CFLAGS. - - * pst-importer.c: Include <libpst/define.h> before the other - libpst headers. Otherwise we get compilation errors on Windows, - sigh. - -2009-01-15 Bharath Acharya <abharath@novell.com> - - Basic functionality implemented by - Chris Halls <chris.halls@credativ.co.uk> - - ** Added PST-Import plugin - * Makefile.am: - * org-gnome-pst.eplug.xml: - * pst-importer.c: diff --git a/plugins/pst-import/Makefile.am b/plugins/pst-import/Makefile.am index 68c8a19264..0c6c89b5b9 100644 --- a/plugins/pst-import/Makefile.am +++ b/plugins/pst-import/Makefile.am @@ -22,7 +22,8 @@ liborg_gnome_pst_import_la_CPPFLAGS = \ $(GNOME_PLATFORM_CFLAGS) \ $(EVOLUTION_CFLAGS) \ $(EVOLUTION_CALENDAR_CFLAGS) \ - $(LIBPST_CFLAGS) + $(LIBPST_CFLAGS) \ + $(CAMEL_CFLAGS) liborg_gnome_pst_import_la_SOURCES = pst-importer.c @@ -35,7 +36,8 @@ liborg_gnome_pst_import_la_LIBADD = \ $(EVOLUTION_CALENDAR_LIBS) \ $(EVOLUTION_MAIL_LIBS) \ $(GNOME_PLATFORM_LIBS) \ - $(LIBPST_LIBS) + $(LIBPST_LIBS) \ + $(CAMEL_LIBS) EXTRA_DIST = org-gnome-pst-import.eplug.xml diff --git a/plugins/pst-import/pst-importer.c b/plugins/pst-import/pst-importer.c index fa0b61e993..84706b783e 100644 --- a/plugins/pst-import/pst-importer.c +++ b/plugins/pst-import/pst-importer.c @@ -52,16 +52,6 @@ #include <libedataserver/e-data-server-util.h> #include <libedataserverui/e-source-selector-dialog.h> -#include <camel/camel-folder.h> -#include <camel/camel-store.h> -#include <camel/camel-exception.h> -#include <camel/camel-mime-message.h> -#include <camel/camel-multipart.h> -#include <camel/camel-data-wrapper.h> -#include <camel/camel-stream-mem.h> -#include <camel/camel-stream-fs.h> -#include <camel/camel-file-utils.h> - #include <mail/e-mail-local.h> #include <mail/mail-mt.h> #include <mail/mail-tools.h> @@ -70,6 +60,13 @@ #include <libpst/libpst.h> #include <libpst/timeconv.h> +#ifdef WIN32 +#ifdef gmtime_r +#undef gmtime_r +#endif +#define gmtime_r(tp,tmp) (gmtime(tp)?(*(tmp)=*gmtime(tp),(tmp)):0) +#endif + typedef struct _PstImporter PstImporter; gint pst_init (pst_file *pst, gchar *filename); @@ -469,24 +466,24 @@ pst_import_file (PstImporter *m) g_free (filename); - camel_operation_progress_count (NULL, 1); + camel_operation_progress (NULL, 1); if ((item = pst_parse_item (&m->pst, m->pst.d_head, NULL)) == NULL) { pst_error_msg ("Could not get root record"); return; } - camel_operation_progress_count (NULL, 2); + camel_operation_progress (NULL, 2); if ((d_ptr = pst_getTopOfFolders (&m->pst, item)) == NULL) { pst_error_msg ("Top of folders record not found. Cannot continue"); return; } - camel_operation_progress_count (NULL, 3); + camel_operation_progress (NULL, 3); pst_import_folders (m, d_ptr); - camel_operation_progress_count (NULL, 4); + camel_operation_progress (NULL, 4); camel_operation_end (NULL); @@ -671,7 +668,7 @@ pst_process_folder (PstImporter *m, pst_item *item) m->folder_uri = uri; if (m->folder) { - camel_object_unref (m->folder); + g_object_unref (m->folder); m->folder = NULL; } @@ -708,7 +705,7 @@ pst_create_folder (PstImporter *m) *pos = '\0'; folder = mail_tool_uri_to_folder (dest, CAMEL_STORE_FOLDER_CREATE, &m->base.ex); - camel_object_unref(folder); + g_object_unref (folder); *pos = '/'; } } @@ -716,7 +713,7 @@ pst_create_folder (PstImporter *m) g_free (dest); if (m->folder) { - camel_object_unref (m->folder); + g_object_unref (m->folder); } m->folder = mail_tool_uri_to_folder (m->folder_uri, CAMEL_STORE_FOLDER_CREATE, &m->base.ex); @@ -808,7 +805,7 @@ pst_process_email (PstImporter *m, pst_item *item) } camel_mime_message_set_from (msg, addr); - camel_object_unref (addr); + g_object_unref (addr); if (item->email->sent_date != NULL) { camel_mime_message_set_date (msg, pst_fileTimeToUnixTime (item->email->sent_date), 0); @@ -836,7 +833,7 @@ pst_process_email (PstImporter *m, pst_item *item) if (camel_address_decode (CAMEL_ADDRESS (addr), item->email->sentto_address.str) > 0) camel_mime_message_set_recipients (msg, "To", addr); - camel_object_unref (addr); + g_object_unref (addr); } if (item->email->cc_address.str != NULL) { @@ -845,7 +842,7 @@ pst_process_email (PstImporter *m, pst_item *item) if (camel_address_decode (CAMEL_ADDRESS (addr), item->email->cc_address.str) > 0) camel_mime_message_set_recipients (msg, "CC", addr); - camel_object_unref (addr); + g_object_unref (addr); } } @@ -876,7 +873,7 @@ pst_process_email (PstImporter *m, pst_item *item) part = camel_mime_part_new (); camel_mime_part_set_content (part, item->body.str, strlen (item->body.str), "text/plain"); camel_multipart_add_part (mp, part); - camel_object_unref (part); + g_object_unref (part); } if (item->email->htmlbody.str != NULL) { @@ -884,21 +881,21 @@ pst_process_email (PstImporter *m, pst_item *item) part = camel_mime_part_new (); camel_mime_part_set_content (part, item->email->htmlbody.str, strlen (item->email->htmlbody.str), "text/html"); camel_multipart_add_part (mp, part); - camel_object_unref (part); + g_object_unref (part); } for (attach = item->attach; attach; attach = attach->next) { if (attach->data.data || attach->i_id) { part = attachment_to_part(m, attach); camel_multipart_add_part (mp, part); - camel_object_unref (part); + g_object_unref (part); } } /*camel_mime_message_dump (msg, TRUE);*/ if (item->email->htmlbody.str || item->attach) { - camel_medium_set_content_object (CAMEL_MEDIUM (msg), CAMEL_DATA_WRAPPER (mp)); + camel_medium_set_content (CAMEL_MEDIUM (msg), CAMEL_DATA_WRAPPER (mp)); } else if (item->body.str) { camel_mime_part_set_content (CAMEL_MIME_PART (msg), item->body.str, strlen (item->body.str), "text/plain"); } else { @@ -921,7 +918,7 @@ pst_process_email (PstImporter *m, pst_item *item) camel_folder_append_message (m->folder, msg, info, NULL, &m->ex); camel_message_info_free (info); - camel_object_unref (msg); + g_object_unref (msg); camel_folder_sync (m->folder, FALSE, NULL); camel_folder_thaw (m->folder); @@ -1241,24 +1238,24 @@ set_cal_attachments (ECal *cal, ECalComponent *ec, PstImporter *m, pst_item_atta continue; } - content = camel_medium_get_content_object (CAMEL_MEDIUM (part)); + content = camel_medium_get_content (CAMEL_MEDIUM (part)); if (camel_data_wrapper_decode_to_stream (content, stream) == -1 || camel_stream_flush (stream) == -1) { g_warning ("Could not write attachment to %s: %s", path, g_strerror (errno)); - camel_object_unref (stream); + g_object_unref (stream); attach = attach->next; continue; } - camel_object_unref (stream); + g_object_unref (stream); uri = g_filename_to_uri (path, NULL, NULL); list = g_slist_append (list, g_strdup (uri)); g_free (uri); - camel_object_unref (part); + g_object_unref (part); g_free (path); attach = attach->next; diff --git a/plugins/publish-calendar/ChangeLog b/plugins/publish-calendar/ChangeLog deleted file mode 100644 index 15ae0b036d..0000000000 --- a/plugins/publish-calendar/ChangeLog +++ /dev/null @@ -1,316 +0,0 @@ -2009-04-24 Milan Crha <mcrha@redhat.com> - - ** Fix for bug #340783 - - * publish-format-fb.h: (publish_calendar_as_fb): - * publish-format-fb.c: (write_calendar), (publish_calendar_as_fb): - * publish-format-ical.h: (publish_calendar_as_ical): - * publish-format-ical.c: (write_calendar), (publish_calendar_as_ical): - * publish-calendar.c: (publish), (publish_no_succ_info), - (publish_uri_async), (publish_online), (mount_ready_cb), - (mount_first), (add_timeout), (add_offset_timeout), - (online_state_changed), (publish_urls), (action_publish), - (error_queue_show_idle), (error_queue_add): - Show error or success to user in a UI. - -2009-01-21 Suman Manjunath <msuman@novell.com> - - ** Fix for bug #541209 - - ** Adapt to the new APIs from upstream libical. Changes made include - using the "_r" counterpart for the following APIs: - + icalproperty_as_ical_string () - + icalvalue_as_ical_string () - + icalcomponent_as_ical_string () - + icalparameter_as_ical_string () - + icaldurationtype_as_ical_string () - + icalenum_reqstat_code () - + icallangbind_property_eval_string () - + icallangbind_quote_as_ical () - + icalmime_text_end_part () - + icalperiodtype_as_ical_string () - + icalproperty_enum_to_string () - + icalproperty_get_parameter_as_string () - + icalproperty_get_value_as_string () - + icalproperty_get_property_name () - + icalrecurrencetype_as_string () - + icaltime_as_ical_string () - + icalreqstattype_as_string () - + icalvalue_binary_as_ical_string () - + icalvalue_int_as_ical_string () - + icalvalue_utcoffset_as_ical_string () - + icalvalue_string_as_ical_string () - + icalvalue_recur_as_ical_string () - + icalvalue_text_as_ical_string () - + icalvalue_attach_as_ical_string () - + icalvalue_duration_as_ical_string () - + icalvalue_date_as_ical_string () - + icalvalue_datetime_as_ical_string () - + icalvalue_float_as_ical_string () - + icalvalue_geo_as_ical_string () - + icalvalue_datetimeperiod_as_ical_string () - + icalvalue_period_as_ical_string () - + icalvalue_trigger_as_ical_string () - + icalvalue_as_ical_string () - - * publish-format-fb.c (write_calendar): - * publish-format-ical.c (write_calendar): - -2008-12-16 Milan Crha <mcrha@redhat.com> - - ** Fix for bug #359010 - - * url-editor-dialog.c: (url_editor_dialog_new): - Set title of the window based on the parameter/action. - -2008-10-03 Sankar P <psankar@novell.com> - -License Changes - - * publish-calendar.c: - * url-editor-dialog.c: - -2008-09-26 Philip Withnall <philip@tecnocode.co.uk> - - ** Fix for bug #553461 and bug #553389 - - * publish-calendar.c (url_remove_clicked): - * publish-calendar.glade: - * url-editor-dialog.c (create_uri), (check_input), - (publish_service_changed), (set_from_uri): - * url-editor-dialog.h: Rename the "SSH" option to "Secure FTP (SSH)" - and update the code accordingly. Also, change a related string to use - better terminology. - -2008-09-02 Sankar P <psankar@novell.com> - -License Changes - - * publish-format-fb.c: - * publish-format-ical.c: - * publish-location.c: - * publish-location.h: - * url-editor-dialog.h: - -2008-08-27 Sankar P <psankar@novell.com> - -License Changes - - * publish-format-fb.h: - * publish-format-ical.h: - -2008-04-17 Milan Crha <mcrha@redhat.com> - - ** Part of fix for bug #526739 - - * publish-format-fb.h: (publish_calendar_as_fb): - * publish-format-fb.c: (write_calendar), (publish_calendar_as_fb): - * publish-format-ical.h: (publish_calendar_as_ical): - * publish-format-ical.c: (write_calendar), (publish_calendar_as_ical): - Use gio GOutputStream instead of gnome-vfs handle. - * url-editor-dialog.c: (create_uri): Use glib function to escape URI. - * publish-location.c: (migrateURI): Use EUri to parse URI. - * publish-calendar.c: (publish_online), (unmount_done_cb), - (struct mnt_struct), (mount_ready_cb), (ask_password), (ask_question), - (mount_first), (publish): - Use gio instead of gnome-vfs for opening (remote) files. - -2007-12-14 Tobias Mueller <tobiasmue@svn.gnome.org> - Patch by <nickspoon0@gmail.com> - - ** Fixes bug 502188 - - * publish-calendar.c: initialize "remember" variable to - FALSE. - -2007-09-27 Pedro Villavicencio Garrido <pvillavi@gnome.org> - - * url-editor-dialog.c: (url_editor_dialog_construct): - use EVOLUTION_GLADEDIR instead of EVOLUTION_PLUGINDIR. - - Fixes #480804. - -2007-09-10 Andre Klapper <a9016009@gmx.de> - - * publish-calendar.c: (publish): - fix chen's string freeze break. - -2007-09-10 Chenthill Palanisamy <pchenthill@novell.com> - - Fixes #274047 (bnc) - * Makefile.am: Inserted glade_data. - * publish-calendar.c: (publish_calendar_locations): Pick - the glade file from install area. - -2007-09-10 Chenthill Palanisamy <pchenthill@novell.com> - - Fixes #277159 (bnc) - * url-editor-dialog.c: (frequency_changed_cb), - (url_editor_dialog_construct): Listen to the changes made - in publish frequency. - -2007-09-10 Chenthill Palanisamy <pchenthill@novell.com> - - Fixes #274048 (bnc) - * publish-calendar.c: (publish): Prompt for a password - if required. - -2007-07-30 Andre Klapper <a9016009@gmx.de> - - * publish-calendar.glade: - remove "window1" string from translation - -2007-06-07 Gilles Dartiguelongue <dartigug@esiee.fr> - - * publish-location.c: (migrateURI), (e_publish_uri_from_xml), - (e_publish_uri_to_xml): more compilation warnings cleanup, - completes bug #437584 fixes - -2007-05-12 Matthew Barnes <mbarnes@redhat.com> - - * Makefile.am: Add "eplug" file to CLEANFILES. - -2007-05-11 Gilles Dartiguelongue <dartigug@esiee.fr> - - * url-editor-dialog.c: (set_from_uri): fixes casts in strcmp, - fixes part of bug #437584 - -2007-03-20 Matthew Barnes <mbarnes@redhat.com> - - ** Fixes part of bug #419524 - - * Include <glib/gi18n.h> instead of <libgnome/gnome-i18n.h>. - -2007-02-20 Chenthill Palanisamy <pchenthill@novell.com> - - Fixes #238093 (bnc) - * publish-format-ical.c: (insert_tz_comps), (append_tz_to_comp), - (write_calendar): Add the timezone information while - publishing the calendars. - -2007-02-19 Sankar P <psankar@novell.com> - - * url-editor-dialog.c: (set_from_uri): - Fixes some string to int conversion. - -2006-08-02 Chenthill Palanisamy <pchenthill@novell.com> - - Fixes #343991 - * publish-calendar.c: (publish_uris_set_timeout): Iterate - the list when the uri is NULL. - -2006-07-31 Chenthill Palanisamy <pchenthill@novell.com> - - Fixes #329740 - * publish-format-fb.c: (write_calendar): Pass the email id - of the user for getting the free busy information. - -2006-07-31 Chenthill Palanisamy <pchenthill@novell.com> - - Fixes #347973 - * url-editor-dialog.c: (set_from_uri): Parse the uri - using EUri. - -2006-02-09 Rajeev ramanathan <rajeevramanathan_2004@yahoo.co.in> - - Fixes #328389 - * publish-calendar.c: Disabled Enabled button for Enabled Url. - -2006-02-12 Karsten Bräckelmann <guenther@rudersport.de> - - * publish-calendar.glade: Change mnemonic for Port. - Fixes bug #329757. - -2006-01-30 Chenthill Palanisamy <pchenthill@novell.com> - - Fixes #328413 - * publish-calendar.glade: Set the text invisible for the - password field. - -2006-01-27 Kjartan Maraas <kmaraas@gnome.org> - - * publish-format-fb.c: Add missing include. - -2006-01-27 Andre Klapper <a9016009@gmx.de> - * publish-calendar.glade: - removed string "dialog1" from translation. Fixes bug 306118. - -2006-01-23 Chenthill Palanisamy <pchenthill@novell.com> - - Fixes #328224, 328408, 328389 - * publish-calendar.c: (publish_uri_async), (url_add_clicked), - (url_edit_clicked), , - (publish_uris_set_timeout), (e_plugin_lib_enable): Publish - the calendar in a seperate thread so that the gui remains - responsive. - (publish_calendar_locations): Clear the items gtk store. - * publish-location.c: (migrateURI), (e_publish_uri_from_xml): - If the uri is NULL return back. - -2006-01-11 Chenthill Palanisamy <pchenthill@novell.com> - - Fixes #325926 - * org-gnome-publish-calendar.eplug.xml: Use the target and hook id - of calendar instead of shell. - -2006-01-04 Tor Lillqvist <tml@novell.com> - - * Makefile.am: Use EVOLUTION_PLUGINDIR as the macro name for the - plugindir, to match what is redefined for Win32 in - e-util/e-util-private.h - - * publish-calendar.c (publish_calendar_locations) - * url-editor-dialog.c (url_editor_dialog_construct): Construct - glade file pathname at run-time. - -2005-12-25 Funda Wang <fundawang@linux.net.cn> - - * Makefile.am: Mark this plugin as translatable (bug#301149). - -2005-12-22 Tor Lillqvist <tml@novell.com> - - * Makefile.am: Use -no-undefined on Windows. Link with used - libraries. - - * org-gnome-publish-calendar.eplug.in: Use SOEXT. - -2005-12-20 Chenthill Palanisamy <pchenthill@novell.com> - - * Makefile.am: Added the org-gnome-publish-calendar.xml - file to extra dist. - -2005-12-19 Chenthill Palanisamy <pchenthill@novell.com> - - Committing for: David Trowbridge <trowbrds cs colorado edu> - - * Makefile.am: - * org-gnome-publish-calendar.eplug.in: - * org-gnome-publish-calendar.xml: - * publish-calendar.c: (publish), (add_timeout), (update_timestamp), - (add_offset_timeout), (url_list_changed), - (url_list_enable_toggled), (selection_changed), (url_add_clicked), - (url_edit_clicked), (url_list_double_click), (url_remove_clicked), - (url_enable_clicked), (online_state_changed), - (publish_calendar_locations), (publish_urls), (action_publish), - (e_plugin_lib_enable): - * publish-calendar.glade: - * publish-format-fb.c: (write_calendar), (publish_calendar_as_fb): - * publish-format-fb.h: - * publish-format-ical.c: (write_calendar), - (publish_calendar_as_ical): - * publish-format-ical.h: - * publish-location.c: (migrateURI), (e_publish_uri_from_xml), - (e_publish_uri_to_xml): - * publish-location.h: - * url-editor-dialog.c: (create_uri), (check_input), - (source_selection_changed), (publish_service_changed), - (type_selector_changed), (server_entry_changed), - (file_entry_changed), (port_entry_changed), - (username_entry_changed), (password_entry_changed), - (remember_pw_toggled), (set_from_uri), - (url_editor_dialog_construct), (url_editor_dialog_new), - (url_editor_dialog_dispose), (url_editor_dialog_class_init), - (url_editor_dialog_init), (url_editor_dialog_get_type), - (url_editor_dialog_run): - * url-editor-dialog.h: Committing the intial patch. - diff --git a/plugins/publish-calendar/url-editor-dialog.c b/plugins/publish-calendar/url-editor-dialog.c index 37910d8f47..1211726b4b 100644 --- a/plugins/publish-calendar/url-editor-dialog.c +++ b/plugins/publish-calendar/url-editor-dialog.c @@ -116,11 +116,7 @@ check_input (UrlEditorDialog *dialog) gtk_widget_hide (dialog->fb_duration_combo); } -#if GTK_CHECK_VERSION(2,19,7) if (gtk_widget_get_sensitive (dialog->events_selector)) { -#else - if (GTK_WIDGET_IS_SENSITIVE (dialog->events_selector)) { -#endif sources = e_source_selector_get_selection (E_SOURCE_SELECTOR (dialog->events_selector)); n += g_slist_length (sources); } @@ -332,6 +328,7 @@ static gboolean url_editor_dialog_construct (UrlEditorDialog *dialog) { GtkWidget *toplevel; + GtkWidget *content_area; GConfClient *gconf; GtkSizeGroup *group; EPublishUri *uri; @@ -376,8 +373,9 @@ url_editor_dialog_construct (UrlEditorDialog *dialog) uri = dialog->uri; + content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog)); toplevel = e_builder_get_widget (dialog->builder, "publishing toplevel"); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), toplevel); + gtk_container_add (GTK_CONTAINER (content_area), toplevel); gtk_container_set_border_width (GTK_CONTAINER (dialog), 6); gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE); diff --git a/plugins/sa-junk-plugin/ChangeLog b/plugins/sa-junk-plugin/ChangeLog deleted file mode 100644 index 46f51c7003..0000000000 --- a/plugins/sa-junk-plugin/ChangeLog +++ /dev/null @@ -1,154 +0,0 @@ -2008-12-03 Matthew Barnes <mbarnes@redhat.com> - - ** Fixes bug #560420 (patch by hp@syntomax.com) - - * em-junk-filter.c (pipe_to_sa_full): - spamc and spamassassin use error codes >= 64 to denote execution - errors. Positive error codes < 64 means the message was identified - as spam. - -2008-09-29 Sankar P <psankar@novell.com> - -License Changes - - * em-junk-filter.c: - -2008-09-25 Philip Withnall <philip@tecnocode.co.uk> - - ** Fix for bug #551121 - - * em-junk-filter.c (pipe_to_sa_full), (em_junk_sa_respawn_spamd): - * org-gnome-sa-junk-plugin.eplug.xml: Standardise use of - "SpamAssassin" vs. "spamassassin" or "Spamassassin". - -2008-09-12 Milan Crha <mcrha@redhat.com> - - ** Fix for bug #505016 - - * em-junk-filter.c: (em_junk_sa_check_junk): - Check for NULL to prevent crash when error occurred. - -2008-04-25 Milan Crha <mcrha@redhat.com> - - ** Fix for bug #273041 - - * em-junk-filter.c: (em_junk_sa_commit_reports), - (em_junk_sa_validate_binary): Fix function prototype. - * em-junk-filter.c: (pipe_to_sa_full), (em_junk_sa_test_spamd_running), - (em_junk_sa_test_spamassassin), (pipe_to_sa), (em_junk_sa_run_spamd), - (em_junk_sa_test_spamd), (em_junk_sa_is_available), - (em_junk_sa_check_junk), (get_spamassassin_version), - (em_junk_sa_report_junk), (em_junk_sa_report_non_junk): - Propagate possible errors to the UI. - -2008-03-13 Milan Crha <mcrha@redhat.com> - - ** Fix for bug #515786 - - * org-gnome-sa-junk-plugin.eplug.xml: - * em-junk-filter.c: (org_gnome_sa_use_remote_tests): - Fix misspelled SpamAssassin word. - -2007-11-26 Matthew Barnes <mbarnes@redhat.com> - - ** Fixes bug #499644 - - * em-junk-filter.c (user_remote_tests_cb), - (org_gnome_sa_use_remote_tests): - The behavior of the "Include remote tests" check button was swapped - with respect to its state. Probably why SpamAssassin seemed slow. - -2007-09-07 Milan Crha <mcrha@redhat.com> - - ** Part of fix for bug #473903 - - * em-junk-filter.c: (em_junk_sa_validate_binary): Changing function - prototype to fit what is expected in 'invoke', returns value based on it. - -2007-08-22 Srinivasa Ragavan <sragavan@novell.com> - - ** Fix for bug #468303 - - * org-gnome-sa-junk-plugin.eplug.xml: Add strings for i18n. - -2007-05-11 Jules Colding <colding@omesc.com> - - * em-junk-filter.c (pipe_to_sa_full): File descriptor leaks fixed. - Fixes bug #437664. - -2007-05-11 Gilles Dartiguelongue <dartigug@esiee.fr> - - * em-junk-filter.c: (pipe_to_sa_full), (em_junk_sa_check_junk), - (org_gnome_sa_use_remote_tests): Fix casts and prototypes, - fixes part of bug #437584. - -2007-04-03 Srinivasa Ragavan <sragavan@novell.com> - - Added few more plugin callbacks and moved the UI options from core - mail to plugin. - - * em-junk-filter.c: (em_junk_sa_validate_binary), - (use_remote_tests_cb), (org_gnome_sa_use_remote_tests): - * org-gnome-sa-junk-plugin.eplug.xml: - -2007-04-03 Matthew Barnes <mbarnes@redhat.com> - - * em-junk-filter.c (em_junk_sa_get_name): - * org-gnome-sa-junk-plugin.eplug.xml: - Correctly capitalize SpamAssassin. (#375577) - Patch from Priit Laes. - -2006-08-22 Kjartan Maraas <kmaraas@gnome.org> - - * em-junk-filter.c: (em_junk_sa_init): #if 0 out unused function and - plug a leak. - -2006-01-09 Kjartan Maraas <kmaraas@gnome.org> - - * em-junk-filter.c: (em_junk_sa_run_spamd): Remove unused var. - -2006-01-11 Andre Klapper <a9016009@gmx.de> - * org-gnome-sa-junk-plugin.eplug.xml: Changing strings to be more precise. - Fixes bug 325132. - -2005-01-04 Shi Pu <shi.pu@sun.com> - - See bug ** 325210 - - * em-junk-filter.c: - (get_spamassassin_version): gets the spamassassin version which evolution used - (em_junk_sa_report_junk), - (em_junk_sa_report_non_junk), - (em_junk_sa_commit_reports): judge spamassassin version to decide - which sync option should be used - -2005-10-06 Vivek Jain <jvivek@novell.com> - - ** See Bug #268852 - * em-junk-filter.c : (em_junk_sa_run_spamd) - allow max one chid to be spawned for - spamd. - -2005-10-03 Vivek Jain <jvivek@novell.com> - - * em-junk-filter.c: added (e_plugin_lib_enable) - calls init here to initialize all settings - **Fixes #317792 - unref GConfClient in finalize - -2005-08-23 Not Zed <NotZed@Ximian.com> - - * em-junk-filter.c (em_junk_sa_report_non_junk): pre-define. - -2005-07-06 Vivek Jain <jvivek@novell.com> - - * Makefile.am: Use NO_UNDEFINED. Link with more libraries. - -2005-07-06 Vivek Jain <jvivek@novell.com> - - sa-junk-plugin : plugin that uses spam assasin for junk mail - handling - moved em-junk-filter.c from mail/ to here and modified it to listen - to the callbacks from the plugin. - - diff --git a/plugins/sa-junk-plugin/em-junk-filter.c b/plugins/sa-junk-plugin/em-junk-filter.c index c8c53c6169..537831a07e 100644 --- a/plugins/sa-junk-plugin/em-junk-filter.c +++ b/plugins/sa-junk-plugin/em-junk-filter.c @@ -34,18 +34,12 @@ #include <signal.h> #include <time.h> -#include <camel/camel-mime-message.h> -#include <camel/camel-debug.h> -#include <camel/camel-file-utils.h> -#include <camel/camel-data-wrapper.h> -#include <camel/camel-stream-fs.h> -#include <camel/camel-stream-mem.h> -#include <camel/camel-i18n.h> #include <mail/em-junk.h> #include <mail/em-utils.h> #include <e-util/e-mktemp.h> #include <gtk/gtk.h> +#include <glib/gi18n.h> #include "mail/em-config.h" #include "shell/e-shell.h" @@ -195,7 +189,7 @@ pipe_to_sa_full (CamelMimeMessage *msg, const gchar *in, const gchar **argv, gin camel_data_wrapper_write_to_stream (CAMEL_DATA_WRAPPER (msg), stream); camel_stream_flush (stream); camel_stream_close (stream); - camel_object_unref (stream); + g_object_unref (stream); } else if (in) { camel_write (fds[1], in, strlen (in)); close (fds[1]); @@ -210,7 +204,7 @@ pipe_to_sa_full (CamelMimeMessage *msg, const gchar *in, const gchar **argv, gin camel_stream_mem_set_byte_array (memstream, output_buffer); camel_stream_write_to_stream (stream, (CamelStream *) memstream); - camel_object_unref (stream); + g_object_unref (stream); g_byte_array_append (output_buffer, (guchar *)"", 1); d(printf ("child process output: %s len: %d\n", output_buffer->data, output_buffer->len)); @@ -930,7 +924,9 @@ org_gnome_sa_use_remote_tests (struct _EPlugin *epl, struct _EConfigHookItemFact EShell *shell; GtkWidget *check, *vbox, *label; gchar *text = g_strdup_printf (" <small>%s</small>", _("This will make SpamAssassin more reliable, but slower")); - guint i = ((GtkTable *)data->parent)->nrows; + guint n_rows; + + g_object_get (data->parent, "n-rows", &n_rows, NULL); if (data->old) return data->old; @@ -945,7 +941,9 @@ org_gnome_sa_use_remote_tests (struct _EPlugin *epl, struct _EConfigHookItemFact gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check), !em_junk_sa_local_only); g_signal_connect (GTK_TOGGLE_BUTTON (check), "toggled", G_CALLBACK (use_remote_tests_cb), (gpointer) "/apps/evolution/mail/junk/sa/local_only"); - gtk_table_attach((GtkTable *)data->parent, vbox, 0, 1, i, i+1, 0, 0, 0, 0); + gtk_table_attach ( + GTK_TABLE (data->parent), vbox, + 0, 1, n_rows, n_rows+1, 0, 0, 0, 0); shell = e_shell_get_default (); if (e_shell_get_express_mode (shell)) diff --git a/plugins/save-calendar/ChangeLog b/plugins/save-calendar/ChangeLog deleted file mode 100644 index 28e5ad77e1..0000000000 --- a/plugins/save-calendar/ChangeLog +++ /dev/null @@ -1,293 +0,0 @@ -2009-01-21 Suman Manjunath <msuman@novell.com> - - ** Fix for bug #541209 - - ** Adapt to the new APIs from upstream libical. Changes made include - using the "_r" counterpart for the following APIs: - + icalproperty_as_ical_string () - + icalvalue_as_ical_string () - + icalcomponent_as_ical_string () - + icalparameter_as_ical_string () - + icaldurationtype_as_ical_string () - + icalenum_reqstat_code () - + icallangbind_property_eval_string () - + icallangbind_quote_as_ical () - + icalmime_text_end_part () - + icalperiodtype_as_ical_string () - + icalproperty_enum_to_string () - + icalproperty_get_parameter_as_string () - + icalproperty_get_value_as_string () - + icalproperty_get_property_name () - + icalrecurrencetype_as_string () - + icaltime_as_ical_string () - + icalreqstattype_as_string () - + icalvalue_binary_as_ical_string () - + icalvalue_int_as_ical_string () - + icalvalue_utcoffset_as_ical_string () - + icalvalue_string_as_ical_string () - + icalvalue_recur_as_ical_string () - + icalvalue_text_as_ical_string () - + icalvalue_attach_as_ical_string () - + icalvalue_duration_as_ical_string () - + icalvalue_date_as_ical_string () - + icalvalue_datetime_as_ical_string () - + icalvalue_float_as_ical_string () - + icalvalue_geo_as_ical_string () - + icalvalue_datetimeperiod_as_ical_string () - + icalvalue_period_as_ical_string () - + icalvalue_trigger_as_ical_string () - + icalvalue_as_ical_string () - - * ical-format.c (do_save_calendar_ical): - -2008-09-16 Sankar P <psankar@novell.com> - -License Changes - - * csv-format.c: - * ical-format.c: - * rdf-format.c: - -2008-09-12 Sankar P <psankar@novell.com> - -License Changes - - * save-calendar.c: - -2008-09-02 Sankar P <psankar@novell.com> - -License Changes - - * format-handler.h: - -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): - * rdf-format.c (do_save_calendar_rdf): - Remove pointless address check of a local variable. - -2008-04-17 Milan Crha <mcrha@redhat.com> - - ** Part of fix for bug #526739 - - * ical-format.c: (do_save_calendar_ical): - * csv-format.c: (do_save_calendar_csv): - * rdf-format.c: (do_save_calendar_rdf): - Use gio GOutpuStream instead of gnome-vfs handle. - * format-handler.h: (open_for_writing): - * save-calendar.c: (open_for_writing): New helper function. - -2008-02-18 Srinivasa Ragavan <sragavan@novell.com> - - * ical-format.c: (do_save_calendar_ical): Patch from OpenSUSE - -2008-01-25 Milan Crha <mcrha@redhat.com> - - ** Fix for bug #475781 - - * csv-format.c: (do_save_calendar_csv): - * rdf-format.c: (do_save_calendar_rdf): - Fix memory leaks around ECalComponentDateTime. - -2007-11-11 Gilles Dartiguelongue <gdartigu@svn.gnome.org> - - ** Fix bug #495872 - - * org-gnome-save-calendar.eplug.xml: - * save-calendar.c: (org_gnome_save_memos): - add memo support - -2007-09-27 Matthew Barnes <mbarnes@redhat.com> - - ** Fixes part of bug #477045 - - * org-gnome-save-calendar.eplug.xml: - Use standard icon names where applicable. - -2007-09-14 Matthew Barnes <mbarnes@redhat.com> - - ** Fixes part of bug #476231 - - * csv-format.c: - * ical-format.c: - * rdf-format.c: - * save-calendar.c: - Remove non-USE_GTKFILECHOOSER code. - GtkFileChooser has been around since 2004. - -2007-06-07 Gilles Dartiguelongue <dartigug@esiee.fr> - - * rdf-format.c: (add_nummeric_to_rdf), (add_time_to_rdf), - (add_string_to_rdf), (do_save_calendar_rdf): - more compilation warnings cleanup, completes bug #437584 fixes - -2007-04-02 Sankar P <psankar@novell.com> - - * Committed on behalf of Gilles Dartiguelongue <dartigug@esiee.fr> - - * org-gnome-save-calendar.eplug.xml: - Cleanup. - Fixes part of #301149 - -2007-03-29 Matthew Barnes <mbarnes@redhat.com> - - * save-calendar.c: - Fix "incompatible pointer type" warnings (#360619). - -2007-02-20 Chenthill Palanisamy <pchenthill@novell.com> - - Fixes #238093 (bnc) - * ical-format.c: (insert_tz_comps), (append_tz_to_comp), - (do_save_calendar_ical): Add the timezone information while - exporting the calendars. - -2006-08-17 Kjartan Maraas <kmaraas@gnome.org> - - * rdf-format.c: (add_time_to_rdf): Plug a leak. - -2006-05-25 Srinivasa Ragavan <sragavan@novell.com> - - - * save-calendar.c: (ask_destination_and_save): Added code to save - calendar to remote shares. - -2006-04-22 Srinivasa Ragavan <sragavan@novell.com> - - * ical-format.c (do_save_calendar_ical): Ask for overwrite, if the - file already exists. - - ** Fixes bug #329345 - -2006-02-13 Karsten Bräckelmann <guenther@rudersport.de> - - * org-gnome-save-calendar.eplug.xml: - Fix mnemonics to be consistent. Fixes bug #330934. - -2006-01-09 Kjartan Maraas <kmaraas@gnome.org> - - * csv-format.c: (string_needsquotes): - * save-calendar.c: (ask_destination_and_save): Fix confusion - between = and ==. Silences the compiler, but someone has to check - if this really is correct. - -2006-01-10 Simon Zheng <simon.zheng@sun.com> - - * csv-format.c: - * rdf-format.c: - use e_utf8_strftime() in evolution-data-server/ - libedataserver/e-data-server-util.c instead of the copy in - evolution/e-util/e-util.c. - -2005-12-30 Andre Klapper <a9016009@gmx.de> - - * csv-format.c: fixed two strings for consistency. - Fixes bug 325127 and partially bug 325125. - -2005-11-11 Dinesh Layek <LDinesh@novell.com> - - * save-calendar.c (ask_destination_and_save): append the file_extension - if the user does not provide it. - -2005-08-23 Not Zed <NotZed@Ximian.com> - - * ical-format.c: include missing header. - -2005-05-16 Not Zed <NotZed@Ximian.com> - - * csv-format.c: moved e-error to e-util - -2005-05-12 Not Zed <NotZed@Ximian.com> - - * Makefile.am: setup built_sources/cleanfiles - -2005-03-02 Philip Van Hoof <pvanhoof@gnome.org> - - * rdf-format.c: Fixes for Bug #73099 and Bug #73098 - * csv-format.c: Changed malloc to g_malloc and char to gchar - * csv-format.c: Fixes for Bug #73099 and Bug #73098 - -2005-05-06 Not Zed <NotZed@Ximian.com> - - * Makefile.am: - * org-gnome-save-calendar.eplug.xml: s/.in/.xml/ & fix i18n. - -2005-03-22 Chenthill Palanisamy <pchenthill@novell.com> - - Fixes #73541 - * csv-format.c: (do_save_calendar_csv): - * ical-format.c: (do_save_calendar_ical): - * rdf-format.c: (do_save_calendar_rdf): Changed the - cal e_cal_new to auth_new_from_source, so that the - ecal has the auth function in it. - -2005-02-24 Björn Torkelsson <torkel@acc.umu.se> - - * org-gnome-save-calendar.eplug.in: Fixed description and added - author. - Shortened name of plugin. - Added xml tag. - -2005-02-21 Rodrigo Moya <rodrigo@novell.com> - - Fixes #71527 - - * ical-format.c (display_error_message): changed to get a simple - string instead of a GError. - (do_save_calendar_ical): use GNOME-VFS for saving the file. - -2005-01-05 JP Rosevear <jpr@novell.com> - - * save-calendar.c (ask_destination_and_save): fix build for non - gtk file chooser case - -2005-01-04 Philip Van Hoof <pvanhoof@gnome.org> - - * csv-format.c, rdf-format.c: Use standard error messages - -2004-12-27 Philip Van Hoof <pvanhoof@gnome.org> - - * csv-format.c, rdf-format.c: Warning when overwriting file - -2004-12-22 JP Rosevear <jpr@novell.com> - - * Makefile.am: list format-handler.h as a source so it dists - -2004-12-20 Philip Van Hoof <pvanhoof@gnome.org> - - * Makefile.am: Code splitup, each format has it's own c-file - * csv-format.c: Added. Code splitup - * format-handler.h: Added. Code splitup - * ical-format.c: Added. Code splitup - * rdf-format.c: Added. Support for RDF files. Code splitup - * save-calendar.c: Support for RDF files. Code splitup - -2004-11-30 Philip Van Hoof <pvanhoof@gnome.org> - - * save-calendar.c: Support for CSV files - -2004-11-01 JP Rosevear <jpr@novell.com> - - * Makefile.am: dist .eplug.in file - -2004-10-21 Rodrigo Moya <rodrigo@novell.com> - - * save-calendar.c (do_save_calendar): get error information in - e_cal_* calls, and display errors to the user. - -2004-10-21 JP Rosevear <jpr@novell.com> - - * save-calendar.c (do_save_calendar): compile if not using file - chooser - -2004-10-21 Rodrigo Moya <rodrigo@novell.com> - - * org-gnome-save-calendar.eplug.in: better menu items. - -2004-10-21 Rodrigo Moya <rodrigo@novell.com> - - * save-calendar.c: new plugin for saving a calendar to disk. diff --git a/plugins/save-calendar/save-calendar.c b/plugins/save-calendar/save-calendar.c index c8901b2d87..b7872a68d4 100644 --- a/plugins/save-calendar/save-calendar.c +++ b/plugins/save-calendar/save-calendar.c @@ -34,6 +34,7 @@ #include <libedataserverui/e-source-selector.h> #include <libecal/e-cal.h> #include <e-util/e-alert-dialog.h> +#include <e-util/e-plugin.h> #include <string.h> #include <shell/e-shell-sidebar.h> @@ -50,6 +51,14 @@ gboolean memo_list_save_as_init (GtkUIManager *ui_manager, gboolean task_list_save_as_init (GtkUIManager *ui_manager, EShellView *shell_view); +gint e_plugin_lib_enable (EPlugin *ep, gint enable); + +gint +e_plugin_lib_enable (EPlugin *ep, gint enable) +{ + return 0; +} + enum { /* GtkComboBox enum */ DEST_NAME_COLUMN, DEST_HANDLER, diff --git a/plugins/startup-wizard/ChangeLog b/plugins/startup-wizard/ChangeLog deleted file mode 100644 index 4ac3bcfce9..0000000000 --- a/plugins/startup-wizard/ChangeLog +++ /dev/null @@ -1,105 +0,0 @@ -2009-04-24 Milan Crha <mcrha@redhat.com> - - ** Part of fix for bug #381132 - - * org-gnome-evolution-startup-wizard.eplug.xml: - * startup-wizard.c: (startup_wizard_timezone_page), - (startup_wizard_commit), (startup_wizard_abort): - Do not setup timezone, set a system timezone instead. - -2009-01-21 Milan Crha <mcrha@redhat.com> - - * Makefile.am: Use also EVOLUTION_CALENDAR_CFLAGS. - -2008-09-19 Sankar P <psankar@novell.com> - -License Changes - - * startup-wizard.c: - -2008-08-01 Matthew Barnes <mbarnes@redhat.com> - - ** Fixes bug #529460 - - * org-gnome-evolution-startup-wizard.eplug.xml: - Change "Startup Wizard" to "Setup Assistant". Also make the - plugin description less lame. - -2008-06-02 Jacob Brown <jeblinux@gmail.com> - - ** Fix for bug #529464 - - * org-gnome-evolution-startup-wizard.eplug.xml: Do not use "handle" - -2007-08-20 Matthew Barnes <mbarnes@redhat.com> - - * Makefile.am: Fix a distcheck error. - -2007-03-16 Matthew Barnes <mbarnes@redhat.com> - - ** Fixes part of bug #360240 - - * startup-wizard.c (startup_wizard_timezone_page): - Remove unused variable. - -2007-01-27 Nickolay V. Shmyrev <nshmyrev@yandex.ru> - - * startup-wizard.c: (startup_wizard_timezone_page), - (startup_wizard_importer_page): - mark strings as translatable. See bug #399381 for details. - -2006-06-14 Srinivasa Ragavan <sragavan@novell.com> - - * startup-wizard.c: (startup_wizard_timezone_page): Pass the default - timezone as NULL, so that it picks up from the local timezone. - -2005-12-30 Andre Klapper <a9016009@gmx.de> - - * evolution/plugins/startup-wizard/org-gnome-evolution-startup-wizard.eplug.xml: - Fixing several typos and harmonizing - capital/small letters. Partially fixes bug 306117. - -2005-07-13 Harish Krishnaswamy <kharish@novell.com> - - * Makefile.am : remove the reference to - shell/importer/libevolution-importer.la - -2005-07-13 Not Zed <NotZed@Ximian.com> - - * startup-wizard.c (startup_wizard_importer_page) - (startup_wizard_commit): re-write the importer stuff to use the - eplugin stuff. - -2005-07-12 Not Zed <NotZed@Ximian.com> - - * startup-wizard.c: removed all the importer stuff. fixed the - copyright. - -2005-07-06 Frederic Crozat <fcrozat@mandriva.com> - - * startup-wizard.c: (startup_wizard_delete), (startup_wizard): - Exit evolution when closing wizard using window manager - control ; don't set hint or wmclass, it is too late, window is already - realized. - -2005-06-27 Tor Lillqvist <tml@novell.com> - - * Makefile.am: Use NO_UNDEFINED. Link with more libraries. - -2005-06-18 Tor Lillqvist <tml@novell.com> - - * org-gnome-evolution-startup-wizard.eplug.xml: Use SOEXT. - -2005-05-12 Not Zed <NotZed@Ximian.com> - - * Makefile.am: added built_sources/cleanfiles - -2005-05-06 Not Zed <NotZed@Ximian.com> - - * Makefile.am: - * org-gnome-evolution-startup-wizard.eplug.xml: s/.in/.xml/ & i18n. - -2005-02-21 JP Rosevear <jpr@novell.com> - - * startup-wizard.c: A plugin the does the startup wizard - diff --git a/plugins/startup-wizard/startup-wizard.c b/plugins/startup-wizard/startup-wizard.c index f6e5dcc34e..904e630487 100644 --- a/plugins/startup-wizard/startup-wizard.c +++ b/plugins/startup-wizard/startup-wizard.c @@ -34,6 +34,7 @@ #include "capplet/settings/mail-capplet-shell.h" +gint e_plugin_lib_enable (EPlugin *ep, gint enable); void startup_wizard (EPlugin *ep, ESEventTargetUpgrade *target); GtkWidget *startup_wizard_importer_page (EPlugin *ep, EConfigHookItemFactoryData *hook_data); gboolean startup_wizard_check (EPlugin *ep, EConfigHookPageCheckData *check_data); @@ -46,6 +47,12 @@ static EImportImporter *import_importer; static GtkWidget *import_dialog, *import_progress, *import_label; static GSList *import_iterator, *import_importers; +gint +e_plugin_lib_enable (EPlugin *ep, gint enable) +{ + return 0; +} + G_GNUC_NORETURN static void startup_wizard_terminate (void) { gtk_main_quit (); @@ -237,6 +244,7 @@ startup_wizard_commit (EPlugin *ep, EMConfigTargetAccount *target) { EShell *shell; EShellSettings *shell_settings; + GtkWidget *content_area; gchar *location; shell = e_shell_get_default (); @@ -254,15 +262,27 @@ startup_wizard_commit (EPlugin *ep, EMConfigTargetAccount *target) import_iterator = import_importers; import_importer = import_iterator->data; - import_dialog = e_alert_dialog_new_for_args (e_shell_get_active_window (shell), "shell:importing", _("Importing data."), NULL); - g_signal_connect(import_dialog, "response", G_CALLBACK(import_dialog_response), NULL); + import_dialog = e_alert_dialog_new_for_args ( + e_shell_get_active_window (shell), + "shell:importing", _("Importing data."), NULL); + content_area = gtk_dialog_get_content_area ( + GTK_DIALOG (import_dialog)); + g_signal_connect ( + import_dialog, "response", + G_CALLBACK (import_dialog_response), NULL); import_label = gtk_label_new(_("Please wait")); import_progress = gtk_progress_bar_new(); - gtk_box_pack_start(GTK_BOX(((GtkDialog *)import_dialog)->vbox), import_label, FALSE, FALSE, 0); - gtk_box_pack_start(GTK_BOX(((GtkDialog *)import_dialog)->vbox), import_progress, FALSE, FALSE, 0); + gtk_box_pack_start ( + GTK_BOX (content_area), + import_label, FALSE, FALSE, 0); + gtk_box_pack_start ( + GTK_BOX (content_area), + import_progress, FALSE, FALSE, 0); gtk_widget_show_all(import_dialog); - e_import_import(import, (EImportTarget *)import_target, import_importer, import_status, import_done, NULL); + e_import_import ( + import, (EImportTarget *) import_target, + import_importer, import_status, import_done, NULL); } else { gtk_main_quit(); } diff --git a/plugins/subject-thread/ChangeLog b/plugins/subject-thread/ChangeLog deleted file mode 100644 index dbf730b10b..0000000000 --- a/plugins/subject-thread/ChangeLog +++ /dev/null @@ -1,68 +0,0 @@ -2008-08-27 Sankar P <psankar@novell.com> - -License Changes - - * subject-thread.c: - -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 - - * subject-thread.c: (org_gnome_subject_thread_factory): - -2007-04-02 Sankar P <psankar@novell.com> - - * Committed on behalf of Gilles Dartiguelongue <dartigug@esiee.fr> - - * org-gnome-subject-thread.eplug.xml: - Cleanup. - Fixes part of #301149 - -2007-03-20 Matthew Barnes <mbarnes@redhat.com> - - ** Fixes part of bug #419524 - - * Include <glib/gi18n.h> instead of <libgnome/gnome-i18n.h>. - -2005-05-12 Not Zed <NotZed@Ximian.com> - - * Makefile.am: setup built_sources/cleanfiles - -2005-05-06 Not Zed <NotZed@Ximian.com> - - * Makefile.am: - - * org-gnome-subject-thread.eplug.xml: s/.in/.xml/ & i18n. - -2005-02-24 Björn Torkelsson <torkel@acc.umu.se> - - * org-gnome-subject-thread.eplug.in: Added xml tag. - Fixed description and added author. - -2005-02-07 JP Rosevear <jpr@novell.com> - - * org-gnome-subject-thread.eplug.in: specify id - -2004-11-01 JP Rosevear <jpr@novell.com> - - * Makefile.am: dist .eplug.in file - -2004-10-20 Not Zed <NotZed@Ximian.com> - - * Makefile.am (INCLUDES): removed camel from include path, - everything should include camel/foo. - -2004-10-20 JP Rosevear <jpr@novell.com> - - * subject-thread.c: implement - - * org-gnome-subject-thread.eplug.in: define the - subject-thread plugin - - * Makefile.am: build the subject thread plugin - diff --git a/plugins/subject-thread/subject-thread.c b/plugins/subject-thread/subject-thread.c index 6c008c71ae..26012d3461 100644 --- a/plugins/subject-thread/subject-thread.c +++ b/plugins/subject-thread/subject-thread.c @@ -36,6 +36,13 @@ #define GCONF_KEY "/apps/evolution/mail/display/thread_subject" GtkWidget *org_gnome_subject_thread_factory (EPlugin *ep, EConfigHookItemFactoryData *hook_data); +gint e_plugin_lib_enable (EPlugin *ep, gint enable); + +gint +e_plugin_lib_enable (EPlugin *ep, gint enable) +{ + return 0; +} static void toggled_cb (GtkWidget *widget, EConfig *config) diff --git a/plugins/templates/ChangeLog b/plugins/templates/ChangeLog deleted file mode 100644 index 789f58de0b..0000000000 --- a/plugins/templates/ChangeLog +++ /dev/null @@ -1,49 +0,0 @@ -2008-10-15 Bharath Acharya <abharath@novell.com> - - ** Fix for bug #556284 - - * templates.c: (reply_with_template), (org_gnome_templates_popup), - (action_template_cb): Fixes for fetching the store using - mail_component_peek_local_store. Fixes the right-click crash issues - caused on OS_WIN32 by Templates plugin. - -2008-09-15 Sankar P <psankar@novell.com> - -License Changes - - * plugins/templates/templates.c: - -2008-09-01 Matthew Barnes <mbarnes@redhat.com> - - * templates.c: - Don't mix declarations and code. - -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. - - * Makefile.am (INCLUDES): Allow includes from top_builddir. - -2008-07-18 Bharath Acharya <abharath@novell.com> - - ** Fixes Bug #200147 - - Basic functionality implemented by Diego Escalante Urrelo - <diegoe@gnome.org> Everyone owes him a big mug of Beer for that. - - ** Added Templates plugin - * Makefile.am: - * apps-evolution-template-placeholders.schemas.in: - * org-gnome-templates.eplug.xml: - * templates.c: - * templates.glade: diff --git a/plugins/templates/templates.c b/plugins/templates/templates.c index b88e26d29d..74e167a9fe 100644 --- a/plugins/templates/templates.c +++ b/plugins/templates/templates.c @@ -30,10 +30,6 @@ #include <gconf/gconf-client.h> #include <e-util/e-config.h> -#include <camel/camel-url.h> -#include <camel/camel-multipart.h> -#include <camel/camel-stream-mem.h> -#include <camel/camel-string-utils.h> #include <mail/e-mail-local.h> #include <mail/e-mail-reader.h> @@ -389,17 +385,17 @@ e_plugin_lib_get_configure_widget (EPlugin *epl) clue_add = gtk_button_new_from_stock ("gtk-add"); gtk_widget_show (clue_add); gtk_container_add (GTK_CONTAINER (vbuttonbox2), clue_add); - GTK_WIDGET_SET_FLAGS (clue_add, GTK_CAN_DEFAULT); + gtk_widget_set_can_default (clue_add, TRUE); clue_edit = gtk_button_new_from_stock ("gtk-edit"); gtk_widget_show (clue_edit); gtk_container_add (GTK_CONTAINER (vbuttonbox2), clue_edit); - GTK_WIDGET_SET_FLAGS (clue_edit, GTK_CAN_DEFAULT); + gtk_widget_set_can_default (clue_edit, TRUE); clue_remove = gtk_button_new_from_stock ("gtk-remove"); gtk_widget_show (clue_remove); gtk_container_add (GTK_CONTAINER (vbuttonbox2), clue_remove); - GTK_WIDGET_SET_FLAGS (clue_remove, GTK_CAN_DEFAULT); + gtk_widget_set_can_default (clue_remove, TRUE); ui->gconf = gconf_client_get_default (); @@ -490,7 +486,7 @@ create_new_message (CamelFolder *folder, const gchar *uid, CamelMimeMessage *mes camel_data_wrapper_write_to_stream (CAMEL_DATA_WRAPPER (template), mem); camel_stream_reset (mem); camel_data_wrapper_construct_from_stream (CAMEL_DATA_WRAPPER (new), mem); - camel_object_unref (mem); + g_object_unref (mem); /* Add the headers from the message we are replying to, so CC and that * stuff is preserved. */ @@ -518,7 +514,7 @@ create_new_message (CamelFolder *folder, const gchar *uid, CamelMimeMessage *mes /* Create the composer */ em_utils_edit_message (new, folder); - camel_object_unref(new); + g_object_unref (new); } static void @@ -558,22 +554,24 @@ build_template_menus_recurse (GtkUIManager *ui_manager, GPtrArray *uids; GtkAction *action; const gchar *action_label; + const gchar *folder_name; gchar *action_name; gchar *path; guint ii; folder = camel_store_get_folder ( store, folder_info->full_name, 0, NULL); + folder_name = camel_folder_get_name (folder); action_name = g_strdup_printf ( "templates-menu-%d", *action_count); *action_count = *action_count + 1; /* To avoid having a Templates dir, we ignore the top level */ - if (g_str_has_suffix (folder->name, "Templates")) + if (g_str_has_suffix (folder_name, "Templates")) action_label = _("Templates"); else - action_label = folder->name; + action_label = folder_name; action = gtk_action_new ( action_name, action_label, NULL, NULL); @@ -609,7 +607,7 @@ build_template_menus_recurse (GtkUIManager *ui_manager, continue; template = camel_folder_get_message (folder, uid, NULL); - camel_object_ref (template); + g_object_ref (template); action_label = camel_mime_message_get_subject (template); @@ -624,7 +622,7 @@ build_template_menus_recurse (GtkUIManager *ui_manager, action_name, action_label, NULL, NULL); muid = camel_pstring_strdup (message_uid); - camel_object_ref (message_folder); + g_object_ref (message_folder); g_object_set_data_full ( G_OBJECT (action), "message_uid", (gpointer) muid, @@ -632,11 +630,11 @@ build_template_menus_recurse (GtkUIManager *ui_manager, g_object_set_data_full ( G_OBJECT (action), "message_folder", message_folder, - (GDestroyNotify) camel_object_unref); + (GDestroyNotify) g_object_unref); g_object_set_data_full ( G_OBJECT (action), "template", template, - (GDestroyNotify) camel_object_unref); + (GDestroyNotify) g_object_unref); g_signal_connect ( action, "activate", @@ -704,6 +702,7 @@ update_actions_cb (EShellView *shell_view) CamelStore *store; EMailReader *reader; GPtrArray *uids; + const gchar *full_name; guint action_count = 0; guint merge_id; gpointer data; @@ -734,9 +733,10 @@ update_actions_cb (EShellView *shell_view) store = e_mail_local_get_store (); templates_folder = e_mail_local_get_folder (E_MAIL_FOLDER_TEMPLATES); + full_name = camel_folder_get_full_name (templates_folder); folder_info = camel_store_get_folder_info ( - store, templates_folder->full_name, + store, full_name, CAMEL_STORE_FOLDER_INFO_RECURSIVE | CAMEL_STORE_FOLDER_INFO_FAST, NULL); diff --git a/plugins/tnef-attachments/ChangeLog b/plugins/tnef-attachments/ChangeLog deleted file mode 100644 index b90faf0bf8..0000000000 --- a/plugins/tnef-attachments/ChangeLog +++ /dev/null @@ -1,74 +0,0 @@ -2009-01-28 Tor Lillqvist <tml@novell.com> - - * Makefile.am: Use -no-undefined and link with more libraries on - Windows. - - * tnef-plugin.c: Remove unused <sys/wait.h>. - -2008-09-24 Philip Withnall <philip@tecnocode.co.uk> - - ** Fixes bug #553479 - - * org-gnome-tnef-attachments.eplug.xml: String capitalisation - improvements. - -2008-09-03 Sankar P <psankar@novell.com> - - * plugins/tnef-attachments/tnef-plugin.c: - Assign copyrights to Randall Hand. - -2008-08-27 Sankar P <psankar@novell.com> - -License Changes - - * tnef-plugin.c: - -2008-03-31 Frederic Crozat <fcrozat@mandriva.com> - - ** Fix for bug #501885 - - * Makefile.am: Specify locale directory correctly. - -2008-03-17 Paul Bolle <pebolle@tiscali.nl> - - ** Fix for bug #519421 - - * Makefile.am: - * tnef-plugin.c: Also allow <libytnef/tnef.h> header file. - -2008-02-07 Paul Bolle <pebolle@tiscali.nl> - - ** Fix for bug #514736 - - * org-gnome-tnef-attachments.eplug.xml: Added 'application/ms-tnef' - MIME type for TNEF attachment decoding. - -2008-02-07 Paul Bolle <pebolle@tiscali.nl> - - ** Fix for bug #514771 - - * tnef-plugin.c: (saveVCalendar): Fixed a crasher while decoding - TNEF attachments. - -2007-08-27 Srinivasa Ragavan <sragavan@novell.com> - - * tnef-plugin.c: (e_plugin_lib_enable): Avoid reentrancy in enable. - -2007-07-09 Srinivasa Ragavan <sragavan@novell.com> - - * org-gnome-tnef-attachments.eplug.xml: Fixed bugs where the .so wasn't - reffered rightly. - -2007-07-09 Srinivasa Ragavan <sragavan@novell.com> - - ** Cleanups from Lucky Wankhede - - * org-gnome-tnef-attachments.eplug.xml: - * tnef-plugin.c: (org_gnome_format_tnef), (processTnef), - (saveVCard), (printRrule), (saveVCalendar), (saveVTask), - (fprintProperty), (fprintUserProp): - -2007-06-07 Lucky Wankhede <wlakke@novell.com> - * New implementation for tnef - * For reading "winmail.dat" kind of attachements - * using libytnef diff --git a/plugins/tnef-attachments/tnef-plugin.c b/plugins/tnef-attachments/tnef-plugin.c index 074ec635fb..8bb5341998 100644 --- a/plugins/tnef-attachments/tnef-plugin.c +++ b/plugins/tnef-attachments/tnef-plugin.c @@ -40,12 +40,6 @@ #include <libytnef/ytnef.h> #endif -#include <camel/camel-mime-part.h> -#include <camel/camel-folder.h> -#include <camel/camel-exception.h> -#include <camel/camel-multipart.h> -#include <camel/camel-stream-fs.h> - #include <em-format/em-format.h> #include <mail/em-format-hook.h> #include <mail/em-utils.h> @@ -95,15 +89,15 @@ org_gnome_format_tnef(gpointer ep, EMFormatHookTarget *t) out = camel_stream_fs_new_with_name(name, O_RDWR|O_CREAT, 0666); if (out == NULL) goto fail; - content = camel_medium_get_content_object((CamelMedium *)t->part); + content = camel_medium_get_content ((CamelMedium *)t->part); if (content == NULL) goto fail; if (camel_data_wrapper_decode_to_stream(content, out) == -1 || camel_stream_close(out) == -1) { - camel_object_unref(out); + g_object_unref (out); goto fail; } - camel_object_unref(out); + g_object_unref (out); /* Extracting the winmail.dat */ TNEFInitialize(&tnef); @@ -126,7 +120,7 @@ org_gnome_format_tnef(gpointer ep, EMFormatHookTarget *t) camel_data_wrapper_set_mime_type((CamelDataWrapper *)mp, "multipart/mixed"); camel_multipart_set_boundary(mp, NULL); - camel_medium_set_content_object((CamelMedium *)mainpart, (CamelDataWrapper *)mp); + camel_medium_set_content ((CamelMedium *)mainpart, (CamelDataWrapper *)mp); while ((d = readdir(dir))) { CamelMimePart *part; @@ -145,13 +139,13 @@ org_gnome_format_tnef(gpointer ep, EMFormatHookTarget *t) stream = camel_stream_fs_new_with_name(path, O_RDONLY, 0); content = camel_data_wrapper_new(); camel_data_wrapper_construct_from_stream(content, stream); - camel_object_unref(stream); + g_object_unref (stream); part = camel_mime_part_new(); camel_mime_part_set_encoding(part, CAMEL_TRANSFER_ENCODING_BINARY); - camel_medium_set_content_object((CamelMedium *)part, content); - camel_object_unref(content); + camel_medium_set_content ((CamelMedium *)part, content); + g_object_unref (content); type = em_format_snoop_type(part); if (type) @@ -162,7 +156,7 @@ org_gnome_format_tnef(gpointer ep, EMFormatHookTarget *t) g_free(path); camel_multipart_add_part(mp, part); - camel_object_unref(part); + g_object_unref (part); } closedir(dir); @@ -173,17 +167,17 @@ org_gnome_format_tnef(gpointer ep, EMFormatHookTarget *t) if (camel_multipart_get_number(mp) > 0) em_format_part_as(t->format, t->stream, mainpart, "multipart/mixed"); else if (t->item->handler.old) - t->item->handler.old->handler(t->format, t->stream, t->part, t->item->handler.old); + t->item->handler.old->handler(t->format, t->stream, t->part, t->item->handler.old, FALSE); g_string_truncate(t->format->part_id, len); - camel_object_unref(mp); - camel_object_unref(mainpart); + g_object_unref (mp); + g_object_unref (mainpart); goto ok; fail: if (t->item->handler.old) - t->item->handler.old->handler(t->format, t->stream, t->part, t->item->handler.old); + t->item->handler.old->handler(t->format, t->stream, t->part, t->item->handler.old, FALSE); ok: g_free(name); g_free(tmpdir); @@ -333,10 +327,10 @@ void processTnef(TNEFStruct *tnef, const gchar *tmpdir) { /* Ok, it's not an embedded stream, so now we */ /* process it. */ if ((filename = MAPIFindProperty(&(p->MAPI), - PROP_TAG(30,0x3707))) + PROP_TAG(PT_STRING8, PR_ATTACH_LONG_FILENAME))) == MAPI_UNDEFINED) { if ((filename = MAPIFindProperty(&(p->MAPI), - PROP_TAG(30,0x3001))) + PROP_TAG(PT_STRING8, PR_DISPLAY_NAME))) == MAPI_UNDEFINED) { filename = &(p->Title); } diff --git a/plugins/vcard-inline/vcard-inline.c b/plugins/vcard-inline/vcard-inline.c index 0aafc8c82d..0b7756211f 100644 --- a/plugins/vcard-inline/vcard-inline.c +++ b/plugins/vcard-inline/vcard-inline.c @@ -24,9 +24,6 @@ #include <glib/gi18n-lib.h> #include <libebook/e-book.h> #include <libebook/e-contact.h> -#include <camel/camel-medium.h> -#include <camel/camel-mime-part.h> -#include <camel/camel-stream-mem.h> #include <gtkhtml/gtkhtml-embedded.h> #include "addressbook/gui/merging/eab-contact-merging.h" @@ -52,6 +49,13 @@ static gint org_gnome_vcard_inline_classid; /* Forward Declarations */ void org_gnome_vcard_inline_format (gpointer ep, EMFormatHookTarget *target); +gint e_plugin_lib_enable (EPlugin *ep, gint enable); + +gint +e_plugin_lib_enable (EPlugin *ep, gint enable) +{ + return 0; +} static void org_gnome_vcard_inline_pobject_free (EMFormatHTMLPObject *object) @@ -94,7 +98,7 @@ org_gnome_vcard_inline_decode (VCardInlinePObject *vcard_object, /* Stream takes ownership of the byte array. */ stream = camel_stream_mem_new_with_byte_array (array); - data_wrapper = camel_medium_get_content_object (medium); + data_wrapper = camel_medium_get_content (medium); camel_data_wrapper_decode_to_stream (data_wrapper, stream); /* because the result is not NULL-terminated */ @@ -104,8 +108,8 @@ org_gnome_vcard_inline_decode (VCardInlinePObject *vcard_object, contact_list = eab_contact_list_from_string (string); vcard_object->contact_list = contact_list; - camel_object_unref (mime_part); - camel_object_unref (stream); + g_object_unref (mime_part); + g_object_unref (stream); } static void @@ -280,7 +284,7 @@ org_gnome_vcard_inline_format (gpointer ep, EMFormatHookTarget *target) classid, target->part, org_gnome_vcard_inline_embed); - camel_object_ref (target->part); + g_object_ref (target->part); vcard_object->object.free = org_gnome_vcard_inline_pobject_free; org_gnome_vcard_inline_decode (vcard_object, target->part); diff --git a/plugins/webdav-account-setup/ChangeLog b/plugins/webdav-account-setup/ChangeLog deleted file mode 100644 index ce72e9c671..0000000000 --- a/plugins/webdav-account-setup/ChangeLog +++ /dev/null @@ -1,55 +0,0 @@ -2009-04-24 Milan Crha <mcrha@redhat.com> - - ** Part of fix for bug #569652 - - * webdav-contacts-source.c: (find_webdav_group): Removed. - * webdav-contacts-source.c: (ensure_webdav_contacts_source_group), - (remove_webdav_contacts_source_group): - Use new ESourceList API (simplifies code). - -2009-02-26 Matthew Barnes <mbarnes@redhat.com> - - ** Fixes part of bug #572950 - - * Makefile.am: - Fix ordering of -I compiler directives. Patch by Daniel Macks. - -2009-02-25 Milan Crha <mcrha@redhat.com> - - ** Part of fix for bug #559719 - - * webdav-contacts-source.c: (destroy_ui_data), - (plugin_webdav_contacts): Use it's own/unique name for the property - on the 'epl' and free the widget only if it wasn't freed yet. - -2009-01-29 Milan Crha <mcrha@redhat.com> - - ** Fix for bug #539467 - - * webdav-contacts-source.c: (find_webdav_group), - (ensure_webdav_contacts_source_group), - (remove_webdav_contacts_source_group): - Find group by its base uri, not by a localized name. - -2008-09-24 Philip Withnall <philip@tecnocode.co.uk> - - ** Fixes bug #553479 - - * webdav-contacts-source.c (plugin_webdav_contacts): - String capitalisation improvements. - -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/webdav-contacts-source.c b/plugins/webdav-account-setup/webdav-contacts-source.c index 9f35d0bd54..8d822e6c9e 100644 --- a/plugins/webdav-account-setup/webdav-contacts-source.c +++ b/plugins/webdav-account-setup/webdav-contacts-source.c @@ -212,6 +212,7 @@ plugin_webdav_contacts(EPlugin *epl, EConfigHookItemFactoryData *data) GtkWidget *label; ui_data *uidata; + gchar *buff; source = t->source; @@ -232,7 +233,9 @@ plugin_webdav_contacts(EPlugin *epl, EConfigHookItemFactoryData *data) gtk_box_pack_start(GTK_BOX(vbox), vbox2, FALSE, FALSE, 0); section = gtk_label_new(NULL); - gtk_label_set_markup(GTK_LABEL(section), _("<b>Server</b>")); + buff = g_strconcat ("<b>", _("Server"), "</b>", NULL); + gtk_label_set_markup(GTK_LABEL(section), buff); + g_free (buff); gtk_misc_set_alignment(GTK_MISC(section), 0.0, 0.0); gtk_box_pack_start(GTK_BOX(vbox2), section, FALSE, FALSE, 0); |