diff options
Diffstat (limited to 'widgets/table')
68 files changed, 419 insertions, 272 deletions
diff --git a/widgets/table/e-cell-checkbox.c b/widgets/table/e-cell-checkbox.c index 5ef4b23a96..5310d27fc0 100644 --- a/widgets/table/e-cell-checkbox.c +++ b/widgets/table/e-cell-checkbox.c @@ -21,15 +21,15 @@ * 02111-1307, USA. */ #include <config.h> -#include <gtk/gtkenums.h> -#include <gtk/gtkentry.h> -#include <gtk/gtkwindow.h> -#include <gtk/gtksignal.h> + #include <gdk/gdkkeysyms.h> +#include <gtk/gtk.h> #include <libgnomecanvas/gnome-canvas.h> -#include "e-cell-checkbox.h" + #include "gal/util/e-util.h" + #include "e-table-item.h" +#include "e-cell-checkbox.h" #include "check-empty.xpm" #include "check-filled.xpm" diff --git a/widgets/table/e-cell-combo.c b/widgets/table/e-cell-combo.c index 3ff3488ae5..0688f7068f 100644 --- a/widgets/table/e-cell-combo.c +++ b/widgets/table/e-cell-combo.c @@ -53,12 +53,16 @@ */ #include <config.h> -#include <string.h> /* strcmp() */ + +#include <string.h> + #include <gdk/gdkkeysyms.h> #include <gtk/gtk.h> -#include <glib/gi18n.h> + +#include "gal/util/e-i18n.h" #include "gal/util/e-util.h" #include "gal/widgets/e-unicode.h" + #include "e-table-item.h" #include "e-cell-combo.h" #include "e-cell-text.h" diff --git a/widgets/table/e-cell-date.c b/widgets/table/e-cell-date.c index 64d9b8132b..4366b8cd81 100644 --- a/widgets/table/e-cell-date.c +++ b/widgets/table/e-cell-date.c @@ -22,18 +22,24 @@ #include <config.h> -#include "e-cell-date.h" - #include <sys/time.h> #include <time.h> #include <unistd.h> #include <string.h> -#include <gal/util/e-util.h> -#include <gal/widgets/e-unicode.h> -#include <gal/util/e-i18n.h> + +#include "gal/util/e-i18n.h" +#include "gal/util/e-util.h" +#include "gal/widgets/e-unicode.h" + +#include "e-cell-date.h" #define PARENT_TYPE e_cell_text_get_type () +#ifdef G_OS_WIN32 +/* The localtime() in Microsoft's C library *is* thread-safe */ +#define localtime_r(timep, result) (localtime (timep) ? memcpy ((result), localtime (timep), sizeof (*(result))) : 0) +#endif + static ECellTextClass *parent_class; static char * diff --git a/widgets/table/e-cell-float.c b/widgets/table/e-cell-float.c index 133be063b3..be2b47bd5d 100644 --- a/widgets/table/e-cell-float.c +++ b/widgets/table/e-cell-float.c @@ -25,10 +25,13 @@ */ #include <config.h> + #include <sys/time.h> #include <unistd.h> -#include <gal/util/e-util.h> -#include <gal/util/e-i18n.h> + +#include "gal/util/e-i18n.h" +#include "gal/util/e-util.h" + #include "e-cell-float.h" #define PARENT_TYPE e_cell_text_get_type () diff --git a/widgets/table/e-cell-number.c b/widgets/table/e-cell-number.c index 8c8887df5a..d8890af4b2 100644 --- a/widgets/table/e-cell-number.c +++ b/widgets/table/e-cell-number.c @@ -21,10 +21,13 @@ */ #include <config.h> + #include <sys/time.h> #include <unistd.h> -#include <gal/util/e-util.h> -#include <gal/util/e-i18n.h> + +#include "gal/util/e-i18n.h" +#include "gal/util/e-util.h" + #include "e-cell-number.h" #define PARENT_TYPE e_cell_text_get_type () diff --git a/widgets/table/e-cell-pixbuf.c b/widgets/table/e-cell-pixbuf.c index 50c3b2cc7a..03c476185f 100644 --- a/widgets/table/e-cell-pixbuf.c +++ b/widgets/table/e-cell-pixbuf.c @@ -21,10 +21,15 @@ * 02111-1307, USA. */ +#include <config.h> + #include <stdio.h> + #include <libgnomecanvas/gnome-canvas.h> + +#include "gal/util/e-i18n.h" + #include "e-cell-pixbuf.h" -#include <gal/util/e-i18n.h> #define PARENT_TYPE E_CELL_TYPE static ECellClass *parent_class; diff --git a/widgets/table/e-cell-popup.c b/widgets/table/e-cell-popup.c index 50943d6004..42b04f3984 100644 --- a/widgets/table/e-cell-popup.c +++ b/widgets/table/e-cell-popup.c @@ -29,12 +29,15 @@ */ #include <config.h> + #include <gdk/gdkkeysyms.h> -#include "gal/util/e-util.h" -#include "e-table-item.h" -#include "e-cell-popup.h" + #include "gal/a11y/e-table/gal-a11y-e-cell-popup.h" #include "gal/a11y/e-table/gal-a11y-e-cell-registry.h" +#include "gal/util/e-util.h" + +#include "e-cell-popup.h" +#include "e-table-item.h" #define E_CELL_POPUP_ARROW_WIDTH 16 #define E_CELL_POPUP_ARROW_XPAD 3 diff --git a/widgets/table/e-cell-progress.c b/widgets/table/e-cell-progress.c index bf7fdd9951..cf07db84dc 100644 --- a/widgets/table/e-cell-progress.c +++ b/widgets/table/e-cell-progress.c @@ -26,21 +26,17 @@ * 02111-1307, USA. */ - -#ifdef HAVE_CONFIG_H #include <config.h> -#endif #include <string.h> -#include <gtk/gtkenums.h> -#include <gtk/gtkentry.h> -#include <gtk/gtkwindow.h> -#include <gtk/gtksignal.h> #include <gdk/gdkkeysyms.h> +#include <gtk/gtk.h> #include <libgnomecanvas/gnome-canvas.h> -#include "e-cell-progress.h" + #include "gal/util/e-util.h" + +#include "e-cell-progress.h" #include "e-table-item.h" #define PARENT_TYPE e_cell_get_type () diff --git a/widgets/table/e-cell-size.c b/widgets/table/e-cell-size.c index 1ba8f6d2e6..7651a0bdfc 100644 --- a/widgets/table/e-cell-size.c +++ b/widgets/table/e-cell-size.c @@ -22,9 +22,12 @@ */ #include <config.h> + #include <sys/time.h> #include <unistd.h> -#include <gal/util/e-util.h> + +#include "gal/util/e-util.h" + #include "e-cell-size.h" #define PARENT_TYPE e_cell_text_get_type () diff --git a/widgets/table/e-cell-spin-button.c b/widgets/table/e-cell-spin-button.c index b2af02c44d..59ee3d98a3 100644 --- a/widgets/table/e-cell-spin-button.c +++ b/widgets/table/e-cell-spin-button.c @@ -27,16 +27,16 @@ * 02111-1307, USA. */ -#ifdef HAVE_CONFIG_H #include <config.h> -#endif - -#include <gtk/gtksignal.h> -#include <gal/e-table/e-table-item.h> -#include <gal/e-table/e-table-model.h> -#include <gal/e-table/e-cell-float.h> -#include <gal/e-table/e-cell-number.h> -#include <gal/util/e-util.h> + +#include <gtk/gtk.h> + +#include "gal/e-table/e-cell-float.h" +#include "gal/e-table/e-cell-number.h" +#include "gal/e-table/e-table-item.h" +#include "gal/e-table/e-table-model.h" +#include "gal/util/e-util.h" + #include "e-cell-spin-button.h" #define E_CELL_SPIN_BUTTON_ARROW_WIDTH 16 diff --git a/widgets/table/e-cell-text.c b/widgets/table/e-cell-text.c index 00292254e9..1ecd71f638 100644 --- a/widgets/table/e-cell-text.c +++ b/widgets/table/e-cell-text.c @@ -35,27 +35,30 @@ */ #include <config.h> + #include <stdio.h> #include <ctype.h> #include <math.h> #include <string.h> -#include <gdk/gdkx.h> /* for BlackPixel */ + #include <gdk/gdkkeysyms.h> #include <gtk/gtk.h> #include <libgnomecanvas/gnome-canvas.h> #include <libgnomecanvas/gnome-canvas-rect-ellipse.h> -#include "e-cell-text.h" + +#include "gal/a11y/e-table/gal-a11y-e-cell-registry.h" +#include "gal/a11y/e-table/gal-a11y-e-cell-text.h" +#include "gal/e-text/e-text.h" +#include "gal/util/e-i18n.h" +#include "gal/util/e-text-event-processor.h" +#include "gal/util/e-text-event-processor-emacs-like.h" #include "gal/util/e-util.h" #include "gal/widgets/e-canvas.h" #include "gal/widgets/e-unicode.h" + +#include "e-cell-text.h" #include "e-table-item.h" -#include "gal/util/e-text-event-processor.h" -#include "gal/e-text/e-text.h" -#include "gal/util/e-text-event-processor-emacs-like.h" -#include "gal/util/e-i18n.h" #include "e-table-tooltip.h" -#include "gal/a11y/e-table/gal-a11y-e-cell-registry.h" -#include "gal/a11y/e-table/gal-a11y-e-cell-text.h" #define d(x) #define DO_SELECTION 1 diff --git a/widgets/table/e-cell-toggle.c b/widgets/table/e-cell-toggle.c index 34e8a8b76d..395ec05f6b 100644 --- a/widgets/table/e-cell-toggle.c +++ b/widgets/table/e-cell-toggle.c @@ -22,18 +22,18 @@ */ #include <config.h> -#include <gtk/gtkenums.h> -#include <gtk/gtkentry.h> -#include <gtk/gtkwindow.h> -#include <gtk/gtksignal.h> + #include <gdk/gdkkeysyms.h> +#include <gtk/gtk.h> #include <libgnomecanvas/gnome-canvas.h> -#include "e-cell-toggle.h" + +#include "gal/a11y/e-table/gal-a11y-e-cell-toggle.h" +#include "gal/a11y/e-table/gal-a11y-e-cell-registry.h" #include "gal/util/e-util.h" #include "gal/widgets/e-hsv-utils.h" + +#include "e-cell-toggle.h" #include "e-table-item.h" -#include "gal/a11y/e-table/gal-a11y-e-cell-toggle.h" -#include "gal/a11y/e-table/gal-a11y-e-cell-registry.h" #define PARENT_TYPE e_cell_get_type () diff --git a/widgets/table/e-cell-tree.c b/widgets/table/e-cell-tree.c index a0be81e889..95e7764cdf 100644 --- a/widgets/table/e-cell-tree.c +++ b/widgets/table/e-cell-tree.c @@ -33,27 +33,23 @@ #include <math.h> #include <stdio.h> -#include <gdk/gdkx.h> /* for BlackPixel */ -#include <gtk/gtkenums.h> -#include <gtk/gtkentry.h> -#include <gtk/gtkwindow.h> -#include <gtk/gtkinvisible.h> -#include <gtk/gtksignal.h> #include <gdk/gdkkeysyms.h> +#include <gtk/gtk.h> #include <libgnomecanvas/gnome-canvas.h> -#include "e-tree-table-adapter.h" -#include "e-tree.h" -#include "e-tree-model.h" +#include "gal/a11y/e-table/gal-a11y-e-cell-registry.h" +#include "gal/a11y/e-table/gal-a11y-e-cell-tree.h" #include "gal/util/e-util.h" -#include "e-table-item.h" + #include "e-cell-tree.h" +#include "e-table-item.h" +#include "e-tree.h" +#include "e-tree-model.h" +#include "e-tree-table-adapter.h" #include "tree-expanded.xpm" #include "tree-unexpanded.xpm" -#include "gal/a11y/e-table/gal-a11y-e-cell-registry.h" -#include "gal/a11y/e-table/gal-a11y-e-cell-tree.h" #define PARENT_TYPE e_cell_get_type () @@ -174,7 +170,9 @@ ect_realize (ECellView *ecell_view) tree_view->gc = gdk_gc_new (GTK_WIDGET (tree_view->canvas)->window); gdk_gc_set_line_attributes (tree_view->gc, 1, - GDK_LINE_ON_OFF_DASH, None, None); + GDK_LINE_ON_OFF_DASH, + GDK_CAP_NOT_LAST, + GDK_JOIN_MITER); gdk_gc_set_dashes (tree_view->gc, 0, "\1\1", 2); if (parent_class->realize) diff --git a/widgets/table/e-cell-vbox.c b/widgets/table/e-cell-vbox.c index ee18694742..7ab1b561a2 100644 --- a/widgets/table/e-cell-vbox.c +++ b/widgets/table/e-cell-vbox.c @@ -33,19 +33,14 @@ #include <math.h> #include <stdio.h> -#include <gdk/gdkx.h> /* for BlackPixel */ -#include <gtk/gtkenums.h> -#include <gtk/gtkentry.h> -#include <gtk/gtkwindow.h> -#include <gtk/gtkinvisible.h> -#include <gtk/gtksignal.h> -#include <gdk/gdkkeysyms.h> +#include <gtk/gtk.h> -#include "gal/util/e-util.h" #include "gal/a11y/e-table/gal-a11y-e-cell-registry.h" #include "gal/a11y/e-table/gal-a11y-e-cell-vbox.h" -#include "e-table-item.h" +#include "gal/util/e-util.h" + #include "e-cell-vbox.h" +#include "e-table-item.h" #define PARENT_TYPE e_cell_get_type () diff --git a/widgets/table/e-cell.c b/widgets/table/e-cell.c index 8deeaa654c..e3fe5af23a 100644 --- a/widgets/table/e-cell.c +++ b/widgets/table/e-cell.c @@ -23,9 +23,11 @@ */ #include <config.h> -#include "e-cell.h" + #include "gal/util/e-util.h" +#include "e-cell.h" + #define PARENT_TYPE GTK_TYPE_OBJECT #define ECVIEW_EC_CLASS(v) (E_CELL_GET_CLASS (v->ecell)) diff --git a/widgets/table/e-table-click-to-add.c b/widgets/table/e-table-click-to-add.c index 544cbcbd86..01eb6ab671 100644 --- a/widgets/table/e-table-click-to-add.c +++ b/widgets/table/e-table-click-to-add.c @@ -22,26 +22,26 @@ */ #include <config.h> + #include <gdk/gdkkeysyms.h> -#include <gtk/gtksignal.h> +#include <gtk/gtk.h> #include <libgnomecanvas/gnome-canvas.h> -#include <libgnomecanvas/gnome-canvas-util.h> #include <libgnomecanvas/gnome-canvas-rect-ellipse.h> +#include <libgnomecanvas/gnome-canvas-util.h> #include <gdk-pixbuf/gdk-pixbuf.h> -#include <atk/atkregistry.h> -#include <atk/atkutil.h> -#include <atk/atkgobjectaccessible.h> -#include "e-table-header.h" -#include "e-table-click-to-add.h" -#include "e-table-defines.h" -#include "e-table-one.h" + +#include "gal/a11y/e-table/gal-a11y-e-table-click-to-add.h" #include "gal/e-text/e-text.h" -#include "gal/widgets/e-canvas.h" -#include "gal/widgets/e-canvas-utils.h" -#include "gal/util/e-util.h" #include "gal/util/e-i18n.h" #include "gal/util/e-marshal.h" -#include "gal/a11y/e-table/gal-a11y-e-table-click-to-add.h" +#include "gal/util/e-util.h" +#include "gal/widgets/e-canvas-utils.h" +#include "gal/widgets/e-canvas.h" + +#include "e-table-click-to-add.h" +#include "e-table-defines.h" +#include "e-table-header.h" +#include "e-table-one.h" enum { CURSOR_CHANGE, diff --git a/widgets/table/e-table-col.c b/widgets/table/e-table-col.c index 9acc0ba4fd..ccc6665547 100644 --- a/widgets/table/e-table-col.c +++ b/widgets/table/e-table-col.c @@ -22,9 +22,11 @@ */ #include <config.h> -#include "e-table-col.h" -#include "gal/util/e-util.h" + #include "gal/util/e-i18n.h" +#include "gal/util/e-util.h" + +#include "e-table-col.h" static GObjectClass *parent_class; diff --git a/widgets/table/e-table-column-specification.c b/widgets/table/e-table-column-specification.c index 2e992414d5..a8f8f3fb54 100644 --- a/widgets/table/e-table-column-specification.c +++ b/widgets/table/e-table-column-specification.c @@ -22,11 +22,15 @@ */ #include <config.h> + #include <stdlib.h> + #include <libxml/parser.h> #include <libxml/xmlmemory.h> -#include "gal/util/e-xml-utils.h" + #include "gal/util/e-util.h" +#include "gal/util/e-xml-utils.h" + #include "e-table-column-specification.h" static GObjectClass *etcs_parent_class; diff --git a/widgets/table/e-table-column.c b/widgets/table/e-table-column.c index 514a25e74e..54fdb1525a 100644 --- a/widgets/table/e-table-column.c +++ b/widgets/table/e-table-column.c @@ -22,6 +22,7 @@ */ #include <config.h> + #include "e-table-column.h" enum { diff --git a/widgets/table/e-table-config-field.c b/widgets/table/e-table-config-field.c index 7c23e10046..a3a833580e 100644 --- a/widgets/table/e-table-config-field.c +++ b/widgets/table/e-table-config-field.c @@ -22,11 +22,14 @@ */ #include <config.h> + #include <stdlib.h> + #include <gtk/gtk.h> -#include <gtk/gtkbox.h> -#include "gal/util/e-util.h" + #include "gal/util/e-i18n.h" +#include "gal/util/e-util.h" + #include "e-table-config-field.h" #define PARENT_TYPE (gtk_vbox_get_type()) diff --git a/widgets/table/e-table-config.c b/widgets/table/e-table-config.c index 4e40c150fd..3c508565ce 100644 --- a/widgets/table/e-table-config.c +++ b/widgets/table/e-table-config.c @@ -29,24 +29,22 @@ #include <config.h> -#include "e-table-config.h" - #include <stdlib.h> #include <string.h> -#include <gtk/gtkdialog.h> -#include <gtk/gtkentry.h> -#include <gtk/gtklabel.h> -#include <gtk/gtktogglebutton.h> + +#include <gtk/gtk.h> #include <libgnomeui/gnome-propertybox.h> #include <glade/glade.h> -#include "gal/util/e-util.h" + #include "gal/util/e-i18n.h" +#include "gal/util/e-util-private.h" +#include "gal/util/e-util.h" #include "gal/widgets/e-unicode.h" -#include <e-table-scrolled.h> -#include <e-table-without.h> -#include <e-table-memory-store.h> - +#include "e-table-config.h" +#include "e-table-memory-store.h" +#include "e-table-scrolled.h" +#include "e-table-without.h" static GObjectClass *config_parent_class; @@ -1079,9 +1077,19 @@ setup_gui (ETableConfig *config) create_global_store (config); if (e_table_sort_info_get_can_group (config->state->sort_info)) { - gui = glade_xml_new (ETABLE_GLADEDIR "/e-table-config.glade", NULL, E_I18N_DOMAIN); + gchar *filename = + g_build_filename (GAL_GLADEDIR, + "e-table-config.glade", + NULL); + gui = glade_xml_new (filename, NULL, E_I18N_DOMAIN); + g_free (filename); } else { - gui = glade_xml_new (ETABLE_GLADEDIR "/e-table-config-no-group.glade", NULL, E_I18N_DOMAIN); + gchar *filename = + g_build_filename (GAL_GLADEDIR, + "e-table-config-no-group.glade", + NULL); + gui = glade_xml_new (filename, NULL, E_I18N_DOMAIN); + g_free (filename); } g_object_unref (global_store); diff --git a/widgets/table/e-table-example-2.c b/widgets/table/e-table-example-2.c index 2321e4e7dd..e00265650f 100644 --- a/widgets/table/e-table-example-2.c +++ b/widgets/table/e-table-example-2.c @@ -23,9 +23,11 @@ #include <stdio.h> #include <string.h> + #include <gdk-pixbuf/gdk-pixbuf.h> #include "gal/e-util/e-cursors.h" + #include "e-table-simple.h" #include "e-table-header.h" #include "e-table-header-item.h" diff --git a/widgets/table/e-table-extras.c b/widgets/table/e-table-extras.c index 81947a6e94..de91862bea 100644 --- a/widgets/table/e-table-extras.c +++ b/widgets/table/e-table-extras.c @@ -22,18 +22,22 @@ */ #include <config.h> + #include <stdlib.h> -#include <gtk/gtksignal.h> +#include <string.h> + +#include <gtk/gtk.h> + #include "gal/util/e-util.h" -#include "gal/e-table/e-cell-text.h" -#include "gal/e-table/e-cell-checkbox.h" -#include "gal/e-table/e-cell-date.h" -#include "gal/e-table/e-cell-number.h" -#include "gal/e-table/e-cell-pixbuf.h" -#include "gal/e-table/e-cell-size.h" -#include "gal/e-table/e-cell-tree.h" + +#include "e-cell-checkbox.h" +#include "e-cell-date.h" +#include "e-cell-number.h" +#include "e-cell-pixbuf.h" +#include "e-cell-size.h" +#include "e-cell-text.h" +#include "e-cell-tree.h" #include "e-table-extras.h" -#include <string.h> static GObjectClass *ete_parent_class; diff --git a/widgets/table/e-table-field-chooser-dialog.c b/widgets/table/e-table-field-chooser-dialog.c index d7e725fd12..f079703441 100644 --- a/widgets/table/e-table-field-chooser-dialog.c +++ b/widgets/table/e-table-field-chooser-dialog.c @@ -22,10 +22,13 @@ */ #include <config.h> -#include "e-table-field-chooser-dialog.h" + +#include <gtk/gtk.h> + #include "gal/util/e-i18n.h" #include "gal/util/e-util.h" -#include <gtk/gtkstock.h> + +#include "e-table-field-chooser-dialog.h" static void e_table_field_chooser_dialog_init (ETableFieldChooserDialog *card); static void e_table_field_chooser_dialog_class_init (ETableFieldChooserDialogClass *klass); diff --git a/widgets/table/e-table-field-chooser-item.c b/widgets/table/e-table-field-chooser-item.c index cfc73fc102..86f3f87d2c 100644 --- a/widgets/table/e-table-field-chooser-item.c +++ b/widgets/table/e-table-field-chooser-item.c @@ -22,9 +22,10 @@ */ #include <config.h> + #include <string.h> -#include <gtk/gtksignal.h> -#include <gtk/gtkdnd.h> + +#include <gtk/gtk.h> #include <libgnomecanvas/gnome-canvas.h> #include <libgnomecanvas/gnome-canvas-util.h> #include <libgnomecanvas/gnome-canvas-polygon.h> @@ -36,12 +37,11 @@ #include "gal/util/e-xml-utils.h" #include "gal/widgets/e-canvas.h" -#include "e-table-header.h" #include "e-table-col-dnd.h" #include "e-table-defines.h" -#include "e-table-header-utils.h" - #include "e-table-field-chooser-item.h" +#include "e-table-header-utils.h" +#include "e-table-header.h" #define d(x) diff --git a/widgets/table/e-table-field-chooser.c b/widgets/table/e-table-field-chooser.c index 25b94b2aca..333827fd48 100644 --- a/widgets/table/e-table-field-chooser.c +++ b/widgets/table/e-table-field-chooser.c @@ -22,14 +22,16 @@ */ #include <config.h> -#include <gtk/gtksignal.h> + #include <gtk/gtk.h> -#include <gtk/gtkbox.h> #include <libgnomecanvas/gnome-canvas-rect-ellipse.h> + +#include "gal/util/e-i18n.h" +#include "gal/util/e-util.h" +#include "gal/util/e-util-private.h" + #include "e-table-field-chooser.h" #include "e-table-field-chooser-item.h" -#include <gal/util/e-i18n.h> -#include <gal/util/e-util.h> static void e_table_field_chooser_init (ETableFieldChooser *card); static void e_table_field_chooser_class_init (ETableFieldChooserClass *klass); @@ -153,8 +155,11 @@ e_table_field_chooser_init (ETableFieldChooser *etfc) { GladeXML *gui; GtkWidget *widget; - - gui = glade_xml_new (ETABLE_GLADEDIR "/e-table-field-chooser.glade", NULL, E_I18N_DOMAIN); + gchar *filename = g_build_filename (GAL_GLADEDIR, + "e-table-field-chooser.glade", + NULL); + gui = glade_xml_new (filename, NULL, E_I18N_DOMAIN); + g_free (filename); etfc->gui = gui; widget = glade_xml_get_widget(gui, "vbox-top"); diff --git a/widgets/table/e-table-group-container.c b/widgets/table/e-table-group-container.c index 2fc0617e8f..30e7bed520 100644 --- a/widgets/table/e-table-group-container.c +++ b/widgets/table/e-table-group-container.c @@ -22,19 +22,23 @@ */ #include <config.h> + #include <gdk/gdkkeysyms.h> -#include <gtk/gtksignal.h> +#include <gtk/gtk.h> #include <libgnome/libgnome.h> #include <libgnomecanvas/gnome-canvas-rect-ellipse.h> -#include "e-table-group-container.h" -#include "e-table-group-leaf.h" -#include "e-table-item.h" + +#include "gal/e-text/e-text.h" +#include "gal/util/e-i18n.h" #include "gal/util/e-util.h" -#include "gal/widgets/e-canvas.h" #include "gal/widgets/e-canvas-utils.h" +#include "gal/widgets/e-canvas.h" #include "gal/widgets/e-unicode.h" -#include "gal/e-text/e-text.h" + #include "e-table-defines.h" +#include "e-table-group-container.h" +#include "e-table-group-leaf.h" +#include "e-table-item.h" #define TITLE_HEIGHT 16 diff --git a/widgets/table/e-table-group-leaf.c b/widgets/table/e-table-group-leaf.c index 083345ed74..597cfe0724 100644 --- a/widgets/table/e-table-group-leaf.c +++ b/widgets/table/e-table-group-leaf.c @@ -22,16 +22,19 @@ */ #include <config.h> -#include <gtk/gtksignal.h> + +#include <gtk/gtk.h> #include <libgnomecanvas/gnome-canvas-rect-ellipse.h> -#include "e-table-group-leaf.h" -#include "e-table-item.h" -#include "e-table-sorted-variable.h" -#include "e-table-sorted.h" -#include "gal/util/e-util.h" + #include "gal/util/e-i18n.h" +#include "gal/util/e-util.h" #include "gal/widgets/e-canvas.h" +#include "e-table-item.h" +#include "e-table-group-leaf.h" +#include "e-table-sorted.h" +#include "e-table-sorted-variable.h" + #define PARENT_TYPE e_table_group_get_type () static GnomeCanvasGroupClass *etgl_parent_class; diff --git a/widgets/table/e-table-group.c b/widgets/table/e-table-group.c index 5bc8841cb4..4dca53c3f9 100644 --- a/widgets/table/e-table-group.c +++ b/widgets/table/e-table-group.c @@ -22,13 +22,16 @@ */ #include <config.h> -#include <gtk/gtksignal.h> + +#include <gtk/gtk.h> #include <libgnomecanvas/gnome-canvas-rect-ellipse.h> + +#include "gal/util/e-util.h" + #include "e-table-group.h" #include "e-table-group-container.h" #include "e-table-group-leaf.h" #include "e-table-item.h" -#include "gal/util/e-util.h" #define PARENT_TYPE gnome_canvas_group_get_type () diff --git a/widgets/table/e-table-header-item.c b/widgets/table/e-table-header-item.c index 265d29fed0..14438f39d2 100644 --- a/widgets/table/e-table-header-item.c +++ b/widgets/table/e-table-header-item.c @@ -24,33 +24,34 @@ #include <config.h> -#include "e-table-header-item.h" - #include <string.h> -#include <gtk/gtksignal.h> -#include <gtk/gtkdnd.h> -#include <gtk/gtkimage.h> + +#include <gtk/gtk.h> #include <libgnomecanvas/gnome-canvas.h> #include <libgnomecanvas/gnome-canvas-util.h> #include <libgnomecanvas/gnome-canvas-polygon.h> #include <libgnomecanvas/gnome-canvas-rect-ellipse.h> #include <gdk-pixbuf/gdk-pixbuf.h> #include <gdk/gdkkeysyms.h> -#include "gal/widgets/e-cursors.h" + #include "gal/util/e-i18n.h" +#include "gal/util/e-marshal.h" #include "gal/util/e-util.h" #include "gal/util/e-xml-utils.h" -#include "gal/util/e-marshal.h" #include "gal/widgets/e-canvas.h" -#include "gal/widgets/e-popup-menu.h" +#include "gal/widgets/e-cursors.h" #include "gal/widgets/e-gui-utils.h" -#include "e-table-header.h" -#include "e-table-header-utils.h" +#include "gal/widgets/e-popup-menu.h" + +#include "e-table.h" #include "e-table-col-dnd.h" +#include "e-table-config.h" #include "e-table-defines.h" #include "e-table-field-chooser-dialog.h" -#include "e-table-config.h" -#include "e-table.h" +#include "e-table-header.h" +#include "e-table-header-utils.h" + +#include "e-table-header-item.h" #include "add-col.xpm" #include "remove-col.xpm" diff --git a/widgets/table/e-table-header-utils.c b/widgets/table/e-table-header-utils.c index cf99e8ecba..de5e00549c 100644 --- a/widgets/table/e-table-header-utils.c +++ b/widgets/table/e-table-header-utils.c @@ -23,20 +23,17 @@ * 02111-1307, USA. */ -#ifdef HAVE_CONFIG_H #include <config.h> -#endif - -#include "e-table-header-utils.h" #include <string.h> /* strlen() */ #include <glib.h> -#include <gtk/gtkbutton.h> -#include <gtk/gtkwindow.h> -#include "e-table-defines.h" -#include <gal/widgets/e-unicode.h> - +#include <gtk/gtk.h> + +#include "gal/widgets/e-unicode.h" + +#include "e-table-defines.h" +#include "e-table-header-utils.h" static PangoLayout* build_header_layout (GtkWidget *widget, const char *str) diff --git a/widgets/table/e-table-header.c b/widgets/table/e-table-header.c index d810d61bd1..0dac60d73a 100644 --- a/widgets/table/e-table-header.c +++ b/widgets/table/e-table-header.c @@ -23,14 +23,17 @@ */ #include <config.h> + #include <string.h> + #include <glib-object.h> -#include <gtk/gtkimage.h> -#include <gal/util/e-util.h> -#include "e-table-header.h" -#include "e-table-defines.h" +#include <gtk/gtk.h> + #include "gal/util/e-util.h" +#include "e-table-defines.h" +#include "e-table-header.h" + /* The arguments we take */ enum { PROP_0, diff --git a/widgets/table/e-table-item.c b/widgets/table/e-table-item.c index 33798cc716..87ca7432dc 100644 --- a/widgets/table/e-table-item.c +++ b/widgets/table/e-table-item.c @@ -28,27 +28,25 @@ */ #include <config.h> -#include "e-table-item.h" - -#include <X11/Xlib.h> - #include <math.h> #include <stdio.h> -#include <gtk/gtksignal.h> -#include <gtk/gtkmain.h> +#include <string.h> +#include <stdlib.h> + +#include <gtk/gtk.h> #include <gdk/gdkkeysyms.h> -#include "e-table-subset.h" -#include "e-cell.h" + #include "gal/a11y/e-table/gal-a11y-e-table-item-factory.h" -#include "gal/widgets/e-hsv-utils.h" -#include "gal/widgets/e-canvas.h" -#include "gal/widgets/e-canvas-utils.h" -#include "gal/util/e-util.h" #include "gal/a11y/e-table/gal-a11y-e-table-item.h" #include "gal/util/e-i18n.h" -#include <string.h> -#include <stdlib.h> -#include <atk/atk.h> +#include "gal/util/e-util.h" +#include "gal/widgets/e-canvas.h" +#include "gal/widgets/e-canvas-utils.h" +#include "gal/widgets/e-hsv-utils.h" + +#include "e-cell.h" +#include "e-table-item.h" +#include "e-table-subset.h" #define PARENT_OBJECT_TYPE gnome_canvas_item_get_type () @@ -202,7 +200,7 @@ eti_grab (ETableItem *eti, guint32 time) | GDK_POINTER_MOTION_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK, NULL, time, grab_cancelled, - eti) != GrabSuccess) { + eti) != GDK_GRAB_SUCCESS) { d(g_print ("%s: gtk_grab_add\n", __FUNCTION__)); gtk_grab_add (GTK_WIDGET (item->canvas)); eti->gtk_grabbed = TRUE; diff --git a/widgets/table/e-table-memory-callbacks.c b/widgets/table/e-table-memory-callbacks.c index 6cd1b9c8a1..f5803366b5 100644 --- a/widgets/table/e-table-memory-callbacks.c +++ b/widgets/table/e-table-memory-callbacks.c @@ -22,9 +22,11 @@ */ #include <config.h> -#include "e-table-memory-callbacks.h" + #include "gal/util/e-util.h" +#include "e-table-memory-callbacks.h" + static int etmc_column_count (ETableModel *etm) { diff --git a/widgets/table/e-table-memory-store.c b/widgets/table/e-table-memory-store.c index 69765b32ab..bd29ef8d48 100644 --- a/widgets/table/e-table-memory-store.c +++ b/widgets/table/e-table-memory-store.c @@ -22,10 +22,13 @@ */ #include <config.h> + #include <string.h> -#include "e-table-memory-store.h" + #include "gal/util/e-util.h" +#include "e-table-memory-store.h" + #define STORE_LOCATOR(etms, col, row) (*((etms)->priv->store + (row) * (etms)->priv->col_count + (col))) static ETableMemoryClass *parent_class; diff --git a/widgets/table/e-table-memory.c b/widgets/table/e-table-memory.c index 7d9958bbd6..62f7850eca 100644 --- a/widgets/table/e-table-memory.c +++ b/widgets/table/e-table-memory.c @@ -23,20 +23,20 @@ #include <config.h> -#include "e-table-memory.h" - #include <stdio.h> #include <errno.h> #include <stdlib.h> #include <unistd.h> #include <fcntl.h> +#include <string.h> #include <libxml/parser.h> #include <libxml/xmlmemory.h> #include "gal/util/e-util.h" #include "gal/util/e-xml-utils.h" -#include <string.h> + +#include "e-table-memory.h" static ETableModel *parent_class; diff --git a/widgets/table/e-table-model.c b/widgets/table/e-table-model.c index 67c443c8c6..b2291fb171 100644 --- a/widgets/table/e-table-model.c +++ b/widgets/table/e-table-model.c @@ -22,10 +22,13 @@ */ #include <config.h> + #include <glib-object.h> -#include "e-table-model.h" -#include "gal/util/e-util.h" + #include "gal/util/e-marshal.h" +#include "gal/util/e-util.h" + +#include "e-table-model.h" #define ETM_CLASS(e) (E_TABLE_MODEL_GET_CLASS (e)) #define ETM_FROZEN(e) (GPOINTER_TO_INT (g_object_get_data (G_OBJECT(e), "frozen")) != 0) diff --git a/widgets/table/e-table-one.c b/widgets/table/e-table-one.c index 486f14862f..2d71a6e505 100644 --- a/widgets/table/e-table-one.c +++ b/widgets/table/e-table-one.c @@ -22,9 +22,11 @@ */ #include <config.h> -#include "e-table-one.h" + #include "gal/util/e-util.h" +#include "e-table-one.h" + static ETableModelClass *parent_class = NULL; static int diff --git a/widgets/table/e-table-scrolled.c b/widgets/table/e-table-scrolled.c index 1786148c78..548fafa90f 100644 --- a/widgets/table/e-table-scrolled.c +++ b/widgets/table/e-table-scrolled.c @@ -22,18 +22,20 @@ */ #include <config.h> + #include <stdlib.h> #include <stdio.h> #include <string.h> -#include <stdio.h> + #include <libgnomecanvas/gnome-canvas.h> -#include <gtk/gtksignal.h> +#include <gtk/gtk.h> #include <libxml/parser.h> #include <libxml/xmlmemory.h> +#include "gal/util/e-i18n.h" + #include "e-table.h" #include "e-table-scrolled.h" -#include "gal/util/e-i18n.h" #define COLUMN_HEADER_HEIGHT 16 diff --git a/widgets/table/e-table-search.c b/widgets/table/e-table-search.c index c0460e4524..d49f993d08 100644 --- a/widgets/table/e-table-search.c +++ b/widgets/table/e-table-search.c @@ -22,11 +22,13 @@ */ #include <config.h> -#include "e-table-search.h" -#include "gal/util/e-util.h" #include <string.h> +#include "gal/util/e-util.h" + +#include "e-table-search.h" + #define d(x) d(static gint depth = 0); diff --git a/widgets/table/e-table-selection-model.c b/widgets/table/e-table-selection-model.c index 14edf3d6de..521e8eb413 100644 --- a/widgets/table/e-table-selection-model.c +++ b/widgets/table/e-table-selection-model.c @@ -22,14 +22,16 @@ */ #include <config.h> -#include "e-table-selection-model.h" #include <string.h> + #include <gdk/gdkkeysyms.h> #include "gal/util/e-i18n.h" #include "gal/util/e-util.h" +#include "e-table-selection-model.h" + #define PARENT_TYPE e_selection_model_array_get_type () static ESelectionModelArray *parent_class; diff --git a/widgets/table/e-table-simple.c b/widgets/table/e-table-simple.c index b7cf8f66be..53ef4abe43 100644 --- a/widgets/table/e-table-simple.c +++ b/widgets/table/e-table-simple.c @@ -23,9 +23,11 @@ */ #include <config.h> -#include "e-table-simple.h" + #include "gal/util/e-util.h" +#include "e-table-simple.h" + static int simple_column_count (ETableModel *etm) { diff --git a/widgets/table/e-table-sort-info.c b/widgets/table/e-table-sort-info.c index ba8f9050ab..d37cb2bf91 100644 --- a/widgets/table/e-table-sort-info.c +++ b/widgets/table/e-table-sort-info.c @@ -23,11 +23,12 @@ #include <config.h> -#include "e-table-sort-info.h" +#include <string.h> #include "gal/util/e-util.h" #include "gal/util/e-xml-utils.h" -#include <string.h> + +#include "e-table-sort-info.h" #define ETM_CLASS(e) (E_TABLE_SORT_INFO_GET_CLASS (e)) diff --git a/widgets/table/e-table-sorted-variable.c b/widgets/table/e-table-sorted-variable.c index ac3a7d5067..5b3237ae42 100644 --- a/widgets/table/e-table-sorted-variable.c +++ b/widgets/table/e-table-sorted-variable.c @@ -22,9 +22,12 @@ */ #include <config.h> + #include <stdlib.h> #include <string.h> + #include "gal/util/e-util.h" + #include "e-table-sorted-variable.h" #include "e-table-sorting-utils.h" diff --git a/widgets/table/e-table-sorted.c b/widgets/table/e-table-sorted.c index a5b5acb8cf..462045b563 100644 --- a/widgets/table/e-table-sorted.c +++ b/widgets/table/e-table-sorted.c @@ -22,9 +22,12 @@ */ #include <config.h> + #include <stdlib.h> #include <string.h> + #include "gal/util/e-util.h" + #include "e-table-sorted.h" #include "e-table-sorting-utils.h" diff --git a/widgets/table/e-table-sorter.c b/widgets/table/e-table-sorter.c index a92af49f4d..a38647a48a 100644 --- a/widgets/table/e-table-sorter.c +++ b/widgets/table/e-table-sorter.c @@ -22,10 +22,13 @@ */ #include <config.h> + #include <stdlib.h> #include <string.h> + #include "gal/util/e-i18n.h" #include "gal/util/e-util.h" + #include "e-table-sorter.h" #define d(x) diff --git a/widgets/table/e-table-sorting-utils.c b/widgets/table/e-table-sorting-utils.c index 80a9564a36..9a7a1f9b26 100644 --- a/widgets/table/e-table-sorting-utils.c +++ b/widgets/table/e-table-sorting-utils.c @@ -22,9 +22,12 @@ */ #include <config.h> + #include <string.h> -#include <e-table-sorting-utils.h> -#include <gal/util/e-util.h> + +#include "gal/util/e-util.h" + +#include "e-table-sorting-utils.h" #define d(x) diff --git a/widgets/table/e-table-specification.c b/widgets/table/e-table-specification.c index 3fcc28689d..31a58e5401 100644 --- a/widgets/table/e-table-specification.c +++ b/widgets/table/e-table-specification.c @@ -21,20 +21,21 @@ * 02111-1307, USA. */ -#ifdef HAVE_CONFIG_H #include <config.h> -#endif - -#include "e-table-specification.h" #include <stdlib.h> #include <string.h> +#include <glib.h> +#include <glib/gstdio.h> #include <libxml/parser.h> #include <libxml/xmlmemory.h> + #include "gal/util/e-util.h" #include "gal/util/e-xml-utils.h" +#include "e-table-specification.h" + static GObjectClass *etsp_parent_class; static void @@ -133,7 +134,15 @@ e_table_specification_load_from_file (ETableSpecification *specification, if (!g_file_test (filename, G_FILE_TEST_EXISTS)) return FALSE; +#ifdef G_OS_WIN32 + { + gchar *locale_filename = gnome_win32_locale_filename_from_utf8 (filename); + doc = xmlParseFile (locale_filename); + g_free (locale_filename); + } +#else doc = xmlParseFile (filename); +#endif if (doc) { xmlNode *node = xmlDocGetRootElement (doc); e_table_specification_load_from_node (specification, node); diff --git a/widgets/table/e-table-state.c b/widgets/table/e-table-state.c index c66e5933e0..fe581af0bd 100644 --- a/widgets/table/e-table-state.c +++ b/widgets/table/e-table-state.c @@ -21,19 +21,18 @@ * 02111-1307, USA. */ -#ifdef HAVE_CONFIG_H #include <config.h> -#endif #include <stdlib.h> #include <string.h> #include <libxml/parser.h> #include <libxml/xmlmemory.h> + #include "gal/util/e-util.h" #include "gal/util/e-xml-utils.h" -#include "e-table-state.h" +#include "e-table-state.h" #define STATE_VERSION 0.1 diff --git a/widgets/table/e-table-subset-variable.c b/widgets/table/e-table-subset-variable.c index efe6529806..6cc28e540b 100644 --- a/widgets/table/e-table-subset-variable.c +++ b/widgets/table/e-table-subset-variable.c @@ -22,9 +22,12 @@ */ #include <config.h> + #include <stdlib.h> #include <string.h> + #include "gal/util/e-util.h" + #include "e-table-subset-variable.h" #define ETSSV_CLASS(e) (E_TABLE_SUBSET_VARIABLE_GET_CLASS (e)) diff --git a/widgets/table/e-table-subset.c b/widgets/table/e-table-subset.c index a237ba2d94..200dec6d9a 100644 --- a/widgets/table/e-table-subset.c +++ b/widgets/table/e-table-subset.c @@ -23,8 +23,11 @@ */ #include <config.h> + #include <stdlib.h> + #include "gal/util/e-util.h" + #include "e-table-subset.h" static void etss_proxy_model_pre_change_real (ETableSubset *etss, ETableModel *etm); diff --git a/widgets/table/e-table-utils.c b/widgets/table/e-table-utils.c index eec4fc79d5..af4e32de33 100644 --- a/widgets/table/e-table-utils.c +++ b/widgets/table/e-table-utils.c @@ -22,9 +22,12 @@ */ #include <config.h> -#include "gal/util/e-i18n.h" + +#include <libintl.h> /* This file uses dgettext() but no _() */ + #include "gal/util/e-util.h" #include "gal/widgets/e-unicode.h" + #include "e-table-utils.h" #include "e-table-header-utils.h" diff --git a/widgets/table/e-table-without.c b/widgets/table/e-table-without.c index e49076be0f..8fb12844b1 100644 --- a/widgets/table/e-table-without.c +++ b/widgets/table/e-table-without.c @@ -22,9 +22,12 @@ */ #include <config.h> + #include <stdlib.h> #include <string.h> + #include "gal/util/e-util.h" + #include "e-table-without.h" #define PARENT_TYPE E_TABLE_SUBSET_TYPE diff --git a/widgets/table/e-table.c b/widgets/table/e-table.c index 3a849fbf26..e604657abf 100644 --- a/widgets/table/e-table.c +++ b/widgets/table/e-table.c @@ -22,41 +22,36 @@ * 02111-1307, USA. */ -#ifdef HAVE_CONFIG_H #include <config.h> -#endif #include <stdlib.h> #include <string.h> #include <stdio.h> -#include <gdk/gdk.h> + +#include <glib.h> +#include <glib/gstdio.h> #include <gdk/gdkkeysyms.h> -#include <gtk/gtksignal.h> +#include <gtk/gtk.h> #include <libgnomecanvas/gnome-canvas.h> #include <libgnomecanvas/gnome-canvas-rect-ellipse.h> +#include "gal/a11y/e-table/gal-a11y-e-table.h" #include "gal/util/e-i18n.h" #include "gal/util/e-util.h" #include "gal/widgets/e-canvas.h" #include "gal/widgets/e-canvas-background.h" #include "gal/widgets/e-canvas-vbox.h" #include "gal/widgets/e-unicode.h" + #include "e-table.h" +#include "e-table-click-to-add.h" +#include "e-table-column-specification.h" +#include "e-table-group-leaf.h" #include "e-table-header-item.h" #include "e-table-header-utils.h" #include "e-table-subset.h" -#include "e-table-item.h" -#include "e-table-group.h" -#include "e-table-group-leaf.h" -#include "e-table-click-to-add.h" -#include "e-table-specification.h" -#include "e-table-state.h" -#include "e-table-column-specification.h" - #include "e-table-utils.h" -#include <atk/atk.h> -#include "gal/a11y/e-table/gal-a11y-e-table.h" #define COLUMN_HEADER_HEIGHT 16 @@ -1946,7 +1941,15 @@ e_table_load_specification (ETable *e_table, gchar *filename) g_return_val_if_fail(filename != NULL, -1); /* doesn't work yet, yay */ +#ifdef G_OS_WIN32 + { + gchar *locale_filename = gnome_win32_locale_filename_from_utf8 (filename); + xmlSpec = xmlParseFile (locale_filename); + g_free (locale_filename); + } +#else xmlSpec = xmlParseFile (filename); +#endif ret = et_real_set_specification(e_table, xmlSpec); xmlFreeDoc (xmlSpec); diff --git a/widgets/table/e-tree-memory-callbacks.c b/widgets/table/e-tree-memory-callbacks.c index b6fe3fc375..72212116ef 100644 --- a/widgets/table/e-tree-memory-callbacks.c +++ b/widgets/table/e-tree-memory-callbacks.c @@ -22,8 +22,11 @@ */ #include <config.h> -#include <gtk/gtksignal.h> + +#include <gtk/gtk.h> + #include "gal/util/e-util.h" + #include "e-tree-memory-callbacks.h" #define PARENT_TYPE E_TREE_MEMORY_TYPE diff --git a/widgets/table/e-tree-memory.c b/widgets/table/e-tree-memory.c index 3f178455df..554e308def 100644 --- a/widgets/table/e-tree-memory.c +++ b/widgets/table/e-tree-memory.c @@ -35,6 +35,7 @@ #include "gal/util/e-util.h" #include "gal/util/e-xml-utils.h" + #include "e-tree-memory.h" #define TREEPATH_CHUNK_AREA_SIZE (30 * sizeof (ETreeMemoryPath)) diff --git a/widgets/table/e-tree-model.c b/widgets/table/e-tree-model.c index 6ca0e17af9..32a890daae 100644 --- a/widgets/table/e-tree-model.c +++ b/widgets/table/e-tree-model.c @@ -25,17 +25,17 @@ #include <config.h> #include <stdio.h> -#include <errno.h> #include <stdlib.h> #include <unistd.h> #include <fcntl.h> +#include <gtk/gtk.h> #include <libxml/parser.h> #include <libxml/xmlmemory.h> -#include <gtk/gtksignal.h> #include "gal/util/e-util.h" #include "gal/util/e-xml-utils.h" + #include "e-tree-model.h" #define ETM_CLASS(e) (E_TREE_MODEL_GET_CLASS(e)) diff --git a/widgets/table/e-tree-scrolled.c b/widgets/table/e-tree-scrolled.c index a72a246b69..8d9857058f 100644 --- a/widgets/table/e-tree-scrolled.c +++ b/widgets/table/e-tree-scrolled.c @@ -22,16 +22,18 @@ */ #include <config.h> + #include <stdlib.h> #include <stdio.h> #include <string.h> -#include <stdio.h> + #include <libgnomecanvas/gnome-canvas.h> -#include <gtk/gtksignal.h> +#include <gtk/gtk.h> #include <libxml/parser.h> #include <libxml/xmlmemory.h> -#include <gal/util/e-util.h> -#include <gal/util/e-i18n.h> + +#include "gal/util/e-i18n.h" +#include "gal/util/e-util.h" #include "e-tree-scrolled.h" diff --git a/widgets/table/e-tree-selection-model.c b/widgets/table/e-tree-selection-model.c index 6d45b6257c..bc781daad5 100644 --- a/widgets/table/e-tree-selection-model.c +++ b/widgets/table/e-tree-selection-model.c @@ -23,11 +23,12 @@ */ #include <config.h> + +#include "gal/e-table/e-tree-table-adapter.h" +#include "gal/util/e-i18n.h" +#include "gal/util/e-util.h" + #include "e-tree-selection-model.h" -#include <gal/util/e-i18n.h> -#include <gal/util/e-util.h> -#include <gdk/gdkkeysyms.h> -#include <gal/e-table/e-tree-table-adapter.h> #define PARENT_TYPE e_selection_model_get_type () diff --git a/widgets/table/e-tree-simple.c b/widgets/table/e-tree-simple.c index e8dff1e05a..be7f09fa45 100644 --- a/widgets/table/e-tree-simple.c +++ b/widgets/table/e-tree-simple.c @@ -22,7 +22,9 @@ */ #include <config.h> + #include "gal/util/e-util.h" + #include "e-tree-simple.h" static int diff --git a/widgets/table/e-tree-sorted-variable.c b/widgets/table/e-tree-sorted-variable.c index bb73b8b776..9943c9d7ea 100644 --- a/widgets/table/e-tree-sorted-variable.c +++ b/widgets/table/e-tree-sorted-variable.c @@ -22,9 +22,12 @@ */ #include <config.h> + #include <stdlib.h> #include <string.h> + #include "gal/util/e-util.h" + #include "e-tree-sorted-variable.h" #define d(x) diff --git a/widgets/table/e-tree-sorted.c b/widgets/table/e-tree-sorted.c index 20ecdad63f..6854bd445c 100644 --- a/widgets/table/e-tree-sorted.c +++ b/widgets/table/e-tree-sorted.c @@ -26,11 +26,8 @@ /* FIXME: Overall e-tree-sorted.c needs to be made more efficient. */ - #include <config.h> -#include "e-tree-sorted.h" - #include <stdio.h> #include <errno.h> #include <stdlib.h> @@ -43,7 +40,9 @@ #include "gal/util/e-util.h" #include "gal/util/e-xml-utils.h" + #include "e-table-sorting-utils.h" +#include "e-tree-sorted.h" /* maximum insertions between an idle event that we will do without scheduling an idle sort */ #define ETS_INSERT_MAX (4) diff --git a/widgets/table/e-tree-table-adapter.c b/widgets/table/e-tree-table-adapter.c index e1bda25eba..6b2f0fefd8 100644 --- a/widgets/table/e-tree-table-adapter.c +++ b/widgets/table/e-tree-table-adapter.c @@ -22,20 +22,21 @@ * 02111-1307, USA. */ - -#ifdef HAVE_CONFIG_H #include <config.h> -#endif #include <stdlib.h> #include <string.h> +#include <glib.h> +#include <glib/gstdio.h> #include <libxml/tree.h> #include <libxml/parser.h> + #include "gal/util/e-util.h" #include "gal/util/e-xml-utils.h" -#include "e-tree-table-adapter.h" + #include "e-table-sorting-utils.h" +#include "e-tree-table-adapter.h" #define PARENT_TYPE E_TABLE_MODEL_TYPE #define d(x) @@ -928,7 +929,16 @@ open_file (ETreeTableAdapter *etta, const char *filename) if (!g_file_test (filename, G_FILE_TEST_EXISTS)) return NULL; +#ifdef G_OS_WIN32 + { + gchar *locale_filename = gnome_win32_locale_filename_from_utf8 (filename); + doc = xmlParseFile (locale_filename); + g_free (locale_filename); + } +#else doc = xmlParseFile (filename); +#endif + if (!doc) return NULL; diff --git a/widgets/table/e-tree.c b/widgets/table/e-tree.c index fa3dafa2fa..718444bb2b 100644 --- a/widgets/table/e-tree.c +++ b/widgets/table/e-tree.c @@ -22,39 +22,35 @@ */ #include <config.h> + #include <stdlib.h> #include <stdio.h> #include <string.h> -#include <stdio.h> + #include <gdk/gdkkeysyms.h> -#include <gtk/gtksignal.h> +#include <gtk/gtk.h> #include <libgnomecanvas/gnome-canvas-rect-ellipse.h> -#include <atk/atkregistry.h> - -#include <gal/util/e-i18n.h> -#include <gal/util/e-util.h> -#include <gal/util/e-marshal.h> -#include <gal/widgets/e-canvas.h> -#include <gal/widgets/e-canvas-background.h> - -#include <gal/e-table/e-table-column-specification.h> -#include <gal/e-table/e-table-header-item.h> -#include <gal/e-table/e-table-header.h> -#include <gal/e-table/e-table-item.h> -#include <gal/e-table/e-table-sort-info.h> -#include <gal/e-table/e-table-utils.h> +#include "gal/a11y/e-table/gal-a11y-e-tree.h" +#include "gal/util/e-i18n.h" +#include "gal/util/e-util.h" +#include "gal/util/e-marshal.h" +#include "gal/widgets/e-canvas.h" +#include "gal/widgets/e-canvas-background.h" + +#include "e-table-column-specification.h" +#include "e-table-header-item.h" +#include "e-table-header.h" +#include "e-table-item.h" +#include "e-table-sort-info.h" +#include "e-table-utils.h" #ifdef E_TREE_USE_TREE_SELECTION -#include <gal/e-table/e-tree-selection-model.h> +#include "e-tree-selection-model.h" #else -#include <gal/e-table/e-table-selection-model.h> +#include "e-table-selection-model.h" #endif - -#include <gal/e-table/e-tree-table-adapter.h> - #include "e-tree.h" -#include "gal/util/e-marshal.h" -#include "gal/a11y/e-table/gal-a11y-e-tree.h" +#include "e-tree-table-adapter.h" #define COLUMN_HEADER_HEIGHT 16 diff --git a/widgets/table/table-test.c b/widgets/table/table-test.c index fe211e9d21..c087161458 100644 --- a/widgets/table/table-test.c +++ b/widgets/table/table-test.c @@ -22,11 +22,15 @@ */ #include <config.h> + #include <stdio.h> #include <string.h> #include <fcntl.h> + #include <gnome.h> + #include "gal/widgets/e-cursors.h" + #include "table-test.h" int diff --git a/widgets/table/test-check.c b/widgets/table/test-check.c index 7fe4c126e6..237566ab27 100644 --- a/widgets/table/test-check.c +++ b/widgets/table/test-check.c @@ -22,17 +22,21 @@ */ #include <config.h> + #include <stdio.h> #include <string.h> + #include <gnome.h> -#include "e-table-simple.h" -#include "e-table-header.h" -#include "e-table-header-item.h" -#include "e-table-item.h" + #include "gal/widgets/e-cursors.h" #include "gal/widgets/e-canvas-utils.h" #include "gal/widgets/e-canvas.h" #include "gal/util/e-util.h" + +#include "e-table-simple.h" +#include "e-table-header.h" +#include "e-table-header-item.h" +#include "e-table-item.h" #include "e-cell-text.h" #include "e-cell-checkbox.h" diff --git a/widgets/table/test-cols.c b/widgets/table/test-cols.c index e4873633e5..70fa9d9534 100644 --- a/widgets/table/test-cols.c +++ b/widgets/table/test-cols.c @@ -22,13 +22,17 @@ */ #include <config.h> + #include <stdio.h> #include <string.h> + #include <gnome.h> + #include "gal/widgets/e-canvas-utils.h" #include "gal/widgets/e-canvas.h" #include "gal/widgets/e-cursors.h" #include "gal/util/e-util.h" + #include "e-table-simple.h" #include "e-table-header.h" #include "e-table-header-item.h" diff --git a/widgets/table/test-table.c b/widgets/table/test-table.c index b44b62bf42..510f6ef2c8 100644 --- a/widgets/table/test-table.c +++ b/widgets/table/test-table.c @@ -22,11 +22,15 @@ */ #include <config.h> + #include <stdio.h> #include <string.h> + #include <gnome.h> + #include "gal/widgets/e-cursors.h" #include "gal/widgets/e-canvas.h" + #include "e-table-simple.h" #include "e-table-header.h" #include "e-table-header-item.h" @@ -37,8 +41,6 @@ #include "table-test.h" - - char buffer [1024]; char **column_labels; char ***table_data; |