diff options
Diffstat (limited to 'addressbook/gui')
| -rw-r--r-- | addressbook/gui/merging/e-card-merging.c | 4 | ||||
| -rw-r--r-- | addressbook/gui/merging/e-card-merging.h | 6 |
2 files changed, 4 insertions, 6 deletions
diff --git a/addressbook/gui/merging/e-card-merging.c b/addressbook/gui/merging/e-card-merging.c index 14ed261405..e46164e92a 100644 --- a/addressbook/gui/merging/e-card-merging.c +++ b/addressbook/gui/merging/e-card-merging.c @@ -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); diff --git a/addressbook/gui/merging/e-card-merging.h b/addressbook/gui/merging/e-card-merging.h index c4d9483beb..8ea1f9f018 100644 --- a/addressbook/gui/merging/e-card-merging.h +++ b/addressbook/gui/merging/e-card-merging.h @@ -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__ */ |