gucharmap r1709 - trunk/gucharmap

[chpe svn gnome org]

Author: chpe
Date: Fri Mar 21 11:00:06 2008
New Revision: 1709
URL: http://svn.gnome.org/viewvc/gucharmap?rev=1709&view=rev

Log:
#if 0 the printing code for now.


Modified:
   trunk/gucharmap/Makefile.am
   trunk/gucharmap/gucharmap-window.c

Modified: trunk/gucharmap/Makefile.am
==============================================================================
--- trunk/gucharmap/Makefile.am	(original)
+++ trunk/gucharmap/Makefile.am	Fri Mar 21 11:00:06 2008
@@ -159,12 +159,12 @@
           && mv gucharmap-marshal.c.tmp gucharmap-marshal.c ) \
         || ( rm -f gucharmap-marshal.c.tmp && exit 1 )
 
-printoptions.h: print.glade
-	$(GTK_BUILDER_CONVERT) --root custom_tab_container $< - | \
-		$(XMLLINT) --noblanks - | \
-		$(HEXDUMP) -v -e '"" 1/1 "0x%02x,""\n"' > xgen-$(@F) \
-	&& (cmp -s xgen-$(@F) $@ || cp -f xgen-$(@F) $@) \
-	&& rm -f xgen-$(@F)
+# printoptions.h: print.glade
+# 	$(GTK_BUILDER_CONVERT) --root custom_tab_container $< - | \
+# 		$(XMLLINT) --noblanks - | \
+# 		$(HEXDUMP) -v -e '"" 1/1 "0x%02x,""\n"' > xgen-$(@F) \
+# 	&& (cmp -s xgen-$(@F) $@ || cp -f xgen-$(@F) $@) \
+# 	&& rm -f xgen-$(@F)
 
 # don't do the symlink stuff if this is windows
 if OS_WIN32
@@ -178,9 +178,9 @@
 # install a symlink to the binary called "charmap"
 install-exec-hook:
 	test -e "$(DESTDIR)$(bindir)/charmap" \
-        || (cd "$(DESTDIR)$(bindir)" && ln -s gucharmap charmap) ; \
+        || (cd "$(DESTDIR)$(bindir)" && $(LN_S) gucharmap charmap) ; \
 	test -e "$(DESTDIR)$(bindir)/gnome-character-map" \
-        || (cd "$(DESTDIR)$(bindir)" && ln -s gucharmap gnome-character-map)
+        || (cd "$(DESTDIR)$(bindir)" && $(LN_S) gucharmap gnome-character-map)
 
 # remove bin/charmap if it's a symlink (it's a pain to test what it's
 # a symlink to)

Modified: trunk/gucharmap/gucharmap-window.c
==============================================================================
--- trunk/gucharmap/gucharmap-window.c	(original)
+++ trunk/gucharmap/gucharmap-window.c	Fri Mar 21 11:00:06 2008
@@ -31,6 +31,8 @@
 #include "gucharmap-settings.h"
 #include "gucharmap-window.h"
 
+/* #define ENABLE_PRINTING */
+
 static void gucharmap_window_class_init (GucharmapWindowClass *klass);
 static void gucharmap_window_init       (GucharmapWindow *window);
 
@@ -50,6 +52,8 @@
   gtk_window_present (GTK_WINDOW (dialog));
 }
 
+#ifdef ENABLE_PRINTING
+
 static void
 ensure_print_data (GucharmapWindow *guw)
 {
@@ -131,7 +135,9 @@
   }
 
   g_object_unref (op);
-}    
+}
+
+#endif /* ENABLE_PRINTING */
 
 static void
 status_message (GtkWidget       *widget, 
@@ -300,6 +306,8 @@
     search_find (action, guw);
 }
 
+#ifdef ENABLE_PRINTING
+
 static void
 page_setup_done_cb (GtkPageSetup *page_setup,
                     GucharmapWindow *guw)
@@ -339,6 +347,8 @@
   gucharmap_window_print (guw, GTK_PRINT_OPERATION_ACTION_PRINT_DIALOG);
 }
 
+#endif /* ENABLE_PRINTING */
+
 static void
 close_window (GtkAction *action,
               GtkWidget *widget)
@@ -653,12 +663,14 @@
 static const char ui_info [] =
   "<menubar name='MenuBar'>"
     "<menu action='File'>"
+#ifdef ENABLE_PRINTING
       "<menuitem action='PageSetup' />"
 #if 0
       "<menuitem action='PrintPreview' />"
 #endif
       "<menuitem action='Print' />"
       "<separator />"
+#endif /* ENABLE_PRINTING */
       "<menuitem action='Close' />"
 #ifdef DEBUG_chpe
       "<menuitem action='MoveNextScreen' />"
@@ -792,6 +804,7 @@
     { "Go", NULL, N_("_Go"), NULL, NULL, NULL },
     { "Help", NULL, N_("_Help"), NULL, NULL, NULL },
 
+#ifdef ENABLE_PRINTING
     { "PageSetup", NULL, N_("Page _Setup"), NULL,
       NULL, G_CALLBACK (file_page_setup) },
 #if 0
@@ -800,6 +813,7 @@
 #endif
     { "Print", GTK_STOCK_PRINT, NULL, NULL,
       NULL, G_CALLBACK (file_print) },
+#endif /* ENABLE_PRINTING */
     { "Close", GTK_STOCK_CLOSE, NULL, NULL,
       NULL, G_CALLBACK (close_window) },