From c7d3c9f95609123035ebaa267f9d2e6ecfa8c2e8 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Mon, 12 Jan 2009 04:12:01 +0000 Subject: Merge revisions 36866:37046 from trunk. svn path=/branches/kill-bonobo/; revision=37050 --- widgets/ChangeLog | 23 +++++++++++ widgets/menus/gal-view-collection.c | 1 - widgets/menus/gal-view-instance.c | 1 - widgets/misc/ChangeLog | 34 ++++++++++++++++ widgets/misc/e-cell-date-edit.c | 1 - widgets/misc/e-cell-percent.c | 1 - widgets/misc/e-charset-picker.c | 2 +- widgets/misc/e-dropdown-button.c | 1 - widgets/misc/e-signature-combo-box.c | 6 ++- widgets/misc/test-color.c | 78 ------------------------------------ widgets/misc/test-dropdown-button.c | 1 - widgets/table/ChangeLog | 7 ++++ widgets/table/e-table-state.c | 3 ++ 13 files changed, 73 insertions(+), 86 deletions(-) delete mode 100644 widgets/misc/test-color.c (limited to 'widgets') diff --git a/widgets/ChangeLog b/widgets/ChangeLog index 296d3210d5..71810c617c 100644 --- a/widgets/ChangeLog +++ b/widgets/ChangeLog @@ -1,3 +1,26 @@ +2009-01-10 Matthew Barnes + + * menus/gal-view-collection.c: + * menus/gal-view-instance.c: + Remove unneeded #include . + +2009-01-10 Matthew Barnes + + ** Fixes part of bug #567276 + + * menus/gal-view-menus.c: + Remove unneeded #include . + +2009-01-09 Takao Fujiwara + + Reviewed by Matthew Barnes + + * Fix for bug #566011 + + * misc/e-charset-picker.c: + * misc/e-signature-combo-box.c: + Include instead of . + 2008-11-03 Matthew Barnes ** Fixes bug #559041 diff --git a/widgets/menus/gal-view-collection.c b/widgets/menus/gal-view-collection.c index 57c06eba16..890ee3ea7f 100644 --- a/widgets/menus/gal-view-collection.c +++ b/widgets/menus/gal-view-collection.c @@ -28,7 +28,6 @@ #include #include -#include #include #include diff --git a/widgets/menus/gal-view-instance.c b/widgets/menus/gal-view-instance.c index e31c7d1079..a1eac04b6c 100644 --- a/widgets/menus/gal-view-instance.c +++ b/widgets/menus/gal-view-instance.c @@ -31,7 +31,6 @@ #include #include -#include #include #include #include diff --git a/widgets/misc/ChangeLog b/widgets/misc/ChangeLog index c519df2d47..e8c1a5023d 100644 --- a/widgets/misc/ChangeLog +++ b/widgets/misc/ChangeLog @@ -1,3 +1,37 @@ +2009-01-11 Matthew Barnes + + * e-attachment-bar.c (eab_icon_clicked_cb): + * e-url-entry.c (button_clicked_cb): + Call e_show_uri() instead of gnome_url_show(). + +2009-01-10 Matthew Barnes + + * test-dropdown-button.c: + Remove unneeded #include . + +2009-01-10 Matthew Barnes + + ** Fixes part of bug #567281 + + * e-cell-date-edit.c: + * e-cell-percent.c: + Remove unneeded #include . + +2009-01-10 Matthew Barnes + + ** Fixes part of bug #567276 + + * test-color.c: + We don't ship this. Remove it. + +2009-01-10 Matthew Barnes + + ** Fixes part of bug #567285 + + * e-activity-handler.c: + * e-dropdown-button.c: + Remove unneeded #include . + 2008-12-10 Milan Crha ** Fix for bug #556303 diff --git a/widgets/misc/e-cell-date-edit.c b/widgets/misc/e-cell-date-edit.c index 824c8a1b20..68cbbb97d4 100644 --- a/widgets/misc/e-cell-date-edit.c +++ b/widgets/misc/e-cell-date-edit.c @@ -42,7 +42,6 @@ #include #include
-#include #include #include diff --git a/widgets/misc/e-cell-percent.c b/widgets/misc/e-cell-percent.c index ee83d60def..94e33489e5 100644 --- a/widgets/misc/e-cell-percent.c +++ b/widgets/misc/e-cell-percent.c @@ -34,7 +34,6 @@ #include #include #include -#include #include #include "e-cell-percent.h" diff --git a/widgets/misc/e-charset-picker.c b/widgets/misc/e-charset-picker.c index 1f24397fae..ade1c186a6 100644 --- a/widgets/misc/e-charset-picker.c +++ b/widgets/misc/e-charset-picker.c @@ -29,7 +29,7 @@ #include #include -#include +#include #include #include diff --git a/widgets/misc/e-dropdown-button.c b/widgets/misc/e-dropdown-button.c index 32785a5e8f..aa5f84f6c8 100644 --- a/widgets/misc/e-dropdown-button.c +++ b/widgets/misc/e-dropdown-button.c @@ -28,7 +28,6 @@ #include "e-dropdown-button.h" #include -#include struct _EDropdownButtonPrivate { GtkAccelGroup *accel_group; diff --git a/widgets/misc/e-signature-combo-box.c b/widgets/misc/e-signature-combo-box.c index 199a3ad51a..9ebd20a0b2 100644 --- a/widgets/misc/e-signature-combo-box.c +++ b/widgets/misc/e-signature-combo-box.c @@ -18,9 +18,13 @@ * */ +#ifdef HAVE_CONFIG_H +#include +#endif + #include "e-signature-combo-box.h" -#include +#include #define E_SIGNATURE_COMBO_BOX_GET_PRIVATE(obj) \ (G_TYPE_INSTANCE_GET_PRIVATE \ diff --git a/widgets/misc/test-color.c b/widgets/misc/test-color.c deleted file mode 100644 index f86166a228..0000000000 --- a/widgets/misc/test-color.c +++ /dev/null @@ -1,78 +0,0 @@ -/* - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) version 3. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see - * - * - * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) - * - */ - -#include - -#include - -#include - -#include "color-palette.h" -#include "e-colors.h" -#include "widget-color-combo.h" - -#include "pixmaps/cursor_hand_open.xpm" - -/* To compile (from src/widgets): - -gcc -I.. -I../.. -L. -Wall -o tester tester.c ../color.c `gnome-config --cflags --libs gnome gnomeui` -lwidgets - -*/ - -gint -main ( gint argc, gchar* argv[] ) -{ - GtkWidget * dialog; - GtkWidget * T; - ColorGroup *cg; - - gnome_program_init ("tester", "1.0", - LIBGNOMEUI_MODULE, - argc, argv, NULL); - - dialog = gnome_dialog_new ("TESTER", GNOME_STOCK_BUTTON_OK, - GNOME_STOCK_BUTTON_CANCEL, NULL); - - cg = color_group_fetch ("fore_color_group", dialog); - T = color_palette_new ("Color Palette", NULL, cg); - - gtk_box_pack_start(GTK_BOX (GNOME_DIALOG (dialog)-> vbox ), - T, TRUE, TRUE, 5); - gtk_widget_show_all (T); - - cg = color_group_fetch ("fore_color_group", dialog); - T = color_combo_new ( - gdk_pixbuf_new_from_xpm_data ((char const **)cursor_hand_open_xpm), - _("Automatic"), &e_black, cg); - gtk_box_pack_start(GTK_BOX (GNOME_DIALOG (dialog)-> vbox ), - T, TRUE, TRUE, 5); - gtk_widget_show_all (T); - - cg = color_group_fetch ("back_color_group", dialog); - T = color_combo_new ( - gdk_pixbuf_new_from_xpm_data ((char const **)cursor_hand_open_xpm), - _("Automatic"), &e_black, cg); - gtk_box_pack_start(GTK_BOX (GNOME_DIALOG (dialog)-> vbox ), - T, TRUE, TRUE, 5); - gtk_widget_show_all (T); - - gnome_dialog_run_and_close ( GNOME_DIALOG (dialog) ); - return 0; -} diff --git a/widgets/misc/test-dropdown-button.c b/widgets/misc/test-dropdown-button.c index 38523c47b1..f0a7ca4d0e 100644 --- a/widgets/misc/test-dropdown-button.c +++ b/widgets/misc/test-dropdown-button.c @@ -31,7 +31,6 @@ #include #include #include -#include #include "e-dropdown-button.h" diff --git a/widgets/table/ChangeLog b/widgets/table/ChangeLog index 4034fe0a5a..d2de4354a2 100644 --- a/widgets/table/ChangeLog +++ b/widgets/table/ChangeLog @@ -1,3 +1,10 @@ +2008-12-15 Milan Crha + + ** Fix for bug #557176 + + * e-table-state.c: (e_table_state_load_from_node): + Ensure the 'sort_info' member is never NULL. + 2008-11-28 Felix Riemann ** Part of fix for bug #554464 diff --git a/widgets/table/e-table-state.c b/widgets/table/e-table-state.c index 9f173eb573..69d33486a2 100644 --- a/widgets/table/e-table-state.c +++ b/widgets/table/e-table-state.c @@ -189,6 +189,9 @@ e_table_state_load_from_node (ETableState *state, state->columns = g_new(int, state->col_count); state->expansions = g_new(double, state->col_count); + if (!state->sort_info) + state->sort_info = e_table_sort_info_new (); + for (iterator = list, i = 0; iterator; i++) { int_and_double *column_info = iterator->data; -- cgit v1.2.3