From 0f56ef44c9c24c5bd4b27a537d8b3e686395b2b1 Mon Sep 17 00:00:00 2001 From: Chris Toshok Date: Wed, 18 Dec 2002 22:22:15 +0000 Subject: g_string_sprintfa -> g_string_append_printf. (create_alphabet): same. 2002-12-18 Chris Toshok * gui/widgets/e-addressbook-view.c (jump_to_letters): g_string_sprintfa -> g_string_append_printf. (create_alphabet): same. (create_minicard_view): remove gtk_widget_{push,pop}_visual. * gui/widgets/Makefile.am (INCLUDES): add -D*_DISABLE_DEPRECATED. svn path=/trunk/; revision=19161 --- addressbook/gui/widgets/Makefile.am | 4 ++++ addressbook/gui/widgets/e-addressbook-view.c | 10 +++------- 2 files changed, 7 insertions(+), 7 deletions(-) (limited to 'addressbook/gui/widgets') diff --git a/addressbook/gui/widgets/Makefile.am b/addressbook/gui/widgets/Makefile.am index eed44c04a2..a2fd2b24f2 100644 --- a/addressbook/gui/widgets/Makefile.am +++ b/addressbook/gui/widgets/Makefile.am @@ -12,6 +12,10 @@ INCLUDES = \ -I$(top_srcdir)/addressbook/gui/component \ -I$(top_srcdir)/widgets/misc \ -I$(top_builddir)/shell \ + -DG_DISABLE_DEPRECATED \ + -DGTK_DISABLE_DEPRECATED \ + -DLIBGNOME_DISABLE_DEPRECATED \ + -DLIBGNOMEUI_DISABLE_DEPRECATED \ $(EVOLUTION_ADDRESSBOOK_CFLAGS) noinst_LIBRARIES = \ diff --git a/addressbook/gui/widgets/e-addressbook-view.c b/addressbook/gui/widgets/e-addressbook-view.c index 5e731d3483..375f05dae9 100644 --- a/addressbook/gui/widgets/e-addressbook-view.c +++ b/addressbook/gui/widgets/e-addressbook-view.c @@ -30,7 +30,6 @@ #include #include #include -#include #include #include #include @@ -958,7 +957,7 @@ jump_to_letters (EAddressbookView *view, gchar* l) for (p = letter_v + 1; *p != NULL; p++) { for (s = *p; *s != '\0'; s = g_utf8_next_char (s)) { buf [g_unichar_to_utf8 (g_utf8_get_char(s), buf)] = '\0'; - g_string_sprintfa (gstr, "(beginswith \"file_as\" \"%s\")", buf); + g_string_append_printf (gstr, "(beginswith \"file_as\" \"%s\")", buf); } } g_string_append (gstr, "))"); @@ -972,7 +971,7 @@ jump_to_letters (EAddressbookView *view, gchar* l) for (s = l; *s != '\0'; s = g_utf8_next_char (s)) { buf [g_unichar_to_utf8 (g_utf8_get_char(s), buf)] = '\0'; - g_string_sprintfa (gstr, "(beginswith \"file_as\" \"%s\")", buf); + g_string_append_printf (gstr, "(beginswith \"file_as\" \"%s\")", buf); } g_string_append (gstr, ")"); @@ -1058,9 +1057,8 @@ create_alphabet (EAddressbookView *view) LetterClosure *closure; char *label; - label = e_utf8_to_locale_string (*pl); + label = *pl; button = gtk_toggle_button_new_with_label (label); - g_free (label); gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0); closure = g_new (LetterClosure, 1); @@ -1102,7 +1100,6 @@ create_minicard_view (EAddressbookView *view) GtkWidget *minicard_hbox; EAddressbookReflowAdapter *adapter; - gtk_widget_push_visual (gdk_rgb_get_visual ()); gtk_widget_push_colormap (gdk_rgb_get_cmap ()); minicard_hbox = gtk_hbox_new(FALSE, 0); @@ -1149,7 +1146,6 @@ create_minicard_view (EAddressbookView *view) gtk_widget_show_all( GTK_WIDGET(minicard_hbox) ); - gtk_widget_pop_visual (); gtk_widget_pop_colormap (); e_reflow_model_changed (E_REFLOW_MODEL (adapter)); -- cgit v1.2.3