diff options
| author | Milan Crha <mcrha@redhat.com> | 2009-10-13 22:24:10 +0800 |
|---|---|---|
| committer | Milan Crha <mcrha@redhat.com> | 2009-10-13 22:24:10 +0800 |
| commit | e06b88c4fda627599d7c1a33ddec0a35a4374e4f (patch) | |
| tree | a862b4d3909923719ab03936ec60dfc00f185ba8 /addressbook/util | |
| parent | dc2953040b0fb9576411d2f145e7e6ff11dd989a (diff) | |
| download | gsoc2013-evolution-e06b88c4fda627599d7c1a33ddec0a35a4374e4f.tar gsoc2013-evolution-e06b88c4fda627599d7c1a33ddec0a35a4374e4f.tar.gz gsoc2013-evolution-e06b88c4fda627599d7c1a33ddec0a35a4374e4f.tar.bz2 gsoc2013-evolution-e06b88c4fda627599d7c1a33ddec0a35a4374e4f.tar.lz gsoc2013-evolution-e06b88c4fda627599d7c1a33ddec0a35a4374e4f.tar.xz gsoc2013-evolution-e06b88c4fda627599d7c1a33ddec0a35a4374e4f.tar.zst gsoc2013-evolution-e06b88c4fda627599d7c1a33ddec0a35a4374e4f.zip | |
Bug #594471 - Shouldn't call e_error_new/run with NULL 'parent'
Diffstat (limited to 'addressbook/util')
| -rw-r--r-- | addressbook/util/Makefile.am | 4 | ||||
| -rw-r--r-- | addressbook/util/addressbook.c | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/addressbook/util/Makefile.am b/addressbook/util/Makefile.am index c5afbaf84f..f777f3c940 100644 --- a/addressbook/util/Makefile.am +++ b/addressbook/util/Makefile.am @@ -10,6 +10,7 @@ libeabutil_la_CPPFLAGS = \ -I$(top_srcdir) \ -I$(top_builddir)/shell \ -I$(top_srcdir)/shell \ + -I$(top_srcdir)/widgets \ $(EVOLUTION_ADDRESSBOOK_CFLAGS) libeabutil_la_SOURCES = \ @@ -23,7 +24,8 @@ libeabutil_la_LDFLAGS = $(NO_UNDEFINED) libeabutil_la_LIBADD = \ $(EVOLUTION_ADDRESSBOOK_LIBS) \ $(top_builddir)/widgets/misc/libemiscwidgets.la \ - $(top_builddir)/e-util/libeutil.la + $(top_builddir)/e-util/libeutil.la \ + $(top_builddir)/shell/libeshell.la dist-hook: cd $(distdir); rm -f $(BUILT_SOURCES) diff --git a/addressbook/util/addressbook.c b/addressbook/util/addressbook.c index 7caa545059..59d87659c7 100644 --- a/addressbook/util/addressbook.c +++ b/addressbook/util/addressbook.c @@ -31,6 +31,7 @@ #include <libedataserverui/e-passwords.h> #include "e-util/e-error.h" +#include "shell/e-shell.h" #include "addressbook.h" #define d(x) @@ -107,7 +108,7 @@ load_source_auth_cb (EBook *book, EBookStatus status, gpointer closure) goto done; } } else if (status == E_BOOK_ERROR_INVALID_SERVER_VERSION) { - e_error_run (NULL, "addressbook:server-version", NULL); + e_error_run (e_shell_get_active_window (NULL), "addressbook:server-version", NULL); status = E_BOOK_ERROR_OK; goto done; } else if (status == E_BOOK_ERROR_UNSUPPORTED_AUTHENTICATION_METHOD) { |