GNOME.org
 

GAL patch for GNOME 2

Someone want to take a look at this and commit it?

There is at least one outstanding issue from e-canvas.c
DISLAY_X1(canvas) was being used, but GtkLayout is missing a member that
said macro needs to work, so I replaced it with canvas->scroll_x1/y1 for
now to get it compiling...if someone knows the correct way, please let
me know.

This patch fixes all the compiler errors, but nothing runs...so far most
of the problems I have had (core dumping) have to do with font
handling...I took a look at some of it, and I think most can be tossed
out in favor of some pango action.

Later,
Chris

-- 

http://glimmer.sourceforge.net - My pet project
http://uberhackers.dhs.org - My personal website

./configure --prefix=/dev/mocha --enable-caffeine

diff -r -u2 gal/autogen.sh gal2/autogen.sh
--- gal/autogen.sh	Thu Oct  4 19:18:51 2001
+++ gal2/autogen.sh	Sat Dec  8 22:36:11 2001
@@ -5,11 +5,4 @@
 test -z "$srcdir" && srcdir=.
 
-if test -z "$CERTIFIED_GNOMIE"; then
-# If you can't figure out how to set this envar, please don't come on IRC
-# whining incessantly about how your apps are broken.
-  cat $srcdir/message-of-doom
-  exit 1
-fi
-
 PKG_NAME="gal"
 
diff -r -u2 gal/configure.in gal2/configure.in
--- gal/configure.in	Thu Oct  4 19:18:51 2001
+++ gal2/configure.in	Sun Dec  9 00:08:46 2001
@@ -1,13 +1,8 @@
 AC_INIT(README)
 AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(gal2,0.13.99.0)
+AM_INIT_AUTOMAKE(gal2,1.107.0)
 
 AM_MAINTAINER_MODE
 
-if test -z "$CERTIFIED_GNOMIE"; then
-  echo "you should not be building this"
-  exit 1
-fi
-
 dnl
 dnl Due to the sed scripts being split on 90 line
@@ -37,5 +32,5 @@
 dnl increment if the interface has additions, changes, removals.
 dnl AKA Major
-GAL_CURRENT=14
+GAL_CURRENT=20
 
 AC_SUBST(GAL_CURRENT)
@@ -209,5 +204,4 @@
 gal/e-paned/Makefile
 gal/e-table/Makefile
-gal/shortcut-bar/Makefile
 gal/menus/Makefile
 gal/shortcut-bar/Makefile
diff -r -u2 gal/gal/e-table/e-cell-pixbuf.h gal2/gal/e-table/e-cell-pixbuf.h
--- gal/gal/e-table/e-cell-pixbuf.h	Tue Apr  3 22:24:33 2001
+++ gal2/gal/e-table/e-cell-pixbuf.h	Sat Dec  8 23:51:29 2001
@@ -30,5 +30,5 @@
 };
 
-GtkType e_cell_pixbuf_get_type (void);
+guint e_cell_pixbuf_get_type (void);
 ECell *e_cell_pixbuf_new (void);
 void e_cell_pixbuf_construct (ECellPixbuf *ecp);
diff -r -u2 gal/gal/e-table/e-table-config-field.c gal2/gal/e-table/e-table-config-field.c
--- gal/gal/e-table/e-table-config-field.c	Thu Oct  4 19:18:54 2001
+++ gal2/gal/e-table/e-table-config-field.c	Sun Dec  9 02:01:59 2001
@@ -10,4 +10,6 @@
 #include <config.h>
 #include <stdlib.h>
+#include <gtk/gtk.h>
+#include <gtk/gtkbox.h>
 #include "gal/util/e-util.h"
 #include "e-table-config-field.h"
diff -r -u2 gal/gal/e-table/e-table-config.h gal2/gal/e-table/e-table-config.h
--- gal/gal/e-table/e-table-config.h	Thu Oct  4 19:18:54 2001
+++ gal2/gal/e-table/e-table-config.h	Sat Dec  8 23:54:27 2001
@@ -3,5 +3,4 @@
 #define _E_TABLE_CONFIG_H_
 
-#include <libgnome/gnome-defs.h>
 #include <gal/e-table/e-table-sort-info.h>
 #include <gal/e-table/e-table-specification.h>
diff -r -u2 gal/gal/e-table/e-table-field-chooser-dialog.c gal2/gal/e-table/e-table-field-chooser-dialog.c
--- gal/gal/e-table/e-table-field-chooser-dialog.c	Thu Oct  4 19:18:54 2001
+++ gal2/gal/e-table/e-table-field-chooser-dialog.c	Sat Dec  8 23:56:01 2001
@@ -23,5 +23,4 @@
 #include <config.h>
 #include "e-table-field-chooser-dialog.h"
-#include <libgnomeui/gnome-stock.h>
 #include "gal/util/e-i18n.h"
 
@@ -105,5 +104,5 @@
 
 	gnome_dialog_append_buttons(GNOME_DIALOG(e_table_field_chooser_dialog),
-				    GNOME_STOCK_BUTTON_CLOSE,
+				    GTK_STOCK_CLOSE,
 				    NULL);
 
diff -r -u2 gal/gal/e-table/e-table-field-chooser.c gal2/gal/e-table/e-table-field-chooser.c
--- gal/gal/e-table/e-table-field-chooser.c	Thu Oct  4 19:18:54 2001
+++ gal2/gal/e-table/e-table-field-chooser.c	Sun Dec  9 02:21:32 2001
@@ -23,4 +23,6 @@
 #include <config.h>
 #include <gtk/gtksignal.h>
+#include <gtk/gtk.h>
+#include <gtk/gtkbox.h>
 #include <libgnomecanvas/gnome-canvas-rect-ellipse.h>
 #include "e-table-field-chooser.h"
diff -r -u2 gal/gal/e-table/e-table-item.c gal2/gal/e-table/e-table-item.c
--- gal/gal/e-table/e-table-item.c	Thu Oct  4 19:18:54 2001
+++ gal2/gal/e-table/e-table-item.c	Sun Dec  9 00:55:03 2001
@@ -822,5 +822,5 @@
 {
 	ETableItem *eti = data;
-	if (!GTK_OBJECT_DESTROYED (eti)) {
+	if (G_IS_OBJECT (eti)) {
 		eti_maybe_show_cursor (eti, 0);
 	}
diff -r -u2 gal/gal/e-table/e-table-model.h gal2/gal/e-table/e-table-model.h
--- gal/gal/e-table/e-table-model.h	Sun Sep 16 20:57:11 2001
+++ gal2/gal/e-table/e-table-model.h	Sat Dec  8 23:59:06 2001
@@ -71,5 +71,5 @@
 } ETableModelClass;
 
-GtkType     e_table_model_get_type            (void);
+guint     e_table_model_get_type            (void);
 
 /**/
diff -r -u2 gal/gal/e-text/e-completion-match.h gal2/gal/e-text/e-completion-match.h
--- gal/gal/e-text/e-completion-match.h	Thu Oct  4 19:18:57 2001
+++ gal2/gal/e-text/e-completion-match.h	Sun Dec  9 00:35:50 2001
@@ -30,5 +30,4 @@
 
 #include <glib.h>
-#include <libgnome/gnome-defs.h>
 #include <gtk/gtkwidget.h>
 
diff -r -u2 gal/gal/e-text/e-completion-view.h gal2/gal/e-text/e-completion-view.h
--- gal/gal/e-text/e-completion-view.h	Thu Oct  4 19:18:57 2001
+++ gal2/gal/e-text/e-completion-view.h	Sun Dec  9 00:35:18 2001
@@ -30,5 +30,4 @@
 #define E_COMPLETION_VIEW_H
 
-#include <libgnome/gnome-defs.h>
 #include <gtk/gtk.h>
 #include <gal/e-table/e-table.h>
diff -r -u2 gal/gal/e-text/e-completion.h gal2/gal/e-text/e-completion.h
--- gal/gal/e-text/e-completion.h	Thu Oct  4 19:18:57 2001
+++ gal2/gal/e-text/e-completion.h	Sun Dec  9 00:38:02 2001
@@ -29,5 +29,4 @@
 #define E_COMPLETION_H
 
-#include <libgnome/gnome-defs.h>
 #include <gtk/gtkobject.h>
 #include "e-completion-match.h"
diff -r -u2 gal/gal/e-text/e-text-model.h gal2/gal/e-text/e-text-model.h
--- gal/gal/e-text/e-text-model.h	Thu Oct  4 19:18:57 2001
+++ gal2/gal/e-text/e-text-model.h	Sat Dec  8 23:30:14 2001
@@ -23,5 +23,4 @@
 #include <glib.h>
 #include <gtk/gtkobject.h>
-#include <libgnome/gnome-defs.h>
 
 G_BEGIN_DECLS
diff -r -u2 gal/gal/e-text/e-text.c gal2/gal/e-text/e-text.c
--- gal/gal/e-text/e-text.c	Thu Oct  4 19:18:57 2001
+++ gal2/gal/e-text/e-text.c	Sun Dec  9 00:54:22 2001
@@ -2715,5 +2715,5 @@
 {
 	gint ret_val = FALSE;
-	if (GTK_OBJECT_DESTROYED (text)) {
+	if (!G_IS_OBJECT (text)) {
 		return FALSE;
 	}
@@ -2993,5 +2993,5 @@
 	gint return_val = 0;
 
-	if (GTK_OBJECT_DESTROYED (item))
+	if (!G_IS_OBJECT (item))
 		return FALSE;
 
diff -r -u2 gal/gal/e-text/e-text.h gal2/gal/e-text/e-text.h
--- gal/gal/e-text/e-text.h	Thu Oct  4 19:18:57 2001
+++ gal2/gal/e-text/e-text.h	Sat Dec  8 23:29:24 2001
@@ -22,5 +22,4 @@
 
 #include <gtk/gtkobject.h>
-#include <gtk/gtkpacker.h>
 
 #include <gal/widgets/e-font.h>
diff -r -u2 gal/gal/menus/gal-define-views-dialog.c gal2/gal/menus/gal-define-views-dialog.c
--- gal/gal/menus/gal-define-views-dialog.c	Thu Oct  4 19:18:58 2001
+++ gal2/gal/menus/gal-define-views-dialog.c	Sun Dec  9 02:07:03 2001
@@ -22,6 +22,6 @@
 #include <config.h>
 #include <libgnomeui/gnome-dialog.h>
-#include <libgnomeui/gnome-stock.h>
 #include <gtk/gtksignal.h>
+#include <gtk/gtk.h>
 #include "gal-define-views-dialog.h"
 #include "gal-define-views-model.h"
@@ -234,6 +234,6 @@
 
 	gnome_dialog_append_buttons(GNOME_DIALOG(dialog),
-				    GNOME_STOCK_BUTTON_OK,
-				    GNOME_STOCK_BUTTON_CANCEL,
+				    GTK_STOCK_OK,
+				    GTK_STOCK_CANCEL,
 				    NULL);
 
diff -r -u2 gal/gal/menus/gal-view-collection.c gal2/gal/menus/gal-view-collection.c
--- gal/gal/menus/gal-view-collection.c	Thu Oct  4 19:18:58 2001
+++ gal2/gal/menus/gal-view-collection.c	Sun Dec  9 01:08:08 2001
@@ -15,5 +15,4 @@
 #include <gtk/gtksignal.h>
 #include <libxml/parser.h>
-#include <libgnome/gnome-defs.h>
 #include <libgnome/gnome-util.h>
 #include <gal/util/e-util.h>
diff -r -u2 gal/gal/menus/gal-view-collection.h gal2/gal/menus/gal-view-collection.h
--- gal/gal/menus/gal-view-collection.h	Mon Mar  5 08:01:46 2001
+++ gal2/gal/menus/gal-view-collection.h	Sun Dec  9 01:10:46 2001
@@ -57,5 +57,5 @@
 
 /* Standard functions */
-GtkType                gal_view_collection_get_type                 (void);
+guint                gal_view_collection_get_type                 (void);
 GalViewCollection     *gal_view_collection_new                      (void);
 
diff -r -u2 gal/gal/menus/gal-view-new-dialog.c gal2/gal/menus/gal-view-new-dialog.c
--- gal/gal/menus/gal-view-new-dialog.c	Thu Oct  4 19:18:58 2001
+++ gal2/gal/menus/gal-view-new-dialog.c	Sun Dec  9 02:07:31 2001
@@ -22,5 +22,5 @@
 #include <config.h>
 #include <libgnomeui/gnome-dialog.h>
-#include <libgnomeui/gnome-stock.h>
+#include <gtk/gtk.h>
 #include "gal-view-new-dialog.h"
 #include "gal-define-views-model.h"
@@ -106,6 +106,6 @@
 
 	gnome_dialog_append_buttons(GNOME_DIALOG(dialog),
-				    GNOME_STOCK_BUTTON_OK,
-				    GNOME_STOCK_BUTTON_CANCEL,
+				    GTK_STOCK_OK,
+				    GTK_STOCK_CANCEL,
 				    NULL);
 
diff -r -u2 gal/gal/shortcut-bar/e-shortcut-bar.c gal2/gal/shortcut-bar/e-shortcut-bar.c
--- gal/gal/shortcut-bar/e-shortcut-bar.c	Thu Oct  4 19:18:58 2001
+++ gal2/gal/shortcut-bar/e-shortcut-bar.c	Sun Dec  9 01:16:28 2001
@@ -41,5 +41,4 @@
 #include <gtk/gtkselection.h>
 #include <gtk/gtksignal.h>
-#include <libgnome/gnome-defs.h>
 #include <libgnome/gnome-util.h>
 #include <gal/util/e-util.h>
diff -r -u2 gal/gal/util/e-cache.h gal2/gal/util/e-cache.h
--- gal/gal/util/e-cache.h	Thu Oct  4 19:18:59 2001
+++ gal2/gal/util/e-cache.h	Sat Dec  8 22:35:25 2001
@@ -26,5 +26,4 @@
 #include <sys/types.h>
 #include <glib.h>
-#include <libgnome/gnome-defs.h>
 
 G_BEGIN_DECLS
diff -r -u2 gal/gal/util/e-i18n.h gal2/gal/util/e-i18n.h
--- gal/gal/util/e-i18n.h	Thu Oct  4 19:18:59 2001
+++ gal2/gal/util/e-i18n.h	Sat Dec  8 22:45:19 2001
@@ -16,5 +16,4 @@
 
 #include <glib.h>
-#include "libgnome/gnome-defs.h"
 
 G_BEGIN_DECLS
diff -r -u2 gal/gal/util/e-sorter-array.h gal2/gal/util/e-sorter-array.h
--- gal/gal/util/e-sorter-array.h	Thu Oct  4 19:18:59 2001
+++ gal2/gal/util/e-sorter-array.h	Sat Dec  8 22:43:27 2001
@@ -6,5 +6,4 @@
 #include <gal/util/e-sorter.h>
 #include <glib.h>
-#include <libgnome/gnome-defs.h>
 
 G_BEGIN_DECLS
diff -r -u2 gal/gal/util/e-xml-utils.h gal2/gal/util/e-xml-utils.h
--- gal/gal/util/e-xml-utils.h	Thu Oct  4 19:18:59 2001
+++ gal2/gal/util/e-xml-utils.h	Sat Dec  8 22:44:45 2001
@@ -24,5 +24,4 @@
 #define __E_XML_UTILS__
 
-#include <libgnome/gnome-defs.h>
 #include <glib.h>
 #include <libxml/tree.h>
diff -r -u2 gal/gal/widgets/color-group.h gal2/gal/widgets/color-group.h
--- gal/gal/widgets/color-group.h	Thu Oct  4 19:18:59 2001
+++ gal2/gal/widgets/color-group.h	Sat Dec  8 22:46:49 2001
@@ -3,5 +3,4 @@
 
 #include <libgnomecanvas/gnome-canvas.h>
-#include <libgnome/gnome-defs.h>
 #include <gtk/gtkobject.h>
 
diff -r -u2 gal/gal/widgets/color-palette.h gal2/gal/widgets/color-palette.h
--- gal/gal/widgets/color-palette.h	Thu Oct  4 19:18:59 2001
+++ gal2/gal/widgets/color-palette.h	Sat Dec  8 22:47:18 2001
@@ -5,5 +5,4 @@
 #include <gtk/gtkvbox.h>
 #include <gtk/gtkwidget.h>
-#include <libgnome/gnome-defs.h>
 #include <libgnomeui/gnome-color-picker.h>
 #include <gal/widgets/color-group.h>
diff -r -u2 gal/gal/widgets/e-canvas-utils.c gal2/gal/widgets/e-canvas-utils.c
--- gal/gal/widgets/e-canvas-utils.c	Tue Oct  2 04:12:31 2001
+++ gal2/gal/widgets/e-canvas-utils.c	Sun Dec  9 00:55:39 2001
@@ -143,5 +143,5 @@
 	DoubsAndCanvas *dac = data;
 
-	if (!GTK_OBJECT_DESTROYED(dac->canvas))
+	if (G_IS_OBJECT(dac->canvas))
 		e_canvas_show_area(dac->canvas, dac->x1, dac->y1, dac->x2, dac->y2);
 	gtk_object_unref(GTK_OBJECT(dac->canvas));
diff -r -u2 gal/gal/widgets/e-canvas-vbox.c gal2/gal/widgets/e-canvas-vbox.c
--- gal/gal/widgets/e-canvas-vbox.c	Thu Oct  4 19:18:59 2001
+++ gal2/gal/widgets/e-canvas-vbox.c	Sun Dec  9 00:55:56 2001
@@ -252,5 +252,5 @@
 e_canvas_vbox_remove_item (GnomeCanvasItem *item, ECanvasVbox *vbox)
 {
-	if (!GTK_OBJECT_DESTROYED (vbox))
+	if (G_IS_OBJECT (vbox))
 		vbox->items = g_list_remove(vbox->items, item);
 }
diff -r -u2 gal/gal/widgets/e-canvas.c gal2/gal/widgets/e-canvas.c
--- gal/gal/widgets/e-canvas.c	Thu Oct  4 19:18:59 2001
+++ gal2/gal/widgets/e-canvas.c	Sun Dec  9 00:56:45 2001
@@ -280,5 +280,5 @@
 					 &finished);
 
-		if (GTK_OBJECT_DESTROYED (item))
+		if (!G_IS_OBJECT (item))
 			finished = TRUE;
 
@@ -413,9 +413,9 @@
 
 		if (canvas->pick_event.type == GDK_ENTER_NOTIFY) {
-			x = canvas->pick_event.crossing.x + DISPLAY_X1 (canvas) - canvas->zoom_xofs;
-			y = canvas->pick_event.crossing.y + DISPLAY_Y1 (canvas) - canvas->zoom_yofs;
+			x = canvas->pick_event.crossing.x + canvas->scroll_x1 - canvas->zoom_xofs;
+			y = canvas->pick_event.crossing.y + canvas->scroll_y1 - canvas->zoom_yofs;
 		} else {
-			x = canvas->pick_event.motion.x + DISPLAY_X1 (canvas) - canvas->zoom_xofs;
-			y = canvas->pick_event.motion.y + DISPLAY_Y1 (canvas) - canvas->zoom_yofs;
+			x = canvas->pick_event.motion.x + canvas->scroll_x1 - canvas->zoom_xofs;
+			y = canvas->pick_event.motion.y + canvas->scroll_y1 - canvas->zoom_yofs;
 		}
 
diff -r -u2 gal/gal/widgets/e-categories-master-list-array.h gal2/gal/widgets/e-categories-master-list-array.h
--- gal/gal/widgets/e-categories-master-list-array.h	Thu Apr 19 19:03:11 2001
+++ gal2/gal/widgets/e-categories-master-list-array.h	Sat Dec  8 23:03:53 2001
@@ -26,5 +26,5 @@
 } ECategoriesMasterListArrayClass;
 
-GtkType                e_categories_master_list_array_get_type     (void);
+guint                e_categories_master_list_array_get_type     (void);
 ECategoriesMasterList *e_categories_master_list_array_new          (void);
 
diff -r -u2 gal/gal/widgets/e-categories-master-list-combo.h gal2/gal/widgets/e-categories-master-list-combo.h
--- gal/gal/widgets/e-categories-master-list-combo.h	Thu Oct  4 19:18:59 2001
+++ gal2/gal/widgets/e-categories-master-list-combo.h	Sat Dec  8 23:05:17 2001
@@ -3,5 +3,4 @@
 #define _E_CATEGORIES_MASTER_LIST_COMBO_H_
 
-#include <libgnome/gnome-defs.h>
 #include <gal/widgets/e-categories-master-list.h>
 #include <gtk/gtkcombo.h>
diff -r -u2 gal/gal/widgets/e-categories-master-list-dialog.h gal2/gal/widgets/e-categories-master-list-dialog.h
--- gal/gal/widgets/e-categories-master-list-dialog.h	Thu Oct  4 19:18:59 2001
+++ gal2/gal/widgets/e-categories-master-list-dialog.h	Sat Dec  8 23:05:51 2001
@@ -3,5 +3,4 @@
 #define _E_CATEGORIES_MASTER_LIST_DIALOG_H_
 
-#include <libgnome/gnome-defs.h>
 #include <gal/widgets/e-categories-master-list.h>
 
diff -r -u2 gal/gal/widgets/e-categories-master-list.h gal2/gal/widgets/e-categories-master-list.h
--- gal/gal/widgets/e-categories-master-list.h	Wed Aug  1 18:41:26 2001
+++ gal2/gal/widgets/e-categories-master-list.h	Sat Dec  8 23:08:17 2001
@@ -40,5 +40,5 @@
 } ECategoriesMasterListClass;
 
-GtkType     e_categories_master_list_get_type  (void);
+guint     e_categories_master_list_get_type  (void);
 
 /**/
diff -r -u2 gal/gal/widgets/e-categories.c gal2/gal/widgets/e-categories.c
--- gal/gal/widgets/e-categories.c	Thu Oct  4 19:18:59 2001
+++ gal2/gal/widgets/e-categories.c	Sun Dec  9 02:10:54 2001
@@ -22,5 +22,5 @@
 
 #include <config.h>
-
+#include <gtk/gtk.h>
 #include "e-categories.h"
 
@@ -28,5 +28,4 @@
 #include <string.h>
 #include <gdk/gdkkeysyms.h>
-#include <libgnomeui/gnome-stock.h>
 
 #include "gal/e-table/e-table-scrolled.h"
@@ -476,8 +475,8 @@
 
 	gnome_dialog_append_button ( GNOME_DIALOG(categories),
-				     GNOME_STOCK_BUTTON_OK);
+				     GTK_STOCK_OK);
 	
 	gnome_dialog_append_button ( GNOME_DIALOG(categories),
-				     GNOME_STOCK_BUTTON_CANCEL);
+				     GTK_STOCK_CANCEL);
 
 	gnome_dialog_set_default (GNOME_DIALOG (categories), 0);
diff -r -u2 gal/gal/widgets/e-cursors.h gal2/gal/widgets/e-cursors.h
--- gal/gal/widgets/e-cursors.h	Thu Oct  4 19:18:59 2001
+++ gal2/gal/widgets/e-cursors.h	Sat Dec  8 23:13:47 2001
@@ -3,5 +3,4 @@
 
 #include <gdk/gdk.h>
-#include <libgnome/gnome-defs.h>
 
 G_BEGIN_DECLS
diff -r -u2 gal/gal/widgets/e-font.h gal2/gal/widgets/e-font.h
--- gal/gal/widgets/e-font.h	Thu Oct  4 19:18:59 2001
+++ gal2/gal/widgets/e-font.h	Sat Dec  8 23:14:40 2001
@@ -16,5 +16,4 @@
 #include <gdk/gdk.h>
 #include <iconv.h>
-#include <libgnome/gnome-defs.h>
 
 G_BEGIN_DECLS
diff -r -u2 gal/gal/widgets/e-gui-utils.c gal2/gal/widgets/e-gui-utils.c
--- gal/gal/widgets/e-gui-utils.c	Thu Oct  4 19:18:59 2001
+++ gal2/gal/widgets/e-gui-utils.c	Sat Dec  8 23:16:05 2001
@@ -16,5 +16,4 @@
 #include <gtk/gtksignal.h>
 #include <libgnomeui/gnome-messagebox.h>
-#include <libgnomeui/gnome-stock.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
 #include <libgnomecanvas/gnome-canvas-pixbuf.h>
@@ -29,5 +28,5 @@
 	va_start (args, format);
 	str = g_strdup_vprintf (format, args);
-	dialog = gnome_message_box_new (str, type, GNOME_STOCK_BUTTON_OK, NULL);
+	dialog = gnome_message_box_new (str, type, GTK_STOCK_OK, NULL);
 	va_end (args);
 	g_free (str);
diff -r -u2 gal/gal/widgets/e-hsv-utils.h gal2/gal/widgets/e-hsv-utils.h
--- gal/gal/widgets/e-hsv-utils.h	Thu Oct  4 19:19:00 2001
+++ gal2/gal/widgets/e-hsv-utils.h	Sat Dec  8 23:17:53 2001
@@ -3,5 +3,4 @@
 #define _E_HSV_UTILS_H_
 
-#include <libgnome/gnome-defs.h>
 #include <gdk/gdk.h>
 
diff -r -u2 gal/gal/widgets/e-popup-menu.c gal2/gal/widgets/e-popup-menu.c
--- gal/gal/widgets/e-popup-menu.c	Thu Oct  4 19:19:00 2001
+++ gal2/gal/widgets/e-popup-menu.c	Sat Dec  8 23:22:35 2001
@@ -15,6 +15,4 @@
 #include <gtk/gtksignal.h>
 #include <gtk/gtkimagemenuitem.h>
-#include <libgnomeui/gtkpixmapmenuitem.h>
-#include <libgnomeui/gnome-stock.h>
 
 #include "e-popup-menu.h"
@@ -64,42 +62,4 @@
 
 	gtk_widget_show_all (GTK_WIDGET (item));
-
-#warning Horribly hacked ?
-#if 0	
-		GtkWidget *pixmap = gnome_stock_pixmap_widget (item, pixname);
-
-		gtk_widget_show (pixmap);
-		gtk_pixmap_menu_item_set_pixmap (
-			GTK_PIXMAP_MENU_ITEM (item), pixmap);
-
-	/*
-	 * Ugh.  This needs to go into Gtk+
-	 */
-	label = gtk_accel_label_new ("");
-	label_accel = gtk_label_parse_uline (GTK_LABEL (label), name);
-	gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
-	gtk_widget_show (label);
-	
-	item = pixname ? gtk_pixmap_menu_item_new () : gtk_menu_item_new ();
-	gtk_container_add (GTK_CONTAINER (item), label);
-	
-	if (label_accel != GDK_VoidSymbol){
-		gtk_widget_add_accelerator (
-			item,
-			"activate_item",
-			gtk_menu_get_accel_group (GTK_MENU (menu)),
-			label_accel, 0,
-			GTK_ACCEL_LOCKED);
-	}
-
-	if (pixname){
-		GtkWidget *pixmap = gnome_stock_pixmap_widget (item, pixname);
-
-		gtk_widget_show (pixmap);
-		gtk_pixmap_menu_item_set_pixmap (
-			GTK_PIXMAP_MENU_ITEM (item), pixmap);
-	}
-#endif
-
 	return item;
 }
diff -r -u2 gal/gal/widgets/e-popup-menu.h gal2/gal/widgets/e-popup-menu.h
--- gal/gal/widgets/e-popup-menu.h	Thu Oct  4 19:19:00 2001
+++ gal2/gal/widgets/e-popup-menu.h	Sat Dec  8 23:12:34 2001
@@ -5,5 +5,4 @@
 #include <gtk/gtkmenu.h>
 #include <gtk/gtkwidget.h>
-#include <libgnome/gnome-defs.h>
 
 G_BEGIN_DECLS
diff -r -u2 gal/gal/widgets/e-printable.h gal2/gal/widgets/e-printable.h
--- gal/gal/widgets/e-printable.h	Thu Oct  4 19:19:00 2001
+++ gal2/gal/widgets/e-printable.h	Sat Dec  8 23:25:25 2001
@@ -48,5 +48,5 @@
 } EPrintableClass;
 
-GtkType     e_printable_get_type (void);
+guint     e_printable_get_type (void);
 
 EPrintable *e_printable_new                 (void);
diff -r -u2 gal/gal/widgets/e-reflow-model.h gal2/gal/widgets/e-reflow-model.h
--- gal/gal/widgets/e-reflow-model.h	Thu Oct  4 19:19:00 2001
+++ gal2/gal/widgets/e-reflow-model.h	Sat Dec  8 23:27:29 2001
@@ -48,5 +48,5 @@
 } EReflowModelClass;
 
-GtkType          e_reflow_model_get_type        (void);
+guint          e_reflow_model_get_type        (void);
 
 /**/
diff -r -u2 gal/gal/widgets/e-unicode.h gal2/gal/widgets/e-unicode.h
--- gal/gal/widgets/e-unicode.h	Thu Oct  4 19:19:00 2001
+++ gal2/gal/widgets/e-unicode.h	Sat Dec  8 23:01:38 2001
@@ -18,5 +18,4 @@
 #include <gtk/gtkmenu.h>
 #include <gtk/gtkwidget.h>
-#include <libgnome/gnome-defs.h>
 #include <libxml/tree.h>
 #include <iconv.h>
diff -r -u2 gal/gal/widgets/gtk-combo-stack.c gal2/gal/widgets/gtk-combo-stack.c
--- gal/gal/widgets/gtk-combo-stack.c	Thu Oct  4 19:19:00 2001
+++ gal2/gal/widgets/gtk-combo-stack.c	Sat Dec  8 23:40:39 2001
@@ -20,6 +20,5 @@
  */
 
-#include <libgnomeui/gnome-preferences.h>
-#include <libgnomeui/gnome-stock.h>
+#include <gtk/gtk.h>
 #include "gtk-combo-stack.h"
 #include "gal/util/e-util.h"
@@ -181,6 +180,4 @@
 	
 	button = combo->priv->button = gtk_button_new ();
-	if (!gnome_preferences_get_toolbar_relief_btn ())
-		gtk_button_set_relief (GTK_BUTTON (button), GTK_RELIEF_NONE);
 	GTK_WIDGET_UNSET_FLAGS (button, GTK_CAN_FOCUS);
 
diff -r -u2 gal/gal/widgets/widget-color-combo.c gal2/gal/widgets/widget-color-combo.c
--- gal/gal/widgets/widget-color-combo.c	Thu Oct  4 19:19:00 2001
+++ gal2/gal/widgets/widget-color-combo.c	Sat Dec  8 23:46:57 2001
@@ -19,5 +19,4 @@
 #include <libgnomecanvas/gnome-canvas-pixbuf.h>
 #include <libgnomecanvas/gnome-canvas-rect-ellipse.h>
-#include <libgnome/gnome-preferences.h>
 #include <gal/util/e-util.h>
 #include "e-colors.h"
@@ -185,7 +184,4 @@
 	 */
 	cc->preview_button = gtk_button_new ();
-	if (!gnome_preferences_get_toolbar_relief_btn ())
-		gtk_button_set_relief (GTK_BUTTON (cc->preview_button), GTK_RELIEF_NONE);
-
 	cc->preview_canvas = GNOME_CANVAS (gnome_canvas_new ());
 
@@ -240,7 +236,4 @@
 				 cc->preview_button,
 				 GTK_WIDGET (cc->palette));
-
-	if (!gnome_preferences_get_toolbar_relief_btn ())
-		gtk_combo_box_set_arrow_relief (GTK_COMBO_BOX (cc), GTK_RELIEF_NONE);
 
 	/* Set our color to the current color on the palette */
diff -r -u2 gal/gal/widgets/widget-color-combo.h gal2/gal/widgets/widget-color-combo.h
--- gal/gal/widgets/widget-color-combo.h	Thu Oct  4 19:19:00 2001
+++ gal2/gal/widgets/widget-color-combo.h	Sat Dec  8 23:43:07 2001
@@ -3,5 +3,4 @@
 
 #include <gtk/gtkwidget.h>
-#include <libgnome/gnome-defs.h>
 #include <gal/widgets/gtk-combo-box.h>
 #include <gal/widgets/color-palette.h>
diff -r -u2 gal/gal/widgets/widget-pixmap-combo.c gal2/gal/widgets/widget-pixmap-combo.c
--- gal/gal/widgets/widget-pixmap-combo.c	Thu Oct  4 19:19:00 2001
+++ gal2/gal/widgets/widget-pixmap-combo.c	Sun Dec  9 01:30:00 2001
@@ -9,7 +9,5 @@
 #include <gtk/gtksignal.h>
 #include <gtk/gtktable.h>
-#include <libgnome/gnome-defs.h>
 #include <libgnome/gnome-i18n.h>
-#include <libgnomeui/gnome-preferences.h>
 #include "gtk-combo-box.h"
 #include "widget-pixmap-combo.h"
@@ -167,10 +165,6 @@
 
 	pc->preview_button = gtk_button_new ();
-	if (!gnome_preferences_get_toolbar_relief_btn ())
-		gtk_button_set_relief (GTK_BUTTON (pc->preview_button), GTK_RELIEF_NONE);
-	if (!gnome_preferences_get_toolbar_relief_btn ())
-		gtk_combo_box_set_arrow_relief (GTK_COMBO_BOX (pc), GTK_RELIEF_NONE);
 
-	pc->preview_pixmap = gnome_pixmap_new_from_xpm_d ((const gchar **)elements [0].xpm_data);
+    pc->preview_pixmap = gnome_pixmap_new_from_xpm_d ((const gchar **)elements [0].xpm_data);
 
 	gtk_container_add (GTK_CONTAINER (pc->preview_button), GTK_WIDGET (pc->preview_pixmap));
diff -r -u2 gal/gal/widgets/widget-pixmap-combo.h gal2/gal/widgets/widget-pixmap-combo.h
--- gal/gal/widgets/widget-pixmap-combo.h	Thu Oct  4 19:19:00 2001
+++ gal2/gal/widgets/widget-pixmap-combo.h	Sat Dec  8 23:43:59 2001
@@ -5,5 +5,4 @@
 #include <gtk/gtkentry.h>
 #include <gtk/gtktooltips.h>
-#include <libgnome/gnome-defs.h>
 #include <libgnomecanvas/gnome-canvas.h>
 #include <libgnomeui/gnome-pixmap.h>
diff -r -u2 gal/tests/test-tree-1.c gal2/tests/test-tree-1.c
--- gal/tests/test-tree-1.c	Thu Oct  4 19:19:01 2001
+++ gal2/tests/test-tree-1.c	Sun Dec  9 02:35:25 2001
@@ -3,7 +3,8 @@
 #include <stdio.h>
 #include <string.h>
-#include <gnome.h>
+#include <libgnome/libgnome.h>
+#include <libgnomeui/libgnomeui.h>
 #include <libgnomeprint/gnome-print.h>
-#include <libgnomeprint/gnome-print-preview.h>
+#include <libgnomeprintui/gnome-print-preview.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
 
diff -r -u2 gal/tests/test-tree-3.c gal2/tests/test-tree-3.c
--- gal/tests/test-tree-3.c	Thu Apr 12 17:40:51 2001
+++ gal2/tests/test-tree-3.c	Sun Dec  9 02:37:49 2001
@@ -3,7 +3,8 @@
 #include <stdio.h>
 #include <string.h>
-#include <gnome.h>
+#include <libgnome/libgnome.h>
+#include <libgnomeui/libgnomeui.h>
 #include <libgnomeprint/gnome-print.h>
-#include <libgnomeprint/gnome-print-preview.h>
+#include <libgnomeprintui/gnome-print-preview.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
 #include <gal/e-table/e-table-header.h>
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]