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

only build the backend and gui dirs for now. printing and conduits are

Browse Source 
2002-11-06  Chris Toshok  <toshok@ximian.com>

	* Makefile.am (SUBDIRS): only build the backend and gui dirs for
	now.  printing and conduits are no-man's land at present.

	* addressbook/gui/merging/e-card-merging.[ch]: Port to
	GObject/gnome2.

svn path=/trunk/; revision=18595
This commit is contained in:
Chris Toshok
2002-11-06 08:41:35 +00:00
committed by Chris Toshok
parent c6582c9265
commit 080eaec6cb
4 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
addressbook/ChangeLog
View File

@ -1,3 +1,11 @@
2002-11-06 Chris Toshok <toshok@ximian.com>
* Makefile.am (SUBDIRS): only build the backend and gui dirs for
now. printing and conduits are no-man's land at present.
* addressbook/gui/merging/e-card-merging.[ch]: Port to
GObject/gnome2.
2002-11-05 Chris Toshok <toshok@ximian.com>
* gui/component/.cvsignore: ignore the new .server file.

7
addressbook/Makefile.am
View File

@ -1,7 +1,10 @@
if ENABLE_PILOT_CONDUITS
CONDUIT_SUBDIR=conduit
# PENDING_PORT_WORK
# CONDUIT_SUBDIR=conduit
endif
SUBDIRS = \
backend printing gui $(CONDUIT_SUBDIR)
backend gui $(CONDUIT_SUBDIR)
# PENDING_PORT_WORK
# SUBDIRS = ... printing

4
addressbook/gui/merging/e-card-merging.c
View File

@ -81,9 +81,9 @@ match_query_callback (ECard *card, ECard *match, ECardMatchType type, gpointer c
GtkWidget *widget;
if (lookup->op == E_CARD_MERGING_ADD)
ui = glade_xml_new (EVOLUTION_GLADEDIR "/e-card-duplicate-detected.glade", NULL);
ui = glade_xml_new (EVOLUTION_GLADEDIR "/e-card-duplicate-detected.glade", NULL, NULL);
else if (lookup->op == E_CARD_MERGING_COMMIT)
ui = glade_xml_new (EVOLUTION_GLADEDIR "/e-card-merging-book-commit-duplicate-detected.glade", NULL);
ui = glade_xml_new (EVOLUTION_GLADEDIR "/e-card-merging-book-commit-duplicate-detected.glade", NULL, NULL);
else {
doit (lookup);
g_free (lookup);

6
addressbook/gui/merging/e-card-merging.h
View File

@ -11,11 +11,9 @@
#ifndef __E_CARD_MERGING_H__
#define __E_CARD_MERGING_H__
#include <libgnome/gnome-defs.h>
#include <addressbook/backend/ebook/e-book.h>
BEGIN_GNOME_DECLS
G_BEGIN_DECLS
gboolean e_card_merging_book_add_card (EBook *book,
ECard *card,
@ -26,6 +24,6 @@ gboolean e_card_merging_book_commit_card (EBook *book,
EBookCallback cb,
gpointer closure);
END_GNOME_DECLS
G_END_DECLS
#endif /* ! __E_CARD_MERGING_H__ */