--- evince-0.3.1.orig/configure.ac 2005-05-21 20:50:36.000000000 +0300 +++ evince-0.3.1/configure.ac 2005-05-26 23:18:37.000000000 +0300 @@ -32,15 +32,18 @@ POPPLER_REQUIRED=0.3.0 +CPPFLAGS="$CPPFLAGS -DUSE_STABLE_LIBGNOMEUI" +AC_SUBST(CPPFLAGS) + PKG_CHECK_MODULES(LIBEVPRIVATE, gtk+-2.0 >= 2.4.0) -PKG_CHECK_MODULES(TOOLBAR_EDITOR, gtk+-2.0 >= 2.4.0 libgnomeui-2.0 >= 2.4.0) -PKG_CHECK_MODULES(RECENT_FILES, gtk+-2.0 >= 2.4.0 libgnomeui-2.0 >= 2.4.0) +PKG_CHECK_MODULES(TOOLBAR_EDITOR, gtk+-2.0 >= 2.4.0 libxml-2.0) +PKG_CHECK_MODULES(RECENT_FILES, gtk+-2.0 >= 2.4.0 gnome-vfs-2.0 gconf-2.0) PKG_CHECK_MODULES(ZOOM_CONTROL, gtk+-2.0 >= 2.4.0) -PKG_CHECK_MODULES(SHELL, gtk+-2.0 >= 2.6.0 libgnomeui-2.0 gnome-vfs-2.0 libgnomeprint-2.2 libgnomeprintui-2.2 libglade-2.0 gconf-2.0 poppler-glib >= $POPPLER_REQUIRED) +PKG_CHECK_MODULES(SHELL, gtk+-2.0 >= 2.6.0 gnome-vfs-2.0 libglade-2.0 gconf-2.0 poppler-glib >= $POPPLER_REQUIRED) PKG_CHECK_MODULES(THUMBNAILER, gtk+-2.0 >= 2.6.0 gnome-vfs-2.0 poppler-glib >= $POPPLER_REQUIRED) PKG_CHECK_MODULES(DVI, gtk+-2.0 >= 2.6.0) PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.6.0) -PKG_CHECK_MODULES(PS, gtk+-2.0 >= 2.6.0 gnome-vfs-2.0 libgnomeui-2.0) +PKG_CHECK_MODULES(PS, gtk+-2.0 >= 2.6.0 gnome-vfs-2.0) PKG_CHECK_MODULES(POPPLER_GLIB, poppler-glib >= $POPPLER_REQUIRED) GLIB_GENMARSHAL=`$PKG_CONFIG --variable=glib_genmarshal glib-2.0` --- evince-0.3.1.orig/lib/ev-file-helpers.c 2005-05-10 15:48:34.000000000 +0300 +++ evince-0.3.1/lib/ev-file-helpers.c 2005-05-26 23:18:37.000000000 +0300 @@ -24,10 +24,14 @@ #include #include -#include +//#include #include "ev-file-helpers.h" +#ifndef GNOME_DOT_GNOME +#define GNOME_DOT_GNOME ".gnome" +#endif + static char *dot_dir = NULL; static gboolean --- evince-0.3.1.orig/shell/ev-document-types.c 2005-05-08 21:18:52.000000000 +0300 +++ evince-0.3.1/shell/ev-document-types.c 2005-05-26 23:18:42.000000000 +0300 @@ -143,6 +143,11 @@ return pixbuf_document_get_type (); } + /* HACK!! */ + if (strcmp (mime_type, "application/octet-stream") == 0) { + return pdf_document_get_type (); + } + return G_TYPE_INVALID; } --- evince-0.3.1.orig/shell/ev-pixbuf-cache.c 2005-05-03 17:07:10.000000000 +0300 +++ evince-0.3.1/shell/ev-pixbuf-cache.c 2005-05-26 23:18:42.000000000 +0300 @@ -73,7 +73,8 @@ pixbuf_cache->end_page = 0; pixbuf_cache->job_list = g_new0 (CacheJobInfo, PAGE_CACHE_LEN (pixbuf_cache)); - pixbuf_cache->preload_cache_size = 1; + //pixbuf_cache->preload_cache_size = 1; + pixbuf_cache->preload_cache_size = 0; pixbuf_cache->prev_job = g_new0 (CacheJobInfo, pixbuf_cache->preload_cache_size); pixbuf_cache->next_job = g_new0 (CacheJobInfo, pixbuf_cache->preload_cache_size); } --- evince-0.3.1.orig/shell/ev-sidebar-links.c 2005-05-16 13:16:48.000000000 +0300 +++ evince-0.3.1/shell/ev-sidebar-links.c 2005-05-26 23:18:42.000000000 +0300 @@ -223,6 +223,7 @@ return retval; } +#if 0 static void print_section_cb (GtkWidget *menuitem, EvSidebarLinks *sidebar) { @@ -315,7 +316,7 @@ return FALSE; } - +#endif static void ev_sidebar_links_construct (EvSidebarLinks *ev_sidebar_links) @@ -369,6 +370,7 @@ (GtkTreeCellDataFunc) links_page_num_func, ev_sidebar_links, NULL); +#if 0 g_signal_connect (GTK_TREE_VIEW (priv->tree_view), "button_press_event", G_CALLBACK (button_press_cb), @@ -377,6 +379,7 @@ "popup_menu", G_CALLBACK (popup_menu_cb), ev_sidebar_links); +#endif } static void --- evince-0.3.1.orig/shell/ev-view.c 2005-05-21 20:39:56.000000000 +0300 +++ evince-0.3.1/shell/ev-view.c 2005-05-26 23:18:42.000000000 +0300 @@ -1367,6 +1367,9 @@ return FALSE; } +#define BUTTON_FOR_SELECTION 2 +#define BUTTON_FOR_PANNING 1 + static gboolean ev_view_button_press_event (GtkWidget *widget, GdkEventButton *event) @@ -1380,7 +1383,7 @@ view->pressed_button = event->button; switch (event->button) { - case 1: + case BUTTON_FOR_SELECTION: if (view->selections) { clear_selection (view); gtk_widget_queue_draw (widget); @@ -1389,7 +1392,7 @@ view->selection_start.x = event->x; view->selection_start.y = event->y; return TRUE; - case 2: + case BUTTON_FOR_PANNING: /* use root coordinates as reference point because * scrolling changes window relative coordinates */ view->drag_info.start.x = event->x_root; @@ -1411,7 +1414,7 @@ { EvView *view = EV_VIEW (widget); - if (view->pressed_button == 1) { + if (view->pressed_button == BUTTON_FOR_SELECTION) { GdkRectangle selection; selection.x = MIN (view->selection_start.x, event->x) + view->scroll_x; @@ -1424,7 +1427,7 @@ gtk_widget_queue_draw (widget); return TRUE; - } else if (view->pressed_button == 2) { + } else if (view->pressed_button == BUTTON_FOR_PANNING) { if (!view->drag_info.dragging) { gboolean start; @@ -1489,7 +1492,7 @@ { EvView *view = EV_VIEW (widget); - if (view->pressed_button == 2) { + if (view->pressed_button == BUTTON_FOR_PANNING) { ev_view_set_cursor (view, EV_VIEW_CURSOR_NORMAL); } --- evince-0.3.1.orig/shell/ev-window.c 2005-05-20 18:19:25.000000000 +0300 +++ evince-0.3.1/shell/ev-window.c 2005-05-26 23:18:42.000000000 +0300 @@ -36,7 +36,7 @@ #include "ev-view.h" #include "ev-password.h" #include "ev-password-view.h" -#include "ev-print-job.h" +//#include "ev-print-job.h" #include "ev-document-thumbnails.h" #include "ev-document-links.h" #include "ev-document-types.h" @@ -59,12 +59,12 @@ #include #include -#include +//#include #include #include #include -#include +//#include #include @@ -1042,6 +1042,7 @@ gtk_widget_destroy (fc); } +#if 0 static gboolean using_postscript_printer (GnomePrintConfig *config) { @@ -1167,6 +1168,7 @@ { ev_window_print (ev_window); } +#endif static void ev_window_cmd_file_close_window (GtkAction *action, EvWindow *ev_window) @@ -1802,7 +1804,9 @@ g_return_if_fail (EV_IS_WINDOW (ev_window)); +#if 0 gnome_help_display ("evince.xml", NULL, &error); +#endif if(error != NULL) { g_warning (error->message); @@ -2332,9 +2336,11 @@ { "FileSaveAs", GTK_STOCK_SAVE_AS, N_("_Save a Copy..."), NULL, N_("Save the current document with a new filename"), G_CALLBACK (ev_window_cmd_save_as) }, +#if 0 { "FilePrint", GTK_STOCK_PRINT, N_("Print..."), "P", N_("Print this document"), G_CALLBACK (ev_window_cmd_file_print) }, +#endif { "FileCloseWindow", GTK_STOCK_CLOSE, NULL, "W", N_("Close this window"), G_CALLBACK (ev_window_cmd_file_close_window) }, --- evince-0.3.1.orig/shell/main.c 2005-05-18 18:49:59.000000000 +0300 +++ evince-0.3.1/shell/main.c 2005-05-26 23:18:42.000000000 +0300 @@ -24,9 +24,11 @@ #include #include +#if 0 #include #include #include +#endif #include #include "ev-stock-icons.h" @@ -36,11 +38,13 @@ static char *page_label; +#if 0 static struct poptOption popt_options[] = { { "page-label", 'p', POPT_ARG_STRING, &page_label, 0, N_("The page of the document to display."), N_("PAGE")}, { NULL, 0, 0, NULL, 0, NULL, NULL } }; +#endif static void load_files (const char **files) @@ -75,6 +79,7 @@ int main (int argc, char **argv) { +#if 0 poptContext context; GValue context_as_value = { 0 }; GnomeProgram *program; @@ -115,4 +120,44 @@ ev_file_helpers_shutdown (); return 0; +#endif +#if 0 +#ifdef ENABLE_NLS + /* Initialize the i18n stuff */ + bindtextdomain(GETTEXT_PACKAGE, GNOMELOCALEDIR); + bind_textdomain_codeset(GETTEXT_PACKAGE, "UTF-8"); + textdomain(GETTEXT_PACKAGE); +#endif +#endif + printf ("main\n"); + gtk_init (&argc, &argv); + printf ("gtk_init\n"); + page_label = NULL; + + gnome_vfs_init (); + + ev_job_queue_init (); + printf ("ev_job_queue_init\n"); + g_set_application_name (_("Evince Document Viewer")); + + ev_file_helpers_init (); + printf ("ev_file_helpers_init\n"); + ev_debug_init (); + printf ("ev_debug_init\n"); + ev_stock_icons_init (); + printf ("ev_stock_icons_init\n"); + gtk_window_set_default_icon_name ("postscript-viewer"); + + { + const char *files[2] = { 0,0 }; + if (argc > 1) + files[0] = argv[1]; + load_files (files); + } + + gtk_main (); + + ev_file_helpers_shutdown (); + + return 0; } --- evince-0.3.1.orig/shell/Makefile.am 2005-05-09 14:19:52.000000000 +0300 +++ evince-0.3.1/shell/Makefile.am 2005-05-26 23:18:42.000000000 +0300 @@ -61,8 +61,6 @@ ev-password-view.c \ ev-pixbuf-cache.c \ ev-pixbuf-cache.h \ - ev-print-job.c \ - ev-print-job.h \ ev-utils.c \ ev-utils.h \ ev-view.c \