include libgnomeui/gnome-authentication-manager.h (main): to call

* shell/main.c: include libgnomeui/gnome-authentication-manager.h
(main): to call gnome_authentication_manager_init. Should fix
Bug #308510

* configure.ac: that requires libgnomeui 2.6.0.

diff --git a/ChangeLog b/ChangeLog
index 019aaa1b87caf61d47ea231d477c879737609b6e..9a65860b13b8e403c2f0ff7299d8320e5efb9521 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2005-07-04  Martin Kretzschmar  <martink@gnome.org>
+
+       * shell/main.c: include libgnomeui/gnome-authentication-manager.h
+       (main): to call gnome_authentication_manager_init. Should fix
+       Bug #308510
+
+       * configure.ac: that requires libgnomeui 2.6.0.
+
 2005-07-04  Matthew S. Wilson  <msw@rpath.com>
 
        * tiff/tiff-document.c (tiff_document_ps_export_begin) 

diff --git a/configure.ac b/configure.ac
index ad43ee6034ae1a4930af837d2daecbdadd7065f3..8b75a8083e0175c39958bf0b0261cd7abc91997e 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -39,7 +39,7 @@ PKG_CHECK_MODULES(LIBEVPRIVATE, gtk+-2.0 >= 2.4.0)
 PKG_CHECK_MODULES(TOOLBAR_EDITOR, gtk+-2.0 >= 2.4.0 libgnomeui-2.0 >= 2.4.0)
 PKG_CHECK_MODULES(RECENT_FILES, gtk+-2.0 >= 2.4.0 libgnomeui-2.0 >= 2.4.0)
 PKG_CHECK_MODULES(ZOOM_CONTROL, gtk+-2.0 >= 2.4.0)
-PKG_CHECK_MODULES(SHELL, gtk+-2.0 >= 2.6.0 libgnomeui-2.0 gnome-vfs-2.0 libgnomeprint-2.2 >= 2.5.1 libgnomeprintui-2.2 libglade-2.0 gconf-2.0 poppler-glib >= $POPPLER_REQUIRED)
+PKG_CHECK_MODULES(SHELL, gtk+-2.0 >= 2.6.0 libgnomeui-2.0 >= 2.6.0 gnome-vfs-2.0 libgnomeprint-2.2 >= 2.5.1 libgnomeprintui-2.2 libglade-2.0 gconf-2.0 poppler-glib >= $POPPLER_REQUIRED)
 PKG_CHECK_MODULES(THUMBNAILER, gtk+-2.0 >= 2.6.0 gnome-vfs-2.0 poppler-glib >= $POPPLER_REQUIRED)
 PKG_CHECK_MODULES(DVI, gtk+-2.0 >= 2.6.0)
 PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.6.0)

diff --git a/shell/main.c b/shell/main.c
index 0b50cbd0df0381e259b3a63b4fa573024fc1339c..1b80b4a78b831da7a40fa88e2ce84e258679ae9e 100644 (file)
--- a/shell/main.c
+++ b/shell/main.c
@@ -28,6 +28,7 @@
 #include <libgnome/gnome-program.h>
 #include <libgnomeui/gnome-ui-init.h>
 #include <libgnomeui/gnome-app-helper.h>
+#include <libgnomeui/gnome-authentication-manager.h>
 #include <libgnomevfs/gnome-vfs-utils.h>
 
 #ifdef ENABLE_DBUS
@@ -150,6 +151,8 @@ main (int argc, char *argv[])
        }
 #endif
 
+       gnome_authentication_manager_init ();
+
        ev_job_queue_init ();
        g_set_application_name (_("Evince Document Viewer"));