diff options
| -rw-r--r-- | help/reference/shell/Makefile.am | 3 | ||||
| -rw-r--r-- | po/POTFILES.in | 1 | ||||
| -rw-r--r-- | shell/Makefile.am | 9 | ||||
| -rw-r--r-- | shell/ev-convert-metadata.c | 306 | ||||
| -rw-r--r-- | shell/ev-daemon.c | 96 |
5 files changed, 3 insertions, 412 deletions
diff --git a/help/reference/shell/Makefile.am b/help/reference/shell/Makefile.am index a78201d7..9996b466 100644 --- a/help/reference/shell/Makefile.am +++ b/help/reference/shell/Makefile.am @@ -111,8 +111,7 @@ GTKDOC_CFLAGS = \ FILTER_OUT = \ $(top_builddir)/shell/main.o \ - $(top_builddir)/shell/atrild-ev-daemon.o \ - $(top_builddir)/shell/ev-convert-metadata.o + $(top_builddir)/shell/atrild-ev-daemon.o GTKDOC_LIBS = \ $(top_builddir)/cut-n-paste/zoom-control/libephyzoom.la \ diff --git a/po/POTFILES.in b/po/POTFILES.in index d4866eb4..4dcf7bab 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -43,7 +43,6 @@ shell/ev-annotation-properties-dialog.c shell/ev-application.c shell/ev-history.c shell/ev-keyring.c -shell/ev-convert-metadata.c shell/ev-navigation-action.c shell/ev-navigation-action-widget.c shell/ev-open-recent-action.c diff --git a/shell/Makefile.am b/shell/Makefile.am index f161315a..162c21b2 100644 --- a/shell/Makefile.am +++ b/shell/Makefile.am @@ -24,9 +24,8 @@ AM_CPPFLAGS= \ bin_PROGRAMS=atril -libexec_PROGRAMS=atril-convert-metadata if ENABLE_DBUS -libexec_PROGRAMS += atrild +libexec_PROGRAMS = atrild endif atril_SOURCES= \ @@ -115,12 +114,6 @@ atril_LDADD= \ BUILT_SOURCES = ev-marshal.h ev-marshal.c -atril_convert_metadata_SOURCES= \ - ev-convert-metadata.c - -atril_convert_metadata_LDADD= \ - $(SHELL_LIBS) - if ENABLE_DBUS atrild_SOURCES= \ ev-daemon.c diff --git a/shell/ev-convert-metadata.c b/shell/ev-convert-metadata.c deleted file mode 100644 index bb3840cd..00000000 --- a/shell/ev-convert-metadata.c +++ /dev/null @@ -1,306 +0,0 @@ -/* ev-convert-metadata.c - * this file is part of atril, a mate document viewer - * - * Copyright (C) 2009 Carlos Garcia Campos <[email protected]> - * - * Atril is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * Atril 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 - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - -//#include <config.h> - -#include <gtk/gtk.h> -#include <glib.h> -#include <gio/gio.h> -#include <glib/gi18n.h> -#include <string.h> -#include <libxml/tree.h> -#include <X11/Xlib.h> -#define EV_METADATA_NAMESPACE "metadata::atril" - -#if GTK_CHECK_VERSION (3, 0, 0) -#define gtk_vbox_new(X,Y) gtk_box_new(GTK_ORIENTATION_VERTICAL,Y) -#endif - -typedef struct { - xmlNodePtr cur; - xmlChar *uri; -} DocItem; - -typedef struct { - GtkWidget *progress; - GtkWidget *label; - - xmlDocPtr doc; - GList *items; - GList *current; - guint n_item; -} ConvertData; - -static void -free_doc_item (DocItem *item) -{ - xmlFree (item->uri); - g_free (item); -} - -static void -convert_finish (ConvertData *data) -{ - g_list_foreach (data->items, (GFunc)free_doc_item, NULL); - g_list_free (data->items); - xmlFreeDoc (data->doc); - g_free (data); - - gtk_main_quit (); -} - -static gboolean -convert_file (ConvertData *data) -{ - GFile *file; - DocItem *item; - const gchar *uri; - xmlNodePtr node; - xmlNodePtr cur; - gint total, current; - gchar *text; - - if (!data->current) - return FALSE; - - item = (DocItem *) data->current->data; - uri = (const gchar *)item->uri; - node = item->cur; - data->current = g_list_next (data->current); - - /* Update progress information */ - total = g_list_length (data->items); - current = ++(data->n_item); - - text = g_strdup_printf (_("Converting %s"), uri); - gtk_label_set_text (GTK_LABEL (data->label), text); - g_free (text); - - text = g_strdup_printf (_("%d of %d documents converted"), current, total); - gtk_progress_bar_set_text (GTK_PROGRESS_BAR (data->progress), text); - g_free (text); - gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR (data->progress), - (gdouble)(current - 1) / total); - - file = g_file_new_for_uri (uri); - if (!g_file_query_exists (file, NULL)) { - g_printerr ("Uri %s does not exist\n", uri); - g_object_unref (file); - - return data->current != NULL; - } - - for (cur = node->xmlChildrenNode; cur != NULL; cur = cur->next) { - xmlChar *key; - xmlChar *value; - - if (xmlStrcmp (cur->name, (const xmlChar *)"entry") != 0) - continue; - - key = xmlGetProp (cur, (const xmlChar *)"key"); - value = xmlGetProp (cur, (const xmlChar *)"value"); - if (key && value) { - GFileInfo *info; - gchar *gio_key; - GError *error = NULL; - - info = g_file_info_new (); - - gio_key = g_strconcat (EV_METADATA_NAMESPACE"::", key, NULL); - g_file_info_set_attribute_string (info, gio_key, (const gchar *)value); - g_free (gio_key); - - if (!g_file_set_attributes_from_info (file, info, 0, NULL, &error)) { - g_printerr ("Error setting metadata for %s: %s\n", - uri, error->message); - g_error_free (error); - } - - g_object_unref (info); - } - - if (key) - xmlFree (key); - if (value) - xmlFree (value); - } - - g_object_unref (file); - - return data->current != NULL; -} - -static void -convert_metadata_cancel (GtkDialog *dialog, - gint response_id, - ConvertData *data) -{ - convert_finish (data); - exit (1); -} - -static void -show_progress_dialog (ConvertData *data) -{ - GtkWidget *dialog; - GtkWidget *action_area; - GtkWidget *vbox, *pbox; - GtkWidget *label; - GtkWidget *progress; - gchar *text; - - dialog = gtk_dialog_new_with_buttons (_("Converting metadata"), - NULL, - GTK_DIALOG_MODAL, - GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, - NULL); - action_area = gtk_dialog_get_action_area (GTK_DIALOG (dialog)); - gtk_container_set_border_width (GTK_CONTAINER (dialog), 5); - gtk_container_set_border_width (GTK_CONTAINER (action_area), 5); - gtk_box_set_spacing (GTK_BOX (action_area), 6); - - vbox = gtk_dialog_get_content_area (GTK_DIALOG (dialog)); - gtk_box_set_spacing (GTK_BOX (vbox), 12); - - label = gtk_label_new (NULL); - gtk_label_set_line_wrap (GTK_LABEL (label), TRUE); - gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.0); - text = g_strdup_printf ("<b>%s</b>", _("Converting metadata")); - gtk_label_set_markup (GTK_LABEL (label), text); - g_free (text); - gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0); - gtk_widget_show (label); - - label = gtk_label_new (_("The metadata format used by Atril " - "has changed, and hence it needs to be migrated. " - "If the migration is cancelled the metadata " - "storage will not work.")); - gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.0); - gtk_label_set_line_wrap (GTK_LABEL (label), TRUE); - gtk_box_pack_start (GTK_BOX (vbox), label, TRUE, TRUE, 0); - gtk_widget_show (label); - - pbox = gtk_vbox_new (FALSE, 6); - progress = gtk_progress_bar_new (); - data->progress = progress; - gtk_box_pack_start (GTK_BOX (pbox), progress, TRUE, TRUE, 0); - gtk_widget_show (progress); - - label = gtk_label_new (NULL); - data->label = label; - gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.0); - gtk_label_set_ellipsize (GTK_LABEL (label), PANGO_ELLIPSIZE_END); - gtk_box_pack_start (GTK_BOX (pbox), label, FALSE, FALSE, 0); - gtk_widget_show (label); - - gtk_box_pack_start (GTK_BOX (vbox), pbox, TRUE, TRUE, 0); - gtk_widget_show (pbox); - - g_signal_connect (dialog, "response", - G_CALLBACK (convert_metadata_cancel), - data); - - gtk_widget_show (dialog); -} - -static gboolean -convert_metadata_file (const gchar *filename) -{ - ConvertData *data; - xmlDocPtr doc; - xmlNodePtr cur; - - if (!g_file_test (filename, G_FILE_TEST_EXISTS)) - return FALSE; - - doc = xmlParseFile (filename); - if (!doc) { - g_printerr ("Error loading metadata file %s\n", filename); - return FALSE; - } - - cur = xmlDocGetRootElement (doc); - if (!cur) { - g_printerr ("Metadata file %s is empty\n", filename); - xmlFreeDoc (doc); - return TRUE; - } - - if (xmlStrcmp (cur->name, (const xmlChar *) "metadata")) { - g_printerr ("File %s is not a valid atril metadata file\n", filename); - xmlFreeDoc (doc); - return FALSE; - } - - data = g_new0 (ConvertData, 1); - data->doc = doc; - - for (cur = cur->xmlChildrenNode; cur != NULL; cur = cur->next) { - xmlChar *uri; - DocItem *item; - - if (xmlStrcmp (cur->name, (const xmlChar *)"document") != 0) - continue; - - uri = xmlGetProp (cur, (const xmlChar *)"uri"); - if (!uri) - continue; - - item = g_new (DocItem, 1); - item->uri = uri; - item->cur = cur; - data->items = g_list_prepend (data->items, item); - } - - if (!data->items) { - xmlFreeDoc (data->doc); - g_free (data); - - return TRUE; - } - - show_progress_dialog (data); - - data->current = data->items; - g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, - (GSourceFunc)convert_file, - data, - (GDestroyNotify)convert_finish); - - return TRUE; -} - -gint -main (gint argc, gchar **argv) -{ - if (argc != 2) { - g_printerr ("%s\n", "Usage: atril-convert-metadata FILE"); - return 1; - } - XInitThreads(); - gtk_init (&argc, &argv); - - if (!convert_metadata_file (argv[1])) - return 1; - - gtk_main (); - - return 0; -} diff --git a/shell/ev-daemon.c b/shell/ev-daemon.c index 0448872e..897b16e7 100644 --- a/shell/ev-daemon.c +++ b/shell/ev-daemon.c @@ -1,4 +1,4 @@ -/* ev-metadata.c +/* ev-daemon.c * this file is part of atril, a mate document viewer * * Copyright (C) 2009 Carlos Garcia Campos <[email protected]> @@ -115,98 +115,6 @@ ev_daemon_maybe_start_killtimer (gpointer data) } static gboolean -convert_metadata (const gchar *metadata) -{ - GFile *file; - char *argv[3]; - gint exit_status; - GFileAttributeInfoList *namespaces; - gboolean supported = FALSE; - GError *error = NULL; - gboolean retval; - - /* If metadata is not supported for a local file - * is likely because and old gvfs version is running. - */ - file = g_file_new_for_path (metadata); - namespaces = g_file_query_writable_namespaces (file, NULL, NULL); - if (namespaces) { - gint i; - - for (i = 0; i < namespaces->n_infos; i++) { - if (strcmp (namespaces->infos[i].name, "metadata") == 0) { - supported = TRUE; - break; - } - } - g_file_attribute_info_list_unref (namespaces); - } - if (!supported) { - g_warning ("GVFS metadata not supported. " - "Atril will run without metadata support.\n"); - g_object_unref (file); - return FALSE; - } - g_object_unref (file); - - argv[0] = g_build_filename (LIBEXECDIR, "atril-convert-metadata", NULL); - argv[1] = (char *) metadata; - argv[2] = NULL; - - retval = g_spawn_sync (NULL /* wd */, argv, NULL /* env */, - 0, NULL, NULL, NULL, NULL, - &exit_status, &error); - g_free (argv[0]); - - if (!retval) { - g_printerr ("Error migrating metadata: %s\n", error->message); - g_error_free (error); - } - - return retval && WIFEXITED (exit_status) && WEXITSTATUS (exit_status) == 0; -} - -static void -ev_migrate_metadata (void) -{ - gchar *updated; - gchar *metadata; - gchar *dot_dir; - const gchar *userdir; - - userdir = g_getenv ("MATE22_USER_DIR"); - if (userdir) { - dot_dir = g_build_filename (userdir, "atril", NULL); - } else { - dot_dir = g_build_filename(g_get_user_config_dir(), "atril", NULL); - } - - updated = g_build_filename (dot_dir, "migrated-to-gvfs", NULL); - if (g_file_test (updated, G_FILE_TEST_EXISTS)) { - /* Already migrated */ - g_free (updated); - g_free (dot_dir); - return; - } - - metadata = g_build_filename (dot_dir, "ev-metadata.xml", NULL); - if (g_file_test (metadata, G_FILE_TEST_EXISTS)) { - if (convert_metadata (metadata)) { - gint fd; - - fd = g_creat (updated, 0600); - if (fd != -1) { - close (fd); - } - } - } - - g_free (dot_dir); - g_free (updated); - g_free (metadata); -} - -static gboolean spawn_atril (const gchar *uri) { gchar *argv[3]; @@ -492,8 +400,6 @@ name_acquired_cb (GDBusConnection *connection, const gchar *name, gpointer user_data) { - ev_migrate_metadata (); - ev_daemon_maybe_start_killtimer (user_data); } |