drop use of "font" arg. (get_left_width): use pango to calculate this

2002-12-18  Chris Toshok  <toshok@ximian.com>

	* gui/widgets/e-minicard.c (e_minicard_realize): drop use of
	"font" arg.
	(get_left_width): use pango to calculate this instead of a GdkFont.

	* gui/widgets/e-minicard-view.c: drop include of e-unicode.h.

	* gui/widgets/e-minicard-label.c (e_minicard_label_construct):
	don't need to create the font anymore.

	* gui/search/Makefile.am (INCLUDES): add -D*_DISABLE_DEPRECATED.

	* gui/search/e-addressbook-search-dialog.c
	(e_addressbook_search_dialog_new): use g_object_new instead of
	gtk_type_new.

	* gui/merging/Makefile.am (INCLUDES): add -D*_DISABLE_DEPRECATED.

	* gui/contact-list-editor/Makefile.am (INCLUDES): add
	-D*_DISABLE_DEPRECATED.

	* gui/contact-list-editor/e-contact-list-editor.c (is_named):
	strdup (or not, if we don't need to save the value) instead of
	using the e_utf8 functions.
	(fill_in_info): same.

	* gui/contact-editor/Makefile.am (INCLUDES): add
	-D*_DISABLE_DEPRECATED.

	* gui/contact-editor/e-contact-save-as.c (e_contact_save_as):
	strdup (or not, if we don't need to save the value) instead of
	using the e_utf8 functions.
	(e_contact_list_save_as): same.

	* gui/contact-editor/e-contact-quick-add.c (clicked_cb): strdup
	(or not, if we don't need to save the value) instead of using the
	e_utf8 functions.
	(build_quick_add_dialog): same.

	* gui/contact-editor/e-contact-editor.c (phone_entry_changed):
	strdup (or not, if we don't need to save the value) instead of
	using the e_utf8 functions.
	(file_as_set_style): same.
	(name_entry_changed): same.
	(full_name_clicked): same.
	(categories_clicked): same.
	(set_field): same.
	(fill_in_field): same.
	(fill_in_single_field): same.
	(extract_field): same.
	(extract_single_field): same.

	* gui/contact-editor/e-contact-editor-fullname.c (extract_field):
	just strdup, it's already utf8.

	* gui/contact-editor/e-contact-editor-address.c (extract_field):
	they're all entries, use GTK_ENTRY foo here.

	* gui/component/select-names/Makefile.am (INCLUDES): add
	-D*_DISABLE_DEPRECATED.

	* gui/component/select-names/e-select-names.c
	(e_select_names_add_section): remove the extra
	utf8_from_locale_string stuff.

	* gui/component/select-names/e-select-names-popup.c
	(set_uiinfo_label): gtk_container_children ->
	gtk_container_get_children, and remove the extra utf8 stuff.

	* gui/component/Makefile.am (INCLUDES): add
	-D*_DISABLE_DEPRECATED.

	* gui/component/addressbook-storage.c
	(addressbook_storage_init_source_uri): g_string_sprintfa ->
	g_string_append_printf.

	* gui/component/addressbook-config.c (focus_help):
	gtk_notebook_set_page -> gtk_notebook_set_current_page.
	(addressbook_source_dialog_set_source): same.
	(auth_optionmenu_activated): gtk_container_children ->
	gtk_container_get_children.
	(ssl_optionmenu_activated): same.
	(ssl_optionmenu_selected): same, and gtk_notebook_set_page ->
	gtk_notebook_set_current_page.
	(scope_optionmenu_activated): same.
	(set_advanced_button_state): same.
	(addressbook_ldap_init): hook "response" to gtk_widget_destroy to
	make the dialog go away when clicked.
	(addressbook_ldap_auth): same.
	(addressbook_root_dse_query): same.
	(do_ldap_root_dse_query): same.
	(addressbook_config_control_new): fix return type and cast.
	(main): remove call to gtk_widget_push_visual.

	* gui/component/addressbook-config.h:
	addressbook_config_control_new returns a BonoboObject, not a
	BonoboControl.

	* gui/component/addressbook.c: remove e-unicode.h include.

	* backend/pas/Makefile.am (INCLUDES): Add
	-DLIBGNOME_DISABLE_DEPRECATED.

	* backend/ebook/Makefile.am (INCLUDES): Add
	-DLIBGNOME_DISABLE_DEPRECATED.

	* backend/ebook/e-card.c (e_card_get_property): remove misleading
	comment.

svn path=/trunk/; revision=19160

6 files changed, 50 insertions, 66 deletions

diff --git a/addressbook/gui/contact-editor/Makefile.am b/addressbook/gui/contact-editor/Makefile.am
index dbbd0350a7..308972b207 100644
--- a/addressbook/gui/contact-editor/Makefile.am
+++ b/addressbook/gui/contact-editor/Makefile.am
@@ -12,6 +12,10 @@ INCLUDES =					\
 	-DEVOLUTION_ICONSDIR=\""$(iconsdir)"\"	\
 	-DEVOLUTIONDIR=\""$(evolutiondir)"\"	\
 	-DG_LOG_DOMAIN=\"contact-editor\"	\
+	-DG_DISABLE_DEPRECATED			\
+	-DGTK_DISABLE_DEPRECATED		\
+	-DLIBGNOME_DISABLE_DEPRECATED		\
+	-DLIBGNOMEUI_DISABLE_DEPRECATED		\
 	$(EVOLUTION_ADDRESSBOOK_CFLAGS)
 
 noinst_LIBRARIES =				\
diff --git a/addressbook/gui/contact-editor/e-contact-editor-address.c b/addressbook/gui/contact-editor/e-contact-editor-address.c
index 954be85928..8bb5a075f8 100644
--- a/addressbook/gui/contact-editor/e-contact-editor-address.c
+++ b/addressbook/gui/contact-editor/e-contact-editor-address.c
@@ -27,10 +27,11 @@
 #include <libgnome/gnome-i18n.h>
 #include <libgnomeui/gnome-window-icon.h>
 #include <libgnome/gnome-util.h>
-#include <gal/widgets/e-unicode.h>
 #include <gal/widgets/e-gui-utils.h>
 #include <gtk/gtkcombo.h>
+#include <gtk/gtkentry.h>
 #include <gtk/gtkstock.h>
+#include <gtk/gtklabel.h>
 #include <string.h>
 #include <stdlib.h>
 #include <locale.h>
@@ -577,9 +578,9 @@ fill_in_info(EContactEditorAddress *editor)
 static char *
 extract_field(EContactEditorAddress *editor, char *field)
 {
-	GtkEditable *editable = GTK_EDITABLE(glade_xml_get_widget(editor->gui, field));
-	if (editable)
-		return e_utf8_gtk_editable_get_text(editable);
+	GtkEntry *entry = GTK_ENTRY(glade_xml_get_widget(editor->gui, field));
+	if (entry)
+		return g_strdup (gtk_entry_get_text(entry));
 	else
 		return NULL;
 }
diff --git a/addressbook/gui/contact-editor/e-contact-editor-fullname.c b/addressbook/gui/contact-editor/e-contact-editor-fullname.c
index bd51c71605..aa06e66eae 100644
--- a/addressbook/gui/contact-editor/e-contact-editor-fullname.c
+++ b/addressbook/gui/contact-editor/e-contact-editor-fullname.c
@@ -20,13 +20,14 @@
  */
 
 #include <config.h>
-#include <gal/widgets/e-unicode.h>
 #include "e-contact-editor-fullname.h"
 #include <libgnomeui/gnome-window-icon.h>
 #include <libgnome/gnome-util.h>
 #include <libgnome/gnome-i18n.h>
 #include <gtk/gtkcombo.h>
 #include <gtk/gtkstock.h>
+#include <gtk/gtkentry.h>
+#include <gtk/gtklabel.h>
 
 static void e_contact_editor_fullname_init		(EContactEditorFullname		 *card);
 static void e_contact_editor_fullname_class_init	(EContactEditorFullnameClass	 *klass);
@@ -261,7 +262,7 @@ extract_field(EContactEditorFullname *editor, char *field)
 {
 	GtkEntry *entry = GTK_ENTRY(glade_xml_get_widget(editor->gui, field));
 	if (entry)
-		return e_utf8_gtk_entry_get_text(entry);
+		return g_strdup (gtk_entry_get_text(entry));
 	else
 		return NULL;
 }
diff --git a/addressbook/gui/contact-editor/e-contact-editor.c b/addressbook/gui/contact-editor/e-contact-editor.c
index 23b5dc5dd6..0837fe6bd9 100644
--- a/addressbook/gui/contact-editor/e-contact-editor.c
+++ b/addressbook/gui/contact-editor/e-contact-editor.c
@@ -30,6 +30,8 @@
 #include <gtk/gtktextview.h>
 #include <gtk/gtkmessagedialog.h>
 #include <gtk/gtkstock.h>
+#include <gtk/gtkentry.h>
+#include <gtk/gtklabel.h>
 #include <libgnomeui/gnome-popup-menu.h>
 #include <libgnomeui/gnome-window-icon.h>
 #include <libgnome/gnome-i18n.h>
@@ -40,7 +42,6 @@
 #include <gdk-pixbuf/gdk-pixbuf.h>
 #include <gal/widgets/e-categories.h>
 #include <gal/widgets/e-gui-utils.h>
-#include <gal/widgets/e-unicode.h>
 #include <gal/e-text/e-entry.h>
 
 #include <e-util/e-categories-master-list-wombat.h>
@@ -294,7 +295,7 @@ phone_entry_changed (GtkWidget *widget, EContactEditor *editor)
 	} else
 		return;
 	phone = e_card_phone_new();
-	phone->number = e_utf8_gtk_entry_get_text(entry);
+	phone->number = g_strdup (gtk_entry_get_text(entry));
 	e_card_simple_set_phone(editor->simple, editor->phone_choice[which - 1], phone);
 	e_card_phone_unref(phone);
 	set_fields(editor);
@@ -508,7 +509,7 @@ file_as_get_style (EContactEditor *editor)
 	if (!(file_as && GTK_IS_ENTRY(file_as)))
 		return -1;
 
-	filestring = e_utf8_gtk_entry_get_text(file_as);
+	filestring = g_strdup (gtk_entry_get_text(file_as));
 
 	style = -1;
 	for (i = 0; i < 5; i++) {
@@ -538,7 +539,7 @@ file_as_set_style(EContactEditor *editor, int style)
 		return;
 
 	if (style == -1) {
-		string = e_utf8_gtk_entry_get_text(file_as);
+		string = g_strdup (gtk_entry_get_text(file_as));
 		strings = g_list_append(strings, string);
 	}
 
@@ -548,9 +549,7 @@ file_as_set_style(EContactEditor *editor, int style)
 		if (style_makes_sense(editor->name, editor->company, i)) {
 			char *u;
 			u = name_to_style(editor->name, editor->company, i);
-			string = e_utf8_to_gtk_string (widget, u);
-			g_free (u);
-			if (string) strings = g_list_append(strings, string);
+			if (u) strings = g_list_append(strings, u);
 		}
 	}
 
@@ -563,7 +562,7 @@ file_as_set_style(EContactEditor *editor, int style)
 
 	if (style != -1) {
 		string = name_to_style(editor->name, editor->company, style);
-		e_utf8_gtk_entry_set_text(file_as, string);
+		gtk_entry_set_text(file_as, string);
 		g_free(string);
 	}
 }
@@ -572,15 +571,14 @@ static void
 name_entry_changed (GtkWidget *widget, EContactEditor *editor)
 {
 	int style = 0;
-	char *string;
+	const char *string;
 
 	style = file_as_get_style(editor);
 	
 	e_card_name_unref(editor->name);
 
-	string = e_utf8_gtk_entry_get_text (GTK_ENTRY(widget));
+	string = gtk_entry_get_text (GTK_ENTRY(widget));
 	editor->name = e_card_name_from_string(string);
-	g_free (string);
 	
 	file_as_set_style(editor, style);
 
@@ -596,7 +594,7 @@ company_entry_changed (GtkWidget *widget, EContactEditor *editor)
 	
 	g_free(editor->company);
 	
-	editor->company = e_utf8_gtk_entry_get_text(GTK_ENTRY(widget));
+	editor->company = g_strdup (gtk_entry_get_text(GTK_ENTRY(widget)));
 	
 	file_as_set_style(editor, style);
 
@@ -779,7 +777,7 @@ full_name_clicked(GtkWidget *button, EContactEditor *editor)
 		fname_widget = glade_xml_get_widget(editor->gui, "entry-fullname");
 		if (fname_widget && GTK_IS_ENTRY(fname_widget)) {
 			char *full_name = e_card_name_to_string(name);
-			e_utf8_gtk_entry_set_text(GTK_ENTRY(fname_widget), full_name);
+			gtk_entry_set_text(GTK_ENTRY(fname_widget), full_name);
 			g_free(full_name);
 		}
 
@@ -856,7 +854,7 @@ categories_clicked(GtkWidget *button, EContactEditor *editor)
 	GtkWidget *entry = glade_xml_get_widget(editor->gui, "entry-categories");
 	ECategoriesMasterList *ecml;
 	if (entry && GTK_IS_ENTRY(entry))
-		categories = e_utf8_gtk_entry_get_text(GTK_ENTRY(entry));
+		categories = g_strdup (gtk_entry_get_text(GTK_ENTRY(entry)));
 	else if (editor->card)
 		g_object_get (editor->card,
 			       "categories", &categories,
@@ -869,6 +867,7 @@ categories_clicked(GtkWidget *button, EContactEditor *editor)
 							   GTK_RESPONSE_OK,
 							   _("Category editor not available."),
 							   NULL);
+		g_free (categories);
 		gtk_widget_show (uh_oh);
 		return;
 	}
@@ -887,7 +886,7 @@ categories_clicked(GtkWidget *button, EContactEditor *editor)
 			       "categories", &categories,
 			       NULL);
 		if (entry && GTK_IS_ENTRY(entry))
-			e_utf8_gtk_entry_set_text(GTK_ENTRY(entry), categories);
+			gtk_entry_set_text(GTK_ENTRY(entry), categories);
 		else
 			g_object_set (editor->card,
 				       "categories", categories,
@@ -2061,12 +2060,11 @@ find_address_mailing (EContactEditor *editor)
 static void
 set_field(GtkEntry *entry, const char *string)
 {
-	char *oldstring = e_utf8_gtk_entry_get_text(entry);
+	const char *oldstring = gtk_entry_get_text(entry);
 	if (!string)
 		string = "";
 	if (strcmp(string, oldstring))
-		e_utf8_gtk_entry_set_text(entry, string);
-	g_free (oldstring);
+		gtk_entry_set_text(entry, string);
 }
 
 static void
@@ -2242,11 +2240,8 @@ fill_in_field(EContactEditor *editor, char *id, char *value)
 		int position = 0;
 		GtkEditable *editable = GTK_EDITABLE(widget);
 		gtk_editable_delete_text(editable, 0, -1);
-		if (value) {
-			gchar *u = e_utf8_to_gtk_string ((GtkWidget *) editable, value);
-			gtk_editable_insert_text(editable, u, strlen(u), &position);
-			g_free (u);
-		}
+		if (value)
+			gtk_editable_insert_text(editable, value, strlen(value), &position);
 	}
 }
 
@@ -2273,11 +2268,8 @@ fill_in_single_field(EContactEditor *editor, char *name)
 		gtk_editable_delete_text(editable, 0, -1);
 		arbitrary = e_card_simple_get_arbitrary(simple,
 							name);
-		if (arbitrary && arbitrary->value) {
-			gchar *u = e_utf8_to_gtk_string ((GtkWidget *) editable, arbitrary->value);
-			gtk_editable_insert_text(editable, u, strlen(u), &position);
-			g_free (u);
-		}
+		if (arbitrary && arbitrary->value)
+			gtk_editable_insert_text(editable, arbitrary->value, strlen(arbitrary->value), &position);
 	}
 }
 
@@ -2616,18 +2608,19 @@ static void
 extract_field(EContactEditor *editor, ECard *card, char *editable_id, char *key)
 {
 	GtkWidget *widget = glade_xml_get_widget(editor->gui, editable_id);
-	if (widget && GTK_IS_EDITABLE(widget)) {
+
+	if (widget && GTK_IS_EDITABLE (widget)) {
 		GtkEditable *editable = GTK_EDITABLE(widget);
-		char *string = e_utf8_gtk_editable_get_chars(editable, 0, -1);
+		char *string = gtk_editable_get_chars(editable, 0, -1);
 
 		if (string && *string)
 			g_object_set (card,
-				       key, string,
-				       NULL);
+				      key, string,
+				      NULL);
 		else
 			g_object_set (card,
-				       key, NULL,
-				       NULL);
+				      key, NULL,
+				      NULL);
 
 		if (string) g_free(string);
 	}
@@ -2640,7 +2633,7 @@ extract_single_field(EContactEditor *editor, char *name)
 	ECardSimple *simple = editor->simple;
 	if (widget && GTK_IS_EDITABLE(widget)) {
 		GtkEditable *editable = GTK_EDITABLE(widget);
-		char *string = e_utf8_gtk_editable_get_chars(editable, 0, -1);
+		char *string = gtk_editable_get_chars(editable, 0, -1);
 
 		if (string && *string)
 			e_card_simple_set_arbitrary(simple,
@@ -2670,7 +2663,7 @@ extract_info(EContactEditor *editor)
 		widget = glade_xml_get_widget(editor->gui, "entry-file-as");
 		if (widget && GTK_IS_EDITABLE(widget)) {
 			GtkEditable *editable = GTK_EDITABLE(widget);
-			char *string = e_utf8_gtk_editable_get_chars(editable, 0, -1);
+			char *string = gtk_editable_get_chars(editable, 0, -1);
 
 			if (string && *string)
 				g_object_set (card,
diff --git a/addressbook/gui/contact-editor/e-contact-quick-add.c b/addressbook/gui/contact-editor/e-contact-quick-add.c
index e06390b2a5..69af7802b2 100644
--- a/addressbook/gui/contact-editor/e-contact-quick-add.c
+++ b/addressbook/gui/contact-editor/e-contact-quick-add.c
@@ -34,7 +34,6 @@
 #include <gtk/gtkstock.h>
 #include <libgnome/gnome-i18n.h>
 #include <libgnomeui/gnome-app.h>
-#include <gal/widgets/e-unicode.h>
 #include <addressbook/gui/component/addressbook.h>
 #include <addressbook/backend/ebook/e-book.h>
 #include <addressbook/backend/ebook/e-book-util.h>
@@ -253,15 +252,13 @@ clicked_cb (GtkWidget *w, gint button, gpointer closure)
 		if (qa->name_entry) {
 			gchar *tmp;
 			tmp = gtk_editable_get_chars (GTK_EDITABLE (qa->name_entry), 0, -1);
-			name = e_utf8_from_gtk_string (qa->name_entry, tmp);
-			g_free (tmp);
+			name = tmp;
 		}
 
 		if (qa->email_entry) {
 			gchar *tmp;
 			tmp = gtk_editable_get_chars (GTK_EDITABLE (qa->email_entry), 0, -1);
-			email = e_utf8_from_gtk_string (qa->email_entry, tmp);
-			g_free (tmp);
+			email = tmp;
 		}
 
 		quick_add_set_name (qa, name);
@@ -311,19 +308,13 @@ build_quick_add_dialog (QuickAdd *qa)
 			  G_CALLBACK (clicked_cb), qa);
 
 	qa->name_entry = gtk_entry_new ();
-	if (qa->name) {
-		gchar *str = e_utf8_to_gtk_string (qa->name_entry, qa->name);
-		gtk_entry_set_text (GTK_ENTRY (qa->name_entry), str);
-		g_free (str);
-	}
+	if (qa->name)
+		gtk_entry_set_text (GTK_ENTRY (qa->name_entry), qa->name);
 
 
 	qa->email_entry = gtk_entry_new ();
-	if (qa->email) {
-		gchar *str = e_utf8_to_gtk_string (qa->email_entry, qa->email);
-		gtk_entry_set_text (GTK_ENTRY (qa->email_entry), str);
-		g_free (str);
-	}
+	if (qa->email)
+		gtk_entry_set_text (GTK_ENTRY (qa->email_entry), qa->email);
 
 	table = GTK_TABLE (gtk_table_new (2, 2, FALSE));
 
diff --git a/addressbook/gui/contact-editor/e-contact-save-as.c b/addressbook/gui/contact-editor/e-contact-save-as.c
index 73651b9f21..f281b1925f 100644
--- a/addressbook/gui/contact-editor/e-contact-save-as.c
+++ b/addressbook/gui/contact-editor/e-contact-save-as.c
@@ -28,7 +28,6 @@
 #include <gtk/gtksignal.h>
 #include <gtk/gtkmessagedialog.h>
 #include <gal/util/e-util.h>
-#include <gal/widgets/e-unicode.h>
 #include <libgnome/gnome-i18n.h>
 #include <errno.h>
 #include <string.h>
@@ -126,7 +125,6 @@ e_contact_save_as(char *title, ECard *card, GtkWindow *parent_window)
 	GtkFileSelection *filesel;
 	char *file;
 	char *name;
-	char *locale_name;
 	SaveAsInfo *info = g_new(SaveAsInfo, 1);
 
 	filesel = GTK_FILE_SELECTION(gtk_file_selection_new(title));
@@ -134,11 +132,9 @@ e_contact_save_as(char *title, ECard *card, GtkWindow *parent_window)
 	g_object_get (card,
 		      "file_as", &name,
 		      NULL);
-	locale_name = e_utf8_to_locale_string (name);
-	file = make_safe_filename (g_get_home_dir(), locale_name);
+	file = make_safe_filename (g_get_home_dir(), name);
 	gtk_file_selection_set_filename (filesel, file);
 	g_free (file);
-	g_free (locale_name);
 
 	info->filesel = filesel;
 	info->vcard = e_card_get_vcard(card);
@@ -169,15 +165,13 @@ e_contact_list_save_as(char *title, GList *list, GtkWindow *parent_window)
 
 	/* This is a filename. Translators take note. */
 	if (list && list->data && list->next == NULL) {
-		char *name, *locale_name, *file;
+		char *name, *file;
 		g_object_get (list->data,
 			      "file_as", &name,
 			      NULL);
-		locale_name = e_utf8_to_locale_string (name);
-		file = make_safe_filename (g_get_home_dir(), locale_name);
+		file = make_safe_filename (g_get_home_dir(), name);
 		gtk_file_selection_set_filename (filesel, file);
 		g_free (file);
-		g_free (locale_name);
 	} else {
 		char *file;
 		file = make_safe_filename (g_get_home_dir(), _("list"));