callisto-debian/evolution
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove cruft, rename ICONSDIR to IMAGESDIR. (serverdir, gladedir): Remove

Browse Source 
* gui/component/Makefile.am (INCLUDES): Remove cruft, rename
	ICONSDIR to IMAGESDIR.
	(serverdir, gladedir): Remove defintions.

	* gui/component/addressbook-component.c (IS_CONTACT_TYPE): use
	g_ascii_strcasecmp
	(add_creatable_item): s/ICONSDIR/IMAGESDIR/

	* gui/component/component-factory.c: #include <string.h>

	* gui/component/e-address-widget.c: Likewise.
	(e_address_widget_destroy): s/gtk_idle_remove/g_source_remove/
	(e_address_widget_schedule_query): s/gtk_idle_add/g_idle_add/

svn path=/trunk/; revision=19786
This commit is contained in:
Dan Winship
2003-02-05 23:48:52 +00:00
parent 0873dd0b65
commit 13fb419aa0
4 changed files with 29 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
addressbook/gui/component/Makefile.am
View File

@ -1,35 +1,29 @@
SUBDIRS = select-names
INCLUDES = \
-DG_LOG_DOMAIN=\"evolution-addressbook\" \
-DPREFIX=\"$(prefix)\" \
-DSYSCONFDIR=\"$(sysconfdir)\" \
-DDATADIR=\"$(datadir)\" \
-DLIBDIR=\"$(libdir)\" \
-I$(top_srcdir) \
-I$(top_builddir) \
-I$(top_srcdir)/shell \
-I$(top_builddir)/shell \
-I$(top_srcdir)/widgets/misc \
-I$(top_srcdir)/addressbook/gui/contact-editor \
-I$(top_srcdir)/addressbook/gui/contact-list-editor \
-I$(top_srcdir)/addressbook/gui/minicard \
-I$(top_srcdir)/addressbook/gui/widgets \
-I$(top_srcdir)/addressbook/backend \
-I$(top_builddir)/addressbook/backend \
-DEVOLUTION_DATADIR=\""$(datadir)"\" \
-DEVOLUTION_GLADEDIR=\""$(gladedir)"\" \
-DEVOLUTION_ETSPECDIR=\""$(etspecdir)"\" \
-DEVOLUTION_ICONSDIR=\""$(iconsdir)"\" \
-DEVOLUTION_LOCALEDIR=\""$(localedir)"\" \
-DCAMEL_PROVIDERDIR=\""$(providerdir)"\" \
-DEVOLUTION_IMAGESDIR=\""$(datadir)"/evolution-$(BASE_VERSION)/images\" \
-DEVOLUTION_UIDIR=\""$(evolutionuidir)"\" \
$(LDAP_CFLAGS) \
-DG_DISABLE_DEPRECATED \
-DGTK_DISABLE_DEPRECATED \
-DLIBGNOME_DISABLE_DEPRECATED \
-DLIBGNOMEUI_DISABLE_DEPRECATED \
-DG_LOG_DOMAIN=\"evolution-addressbook\" \
-I$(top_srcdir) \
-I$(top_builddir) \
-I$(top_srcdir)/shell \
-I$(top_builddir)/shell \
-I$(top_srcdir)/widgets/misc \
-I$(top_srcdir)/addressbook/gui/contact-editor \
-I$(top_srcdir)/addressbook/gui/contact-list-editor \
-I$(top_srcdir)/addressbook/gui/minicard \
-I$(top_srcdir)/addressbook/gui/widgets \
-I$(top_srcdir)/addressbook/backend \
-I$(top_builddir)/addressbook/backend \
-DEVOLUTION_DATADIR=\""$(datadir)"\" \
-DEVOLUTION_GLADEDIR=\""$(gladedir)"\" \
-DEVOLUTION_ETSPECDIR=\""$(etspecdir)"\" \
-DEVOLUTION_IMAGESDIR=\""$(imagesdir)"\" \
-DEVOLUTION_LOCALEDIR=\""$(localedir)"\" \
-DEVOLUTION_UIDIR=\""$(evolutionuidir)"\" \
$(LDAP_CFLAGS) \
-DG_DISABLE_DEPRECATED \
-DGTK_DISABLE_DEPRECATED \
-DLIBGNOME_DISABLE_DEPRECATED \
-DLIBGNOMEUI_DISABLE_DEPRECATED \
$(EVOLUTION_ADDRESSBOOK_CFLAGS)
component_LTLIBRARIES = libevolution-addressbook.la
@ -88,14 +82,12 @@ install-data-local:
server_in_files = GNOME_Evolution_Addressbook.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)|" $< > $@
@INTLTOOL_SERVER_RULE@
gladedir = $(datadir)/evolution-$(BASE_VERSION)/glade
glade_DATA = ldap-config.glade
EXTRA_DIST = \

4
addressbook/gui/component/addressbook-component.c
View File

@ -82,7 +82,7 @@ static const EvolutionShellComponentFolderType folder_types[] = {
{ NULL }
};
#define IS_CONTACT_TYPE(x) (g_strcasecmp((x), "contacts") == 0 || g_strcasecmp ((x), "contacts/ldap") == 0 || g_strcasecmp((x), "contacts/public") == 0)
#define IS_CONTACT_TYPE(x) (g_ascii_strcasecmp((x), "contacts") == 0 || g_ascii_strcasecmp ((x), "contacts/ldap") == 0 || g_ascii_strcasecmp((x), "contacts/public") == 0)
/* EvolutionShellComponent methods and signals. */
@ -527,7 +527,7 @@ add_creatable_item (EvolutionShellComponent *shell_component,
icon_path = NULL;
icon = NULL;
} else {
icon_path = g_build_filename (EVOLUTION_ICONSDIR, icon_name, NULL);
icon_path = g_build_filename (EVOLUTION_IMAGESDIR, icon_name, NULL);
icon = gdk_pixbuf_new_from_file (icon_path, NULL);
}

1
addressbook/gui/component/component-factory.c
View File

@ -22,6 +22,7 @@
#include <config.h>
#include <string.h>
#include "addressbook.h"
#include "addressbook-component.h"
#include "addressbook-config.h"

5
addressbook/gui/component/e-address-widget.c
View File

@ -26,6 +26,7 @@
#include <config.h>
#include <ctype.h>
#include <string.h>
#include <gtk/gtklabel.h>
#include <libgnomeui/gnome-popup-menu.h>
#include <bonobo/bonobo-control.h>
@ -79,7 +80,7 @@ e_address_widget_destroy (GtkObject *obj)
e_book_simple_query_cancel (common_book, addr->query_tag);
if (addr->query_idle_tag)
gtk_idle_remove (addr->query_idle_tag);
g_source_remove (addr->query_idle_tag);
}
static gint
@ -314,7 +315,7 @@ e_address_widget_schedule_query (EAddressWidget *addr)
{
if (addr->query_idle_tag || !doing_queries)
return;
addr->query_idle_tag = gtk_idle_add (query_idle_fn, addr);
addr->query_idle_tag = g_idle_add (query_idle_fn, addr);
}
/*