diff options
| author | Dan Winship <danw@src.gnome.org> | 2003-02-06 07:48:38 +0800 |
|---|---|---|
| committer | Dan Winship <danw@src.gnome.org> | 2003-02-06 07:48:38 +0800 |
| commit | 0873dd0b655a282a3c05914ead1dcaf0d5e772ba (patch) | |
| tree | 05b6b5a8c27e1b07bf5f14570218851f548e2609 | |
| parent | 675a9d147ab100372a7026688cbafc4665498c8b (diff) | |
| download | gsoc2013-evolution-0873dd0b655a282a3c05914ead1dcaf0d5e772ba.tar gsoc2013-evolution-0873dd0b655a282a3c05914ead1dcaf0d5e772ba.tar.gz gsoc2013-evolution-0873dd0b655a282a3c05914ead1dcaf0d5e772ba.tar.bz2 gsoc2013-evolution-0873dd0b655a282a3c05914ead1dcaf0d5e772ba.tar.lz gsoc2013-evolution-0873dd0b655a282a3c05914ead1dcaf0d5e772ba.tar.xz gsoc2013-evolution-0873dd0b655a282a3c05914ead1dcaf0d5e772ba.tar.zst gsoc2013-evolution-0873dd0b655a282a3c05914ead1dcaf0d5e772ba.zip | |
Remove cruft. (serverdir, gladedir, etspecdir): Remove definitions
* gui/component/select-names/Makefile.am (INCLUDES): Remove cruft.
(serverdir, gladedir, etspecdir): Remove definitions
* gui/component/select-names/e-select-names.c: #include <string.h>
* gui/component/select-names/e-select-names-popup.c
(init_html_mail): Remove deprecated
gtk_check_menu_item_set_show_toggle call.
* gui/component/select-names/e-select-names-manager.c
(e_select_names_manager_entry_free):
s/gtk_timeout_remove/g_source_remove/
svn path=/trunk/; revision=19785
4 files changed, 2 insertions, 10 deletions
diff --git a/addressbook/gui/component/select-names/Makefile.am b/addressbook/gui/component/select-names/Makefile.am index f678ce5e42..7c03ec9992 100644 --- a/addressbook/gui/component/select-names/Makefile.am +++ b/addressbook/gui/component/select-names/Makefile.am @@ -17,7 +17,6 @@ $(IDL_GENERATED): $(idl_DATA) server_in_files = GNOME_Evolution_Addressbook_SelectNames.server.in.in -serverdir = $(libdir)/bonobo/servers server_DATA = $(server_in_files:.server.in.in=.server) $(server_in_files:.server.in.in=.server.in): $(server_in_files) sed -e "s|\@COMPONENTDIR\@|$(componentdir)|" $< > $@ @@ -39,9 +38,6 @@ INCLUDES = \ -I$(top_builddir)/addressbook/backend \ -DEVOLUTION_GLADEDIR=\""$(gladedir)"\" \ -DEVOLUTION_ETSPECDIR=\""$(etspecdir)"\" \ - -DEVOLUTION_ICONSDIR=\""$(iconsdir)"\" \ - -DEVOLUTION_LOCALEDIR=\""$(localedir)"\" \ - -DCAMEL_PROVIDERDIR=\""$(providerdir)"\" \ -DG_DISABLE_DEPRECATED \ -DGTK_DISABLE_DEPRECATED \ -DLIBGNOME_DISABLE_DEPRECATED \ @@ -92,10 +88,7 @@ e-select-names-marshal.c: e-select-names-marshal.h MARSHAL_GENERATED = e-select-names-marshal.c e-select-names-marshal.h -gladedir = $(datadir)/evolution-$(BASE_VERSION)/glade glade_DATA = select-names.glade - -etspecdir = $(datadir)/evolution-$(BASE_VERSION)/etspec etspec_DATA = e-select-names.etspec EXTRA_DIST = \ diff --git a/addressbook/gui/component/select-names/e-select-names-manager.c b/addressbook/gui/component/select-names/e-select-names-manager.c index 7d9ce8ab81..0ea8bc2ee6 100644 --- a/addressbook/gui/component/select-names/e-select-names-manager.c +++ b/addressbook/gui/component/select-names/e-select-names-manager.c @@ -321,7 +321,7 @@ e_select_names_manager_entry_free (ESelectNamesManagerEntry *entry) g_object_unref (entry->entry); if (entry->cleaning_tag) - gtk_timeout_remove (entry->cleaning_tag); + g_source_remove (entry->cleaning_tag); g_free (entry); } diff --git a/addressbook/gui/component/select-names/e-select-names-popup.c b/addressbook/gui/component/select-names/e-select-names-popup.c index 9e61b77128..332d802845 100644 --- a/addressbook/gui/component/select-names/e-select-names-popup.c +++ b/addressbook/gui/component/select-names/e-select-names-popup.c @@ -207,8 +207,6 @@ init_html_mail (GnomeUIInfo *uiinfo, PopupInfo *info) { gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (uiinfo->widget), e_destination_get_html_mail_pref (info->dest)); - gtk_check_menu_item_set_show_toggle (GTK_CHECK_MENU_ITEM (uiinfo->widget), TRUE); - } static void diff --git a/addressbook/gui/component/select-names/e-select-names.c b/addressbook/gui/component/select-names/e-select-names.c index f08afe10db..b8d3ec77cc 100644 --- a/addressbook/gui/component/select-names/e-select-names.c +++ b/addressbook/gui/component/select-names/e-select-names.c @@ -19,6 +19,7 @@ */ #include <config.h> +#include <string.h> #include <glib.h> #include <gtk/gtk.h> #include <libgnome/gnome-i18n.h> |