org.handhelds.familiar/packages/xournal/files/no-printing.diff

   1 diff -Naur xournal-0.3/configure.in xournal-0.3.no-printing/configure.in
   2 --- xournal-0.3/configure.in    2006-07-22 20:35:09.000000000 +0200
   3 +++ xournal-0.3.no-printing/configure.in        2006-07-30 21:07:18.000000000 +0200
   4 @@ -10,11 +10,16 @@
   5  AM_PROG_CC_STDC
   6  AC_HEADER_STDC
   7
   8 -pkg_modules="gtk+-2.0 >= 2.4.0 libgnomecanvas-2.0 >= 2.4.0 libgnomeprintui-2.2 >= 2.0.0"
   9 +pkg_modules="gtk+-2.0 >= 2.4.0 libgnomecanvas-2.0 >= 2.4.0"
  10  PKG_CHECK_MODULES(PACKAGE, [$pkg_modules])
  11  AC_SUBST(PACKAGE_CFLAGS)
  12  AC_SUBST(PACKAGE_LIBS)
  13
  14 +#PKG_CHECK_MODULES(GNOMEPRINT, libgnomeprintui-2.2 >= 2.0.0
  15 +#AC_SUBST(GNOMEPRINT_CFLAGS)
  16 +#AC_SUBST(GNOMEPRINT_LIBS)
  17 +AM_CONDITIONAL(ENABLE_PRINTING, false)
  18 +
  19  AC_OUTPUT([
  20  Makefile
  21  src/Makefile
  22 diff -Naur xournal-0.3/src/Makefile.am xournal-0.3.no-printing/src/Makefile.am
  23 --- xournal-0.3/src/Makefile.am 2005-12-14 21:54:42.000000000 +0100
  24 +++ xournal-0.3.no-printing/src/Makefile.am     2006-07-30 21:07:18.000000000 +0200
  25 @@ -7,12 +7,16 @@
  26
  27  bin_PROGRAMS = xournal
  28
  29 +if ENABLE_PRINTING
  30 +PRINT_SOURCE =         xo-print.c xo-print.h
  31 +endif
  32 +
  33  xournal_SOURCES = \
  34         main.c xournal.h \
  35         xo-misc.c xo-misc.h \
  36         xo-file.c xo-file.h \
  37         xo-paint.c xo-paint.h \
  38 -       xo-print.c xo-print.h \
  39 +       $(PRINT_SOURCE) \
  40         xo-support.c xo-support.h \
  41         xo-interface.c xo-interface.h \
  42         xo-callbacks.c xo-callbacks.h
  43 diff -Naur xournal-0.3/src/main.c xournal-0.3.no-printing/src/main.c
  44 --- xournal-0.3/src/main.c      2006-06-05 23:26:09.000000000 +0200
  45 +++ xournal-0.3.no-printing/src/main.c  2006-07-30 21:07:18.000000000 +0200
  46 @@ -28,7 +28,9 @@
  47
  48  void hide_unimplemented(void)
  49  {
  50 +#if ENABLE_PRINTING
  51    gtk_widget_hide(GET_COMPONENT("filePrintOptions"));
  52 +#endif
  53    gtk_widget_hide(GET_COMPONENT("journalFlatten"));
  54    gtk_widget_hide(GET_COMPONENT("papercolorOther"));
  55    gtk_widget_hide(GET_COMPONENT("toolsText"));
  56 diff -Naur xournal-0.3/src/xo-callbacks.c xournal-0.3.no-printing/src/xo-callbacks.c
  57 --- xournal-0.3/src/xo-callbacks.c      2006-07-23 00:22:15.000000000 +0200
  58 +++ xournal-0.3.no-printing/src/xo-callbacks.c  2006-07-30 21:07:18.000000000 +0200
  59 @@ -7,7 +7,9 @@
  60  #include <gtk/gtk.h>
  61  #include <libgnomecanvas/libgnomecanvas.h>
  62  #include <time.h>
  63 +#if ENABLE_PRINTING
  64  #include <libgnomeprintui/gnome-print-dialog.h>
  65 +#endif
  66  #include <glib/gstdio.h>
  67
  68  #include "xournal.h"
  69 @@ -17,7 +19,9 @@
  70  #include "xo-misc.h"
  71  #include "xo-file.h"
  72  #include "xo-paint.h"
  73 +#if ENABLE_PRINTING
  74  #include "xo-print.h"
  75 +#endif
  76
  77  void
  78  on_fileNew_activate                    (GtkMenuItem     *menuitem,
  79 @@ -268,7 +272,7 @@
  80
  81  }
  82
  83 -
  84 +#if ENABLE_PRINTING
  85  void
  86  on_filePrint_activate                  (GtkMenuItem     *menuitem,
  87                                          gpointer         user_data)
  88 @@ -424,7 +428,7 @@
  89    set_cursor_busy(FALSE);
  90    g_free(filename);
  91  }
  92 -
  93 +#endif
  94
  95  void
  96  on_fileQuit_activate                   (GtkMenuItem     *menuitem,
  97 diff -Naur xournal-0.3/src/xo-callbacks.h xournal-0.3.no-printing/src/xo-callbacks.h
  98 --- xournal-0.3/src/xo-callbacks.h      2006-07-22 23:53:50.000000000 +0200
  99 +++ xournal-0.3.no-printing/src/xo-callbacks.h  2006-07-30 21:07:18.000000000 +0200
 100 @@ -24,6 +24,7 @@
 101  on_filePrintOptions_activate           (GtkMenuItem     *menuitem,
 102                                          gpointer         user_data);
 103
 104 +#if ENABLE_PRINTING
 105  void
 106  on_filePrint_activate                  (GtkMenuItem     *menuitem,
 107                                          gpointer         user_data);
 108 @@ -32,6 +33,8 @@
 109  on_filePrintPDF_activate               (GtkMenuItem     *menuitem,
 110                                          gpointer         user_data);
 111
 112 +#endif
 113 +
 114  void
 115  on_fileQuit_activate                   (GtkMenuItem     *menuitem,
 116                                          gpointer         user_data);
 117 diff -Naur xournal-0.3/src/xo-interface.c xournal-0.3.no-printing/src/xo-interface.c
 118 --- xournal-0.3/src/xo-interface.c      2006-07-22 23:53:50.000000000 +0200
 119 +++ xournal-0.3.no-printing/src/xo-interface.c  2006-07-30 21:12:02.000000000 +0200
 120 @@ -52,10 +52,12 @@
 121    GtkWidget *mru6;
 122    GtkWidget *mru7;
 123    GtkWidget *separator22;
 124 +#if ENABLE_PRINTING
 125    GtkWidget *filePrintOptions;
 126    GtkWidget *image600;
 127    GtkWidget *filePrint;
 128    GtkWidget *filePrintPDF;
 129 +#endif
 130    GtkWidget *separator2;
 131    GtkWidget *fileQuit;
 132    GtkWidget *menuEdit;
 133 @@ -415,6 +417,7 @@
 134    gtk_container_add (GTK_CONTAINER (menuFile_menu), separator22);
 135    gtk_widget_set_sensitive (separator22, FALSE);
 136
 137 +#if ENABLE_PRINTING
 138    filePrintOptions = gtk_image_menu_item_new_with_mnemonic ("Print Options");
 139    gtk_widget_show (filePrintOptions);
 140    gtk_container_add (GTK_CONTAINER (menuFile_menu), filePrintOptions);
 141 @@ -435,6 +438,7 @@
 142    gtk_widget_show (separator2);
 143    gtk_container_add (GTK_CONTAINER (menuFile_menu), separator2);
 144    gtk_widget_set_sensitive (separator2, FALSE);
 145 +#endif
 146
 147    fileQuit = gtk_image_menu_item_new_from_stock ("gtk-quit", accel_group);
 148    gtk_widget_show (fileQuit);
 149 @@ -1790,6 +1794,7 @@
 150    g_signal_connect ((gpointer) mru7, "activate",
 151                      G_CALLBACK (on_mru_activate),
 152                      NULL);
 153 +#if ENABLE_PRINTING
 154    g_signal_connect ((gpointer) filePrintOptions, "activate",
 155                      G_CALLBACK (on_filePrintOptions_activate),
 156                      NULL);
 157 @@ -1799,6 +1804,7 @@
 158    g_signal_connect ((gpointer) filePrintPDF, "activate",
 159                      G_CALLBACK (on_filePrintPDF_activate),
 160                      NULL);
 161 +#endif
 162    g_signal_connect ((gpointer) fileQuit, "activate",
 163                      G_CALLBACK (on_fileQuit_activate),
 164                      NULL);
 165 @@ -2280,11 +2286,13 @@
 166    GLADE_HOOKUP_OBJECT (winMain, mru6, "mru6");
 167    GLADE_HOOKUP_OBJECT (winMain, mru7, "mru7");
 168    GLADE_HOOKUP_OBJECT (winMain, separator22, "separator22");
 169 +#if ENABLE_PRINTING
 170    GLADE_HOOKUP_OBJECT (winMain, filePrintOptions, "filePrintOptions");
 171    GLADE_HOOKUP_OBJECT (winMain, image600, "image600");
 172    GLADE_HOOKUP_OBJECT (winMain, filePrint, "filePrint");
 173    GLADE_HOOKUP_OBJECT (winMain, filePrintPDF, "filePrintPDF");
 174    GLADE_HOOKUP_OBJECT (winMain, separator2, "separator2");
 175 +#endif
 176    GLADE_HOOKUP_OBJECT (winMain, fileQuit, "fileQuit");
 177    GLADE_HOOKUP_OBJECT (winMain, menuEdit, "menuEdit");
 178    GLADE_HOOKUP_OBJECT (winMain, menuEdit_menu, "menuEdit_menu");