aboutsummaryrefslogtreecommitdiffstats
path: root/plugins/backup-restore
diff options
context:
space:
mode:
Diffstat (limited to 'plugins/backup-restore')
-rw-r--r--plugins/backup-restore/ChangeLog182
-rw-r--r--plugins/backup-restore/backup-restore.c12
-rw-r--r--plugins/backup-restore/backup.c22
3 files changed, 24 insertions, 192 deletions
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);
generated by cgit (git 2.34.1) at 2024-10-08 18:40:36 +0800