Merge revisions 36866:37046 from trunk.

svn path=/branches/kill-bonobo/; revision=37050

8 files changed, 40 insertions, 84 deletions

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  <mbarnes@redhat.com>
+
+	* 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  <mbarnes@redhat.com>
+
+	* test-dropdown-button.c:
+	Remove unneeded #include <libgnomeui/gnome-stock-icons.h>.
+
+2009-01-10  Matthew Barnes  <mbarnes@redhat.com>
+
+	** Fixes part of bug #567281
+
+	* e-cell-date-edit.c:
+	* e-cell-percent.c:
+	Remove unneeded #include <libgnomeui/gnome-messagebox.h>.
+
+2009-01-10  Matthew Barnes  <mbarnes@redhat.com>
+
+	** Fixes part of bug #567276
+
+	* test-color.c:
+	We don't ship this.  Remove it.
+
+2009-01-10  Matthew Barnes  <mbarnes@redhat.com>
+
+	** Fixes part of bug #567285
+
+	* e-activity-handler.c:
+	* e-dropdown-button.c:
+	Remove unneeded #include <libgnomeui/gnome-popup-menu.h>.
+
 2008-12-10  Milan Crha  <mcrha@redhat.com>
 
 	** 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 <table/e-table-item.h>
 #include <table/e-cell-text.h>
 
-#include <libgnomeui/gnome-messagebox.h>
 #include <glib/gi18n.h>
 
 #include <libedataserver/e-time-utils.h>
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 <sys/time.h>
 #include <unistd.h>
 #include <stdio.h>
-#include <libgnomeui/gnome-messagebox.h>
 #include <glib/gi18n.h>
 
 #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 <string.h>
 #include <iconv.h>
 
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
 
 #include <bonobo/bonobo-ui-node.h>
 #include <bonobo/bonobo-ui-util.h>
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 <stdio.h>
-#include <libgnomeui/gnome-popup-menu.h>
 
 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 <config.h>
+#endif
+
 #include "e-signature-combo-box.h"
 
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
 
 #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 <http://www.gnu.org/licenses/>  
- *
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- */
-
-#include <config.h>
-
-#include <gnome.h>
-
-#include <glib/gi18n.h>
-
-#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 <libgnomeui/gnome-app.h>
 #include <libgnomeui/gnome-app-helper.h>
 #include <libgnomeui/gnome-ui-init.h>
-#include <libgnomeui/gnome-stock-icons.h>
 
 #include "e-dropdown-button.h"