Remove xpm images

? pixmaps/conglomerate-logo.png
Index: pixmaps/ChangeLog
===================================================================
RCS file: /cvs/gnome/conglomerate/pixmaps/ChangeLog,v
retrieving revision 1.12
diff -u -r1.12 ChangeLog
--- pixmaps/ChangeLog	15 Jul 2004 13:03:16 -0000	1.12
+++ pixmaps/ChangeLog	14 Oct 2004 18:44:50 -0000
@@ -1,3 +1,9 @@
+2004-10-14 Nickolay V. Shmyrev <[email protected]>
+
+	* Makefile.am, ilogo100.xpm, conglomerate-logo.png :
+
+	Logo converted to png.
+
 2004-07-14  Jeff Martin  <[email protected]>
 
 	* Makefile.am, cong-comment-16.png, cong-uncomment-16.png
Index: pixmaps/Makefile.am
===================================================================
RCS file: /cvs/gnome/conglomerate/pixmaps/Makefile.am,v
retrieving revision 1.15
diff -u -r1.15 Makefile.am
--- pixmaps/Makefile.am	15 Jul 2004 13:03:16 -0000	1.15
+++ pixmaps/Makefile.am	14 Oct 2004 18:44:50 -0000
@@ -40,7 +40,8 @@
 	cong-important-48.png \
 	cong-note-48.png \
 	cong-tip-48.png \
-	cong-warning-48.png
+	cong-warning-48.png \
+	conglomerate-logo.png
 
 
 EXTRA_DIST = $(dti_DATA) $(appicons_DATA)
Index: po/POTFILES.in
===================================================================
RCS file: /cvs/gnome/conglomerate/po/POTFILES.in,v
retrieving revision 1.35
diff -u -r1.35 POTFILES.in
--- po/POTFILES.in	10 Oct 2004 13:43:15 -0000	1.35
+++ po/POTFILES.in	14 Oct 2004 18:44:50 -0000
@@ -19,8 +19,6 @@
 glade/plugin-arbitrary.glade
 glade/plugin-random.glade
 glade/string_selection_dialog.glade
-src/auth_off.c
-src/auth_on.c
 src/cong-app.c
 src/cong-attribute-editor-cdata.c
 src/cong-attribute-editor-enumeration.c
@@ -147,12 +145,6 @@
 src/cursor.c
 src/file.c
 src/gxx-impl-object-to-xml-tree.c
-src/icon_assemble.c
-src/icon_connect.c
-src/icon_new.c
-src/icon_openfile.c
-src/icon_submit.c
-src/ilogo.c
 src/main.c
 src/plugin-abiword.c
 src/plugin-admonition-node-element.c
Index: src/ChangeLog
===================================================================
RCS file: /cvs/gnome/conglomerate/src/ChangeLog,v
retrieving revision 1.728
diff -u -r1.728 ChangeLog
--- src/ChangeLog	13 Oct 2004 00:27:05 -0000	1.728
+++ src/ChangeLog	14 Oct 2004 18:44:50 -0000
@@ -1,3 +1,18 @@
+2004-10-14 Nickolay V. Shmyrev <[email protected]>
+
+	* icon_assemble.xpm, icon_new.xpm, icon_save.xpm, ilogo.xpm:
+	
+	Removed files
+
+	* Makefile.am, cong-utils.c, cong-menus.c, cong-primary-window.c:
+	
+	Remove xpm unused images.
+	
+	* global.h, cong-service-print-method.h, cong-service-print-method.c :
+	
+	Fix documentation build with --disable-printing.
+	
+
 2004-10-12  Douglas Burke  <[email protected]>
  
 	* plugin-validate.c
Index: src/Makefile.am
===================================================================
RCS file: /cvs/gnome/conglomerate/src/Makefile.am,v
retrieving revision 1.111
diff -u -r1.111 Makefile.am
--- src/Makefile.am	9 Oct 2004 21:15:40 -0000	1.111
+++ src/Makefile.am	14 Oct 2004 18:44:50 -0000
@@ -263,14 +263,6 @@
   cong-view.c               \
   cong-xpath-expression.c   \
   gxx-impl-object-to-xml-tree.c \
-  icon_assemble.c           \
-  icon_connect.c            \
-  icon_new.c                \
-  icon_openfile.c           \
-  icon_submit.c             \
-  ilogo.c                   \
-  auth_on.c                 \
-  auth_off.c                \
   position.c                \
   cursor.c                  \
   select.c                  \
Index: src/cong-menus.c
===================================================================
RCS file: /cvs/gnome/conglomerate/src/cong-menus.c,v
retrieving revision 1.74
diff -u -r1.74 cong-menus.c
--- src/cong-menus.c	13 Oct 2004 00:20:45 -0000	1.74
+++ src/cong-menus.c	14 Oct 2004 18:44:50 -0000
@@ -65,8 +65,6 @@
 
 #include "cong-edit-find-and-replace.h"
 
-extern char *ilogo_xpm[];
-
 #define ENABLE_DEBUG_MENU 0
 #define ENABLE_UNIMPLEMENTED_MENUS 0
 
@@ -1415,7 +1413,6 @@
 action_callback_about (GtkAction *action,
 		       CongPrimaryWindow *primary_window)
 {
-	GdkPixbuf *logo_pixbuf = gdk_pixbuf_new_from_xpm_data((const char**)ilogo_xpm);
 	gchar* authors[] = {"Hans Petter Jansson", 
 			    "David Malcolm", 
 			    "Joakim Ziegler", 
@@ -1430,8 +1427,23 @@
 	gchar* documenters[] = { NULL };
 
  	gchar* translator_credits = _("translator_credits");
+
+        gchar *logo_path;
+
+	GdkPixbuf *logo_pixbuf;
   
- 	GtkWidget *about = gnome_about_new(_("Conglomerate XML Editor"),
+ 	GtkWidget *about;
+	
+	logo_path = gnome_program_locate_file (cong_app_get_gnome_program (cong_app_singleton()),
+					       GNOME_FILE_DOMAIN_APP_PIXMAP,
+					       "conglomerate/conglomerate-logo.png",
+					       FALSE,
+					       NULL);
+	logo_pixbuf = gdk_pixbuf_new_from_file(logo_path, NULL);
+	
+	g_free(logo_path);
+	
+	about  = gnome_about_new(_("Conglomerate XML Editor"),
  					   PACKAGE_VERSION,
  					   _("(C) 1999 Hans Petter Jansson\n(C) 2004 David Malcolm"),
  					   _("Conglomerate: a free, user-friendly XML editor"),
Index: src/cong-primary-window.c
===================================================================
RCS file: /cvs/gnome/conglomerate/src/cong-primary-window.c,v
retrieving revision 1.63
diff -u -r1.63 cong-primary-window.c
--- src/cong-primary-window.c	23 Sep 2004 04:55:18 -0000	1.63
+++ src/cong-primary-window.c	14 Oct 2004 18:44:50 -0000
@@ -223,14 +223,6 @@
  
 struct CongApp the_app;
 
-extern char *ilogo_xpm[];
-extern char *auth_off_xpm[];
-extern char *icon_connect[];
-extern char *icon_new[];
-extern char *icon_assemble[];
-extern char *icon_openfile[];
-extern char *icon_submit[];
-
 /**
  * cong_primary_window_create_pixmap:
  * @primary_window:
Index: src/cong-service-print-method.c
===================================================================
RCS file: /cvs/gnome/conglomerate/src/cong-service-print-method.c,v
retrieving revision 1.3
diff -u -r1.3 cong-service-print-method.c
--- src/cong-service-print-method.c	25 Jun 2004 00:33:03 -0000	1.3
+++ src/cong-service-print-method.c	14 Oct 2004 18:44:50 -0000
@@ -25,15 +25,18 @@
 #include "global.h"
 #include "cong-service-print-method.h"
 
-#if ENABLE_PRINTING
 struct CongServicePrintMethodPrivate
 {
+#if ENABLE_PRINTING
 	CongServicePrintMethodDocumentFilter doc_filter;
 	CongServicePrintMethodActionCallback action_callback;
+#endif
 	gpointer user_data;
 };
 CONG_DEFINE_CLASS (CongServicePrintMethod, cong_service_print_method, CONG_SERVICE_PRINT_METHOD, CongService, CONG_SERVICE_TYPE)
 
+#if ENABLE_PRINTING
+
 /**
  * cong_service_print_method_construct:
  * @print_method:
Index: src/cong-service-print-method.h
===================================================================
RCS file: /cvs/gnome/conglomerate/src/cong-service-print-method.h,v
retrieving revision 1.1
diff -u -r1.1 cong-service-print-method.h
--- src/cong-service-print-method.h	11 Jan 2004 04:28:32 -0000	1.1
+++ src/cong-service-print-method.h	14 Oct 2004 18:44:50 -0000
@@ -25,7 +25,6 @@
 #ifndef __CONG_PRINT_METHOD_H__
 #define __CONG_PRINT_METHOD_H__
 
-#if ENABLE_PRINTING
 
 #include "cong-plugin.h"
 
@@ -37,6 +36,8 @@
 #define IS_CONG_SERVICE_PRINT_METHOD(obj)      G_TYPE_CHECK_INSTANCE_TYPE (obj, CONG_SERVICE_PRINT_METHOD_TYPE)
 CONG_DECLARE_CLASS (CongServicePrintMethod, cong_service_print_method, CongService)
 
+#if ENABLE_PRINTING
+
 typedef gboolean 
 (*CongServicePrintMethodDocumentFilter) (CongServicePrintMethod *print_method, 
 					 CongDocument *doc, 
Index: src/cong-util.c
===================================================================
RCS file: /cvs/gnome/conglomerate/src/cong-util.c,v
retrieving revision 1.52
diff -u -r1.52 cong-util.c
--- src/cong-util.c	13 Oct 2004 00:20:45 -0000	1.52
+++ src/cong-util.c	14 Oct 2004 18:44:50 -0000
@@ -1584,7 +1584,6 @@
 }
 
 
-extern char *ilogo_xpm[];
 
 /**
  * cong_util_show_in_window:
@@ -1611,12 +1610,22 @@
 
 	/* Set up the window nicely: */
 	{	
-		GdkPixbuf *icon_pixbuf = gdk_pixbuf_new_from_xpm_data((const char**)ilogo_xpm);
+		gchar *logo_path;
+		GdkPixbuf *pixbuf;
 		
+		logo_path = gnome_program_locate_file (cong_app_get_gnome_program (cong_app_singleton()),
+						       GNOME_FILE_DOMAIN_APP_PIXMAP,
+						       "conglomerate/conglomerate-logo.png",
+						       FALSE,
+						       NULL);
+		pixbuf = gdk_pixbuf_new_from_file(logo_path, NULL);
+	
+		g_free(logo_path);
+	
 		gtk_window_set_icon(GTK_WINDOW(window),
-				    icon_pixbuf);
+				    pixbuf);
 
-		gdk_pixbuf_unref(icon_pixbuf);
+		gdk_pixbuf_unref(pixbuf);
 
 	}
 
Index: src/global.h
===================================================================
RCS file: /cvs/gnome/conglomerate/src/global.h,v
retrieving revision 1.125
diff -u -r1.125 global.h
--- src/global.h	14 Aug 2004 03:31:51 -0000	1.125
+++ src/global.h	14 Oct 2004 18:44:50 -0000
@@ -90,9 +90,7 @@
 typedef struct CongServiceDocumentFactory CongServiceDocumentFactory;
 typedef struct CongServiceImporter CongServiceImporter;
 typedef struct CongServiceExporter CongServiceExporter;
-#if ENABLE_PRINTING
 typedef struct CongServicePrintMethod CongServicePrintMethod;
-#endif
 typedef struct CongServiceEditorNodeFactory CongServiceEditorNodeFactory;
 
 typedef struct CongServiceTool CongServiceTool;