[build] Rename DATADIR with EVINCEDATADIR

[evince.git] / previewer / ev-previewer.c

diff --git a/previewer/ev-previewer.c b/previewer/ev-previewer.c
index 5c1980a062d4d9be484470293e8890fe69784a57..50290798575cf0e2f09cf4fc40673d768e9bac55 100644 (file)
--- a/previewer/ev-previewer.c
+++ b/previewer/ev-previewer.c
@@ -15,7 +15,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
 #include <config.h>
@@ -28,12 +28,11 @@
 #include "ev-previewer-window.h"
 
 #ifdef G_OS_WIN32
-#ifdef DATADIR
-#undef DATADIR
-#endif
 #include <io.h>
 #include <conio.h>
-#define _WIN32_WINNT 0x0500
+#if !(_WIN32_WINNT >= 0x0500)
+#error "_WIN32_WINNT must be defined >= 0x0500"
+#endif
 #include <windows.h>
 #endif
 
@@ -65,8 +64,8 @@ ev_previewer_unlink_tempfile (const gchar *filename)
 }
 
 static void
-ev_previewer_load_job_finished (EvJob             *job,
-                               EvPreviewerWindow *window)
+ev_previewer_load_job_finished (EvJob           *job,
+                               EvDocumentModel *model)
 {
        if (ev_job_is_failed (job)) {
                g_warning ("%s", job->error->message);
@@ -74,23 +73,26 @@ ev_previewer_load_job_finished (EvJob             *job,
 
                return;
        }
-
-       ev_previewer_window_set_document (window, job->document);
+       ev_document_model_set_document (model, job->document);
        g_object_unref (job);
 }
 
 static void
-ev_previewer_load_document (const gchar       *filename,
-                           EvPreviewerWindow *window)
+ev_previewer_load_document (const gchar     *filename,
+                           EvDocumentModel *model)
 {
        EvJob *job;
        gchar *uri;
+       GFile  *file;
+
+       file = g_file_new_for_commandline_arg (filename);
+       uri = g_file_get_uri (file);
+       g_object_unref (file);
 
-       uri = g_filename_to_uri (filename, NULL, NULL);
        job = ev_job_load_new (uri);
        g_signal_connect (job, "finished",
                          G_CALLBACK (ev_previewer_load_job_finished),
-                         window);
+                         model);
        ev_job_scheduler_push_job (job, EV_JOB_PRIORITY_NONE);
        g_free (uri);
 }
@@ -98,10 +100,11 @@ ev_previewer_load_document (const gchar       *filename,
 gint
 main (gint argc, gchar **argv)
 {
-       GtkWidget      *window;
-       GOptionContext *context;
-       const gchar    *filename;
-       GError         *error = NULL;
+       GtkWidget       *window;
+       GOptionContext  *context;
+       const gchar     *filename;
+       EvDocumentModel *model;
+       GError          *error = NULL;
 
 #ifdef G_OS_WIN32
     if (fileno (stdout) != -1 &&
@@ -133,7 +136,7 @@ main (gint argc, gchar **argv)
 
 #ifdef ENABLE_NLS
        /* Initialize the i18n stuff */
-       bindtextdomain (GETTEXT_PACKAGE, GNOMELOCALEDIR);
+       bindtextdomain (GETTEXT_PACKAGE, ev_get_locale_dir());
        bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
        textdomain (GETTEXT_PACKAGE);
 #endif
@@ -175,7 +178,8 @@ main (gint argc, gchar **argv)
        g_set_application_name (_("GNOME Document Previewer"));
        gtk_window_set_default_icon_name ("evince");
 
-       window = ev_previewer_window_new ();
+       model = ev_document_model_new ();
+       window = ev_previewer_window_new (model);
        ev_previewer_window_set_source_file (EV_PREVIEWER_WINDOW (window), filename);
        ev_previewer_window_set_print_settings (EV_PREVIEWER_WINDOW (window), print_settings);
        g_signal_connect (window, "delete-event",
@@ -184,7 +188,7 @@ main (gint argc, gchar **argv)
                          G_CALLBACK (gtk_main_quit), NULL);
        gtk_widget_show (window);
 
-       ev_previewer_load_document (filename, EV_PREVIEWER_WINDOW (window));
+       ev_previewer_load_document (filename, model);
        
        gtk_main ();
 
@@ -195,6 +199,7 @@ main (gint argc, gchar **argv)
 
        ev_shutdown ();
        ev_stock_icons_shutdown ();
+       g_object_unref (model);
        
        return 0;
 }