Commit 852427bf authored by Brian Cameron's avatar Brian Cameron Committed by Brian Cameron

No longer require libgnome or libgnomeui at all in GDM2. Patch provided by

2006-01-04  Brian Cameron  <brian.cameron@sun.com>

        * configure.ac, gui/gdmsetup.c, vicious-extensions/Makefile.am: No
          longer require libgnome or libgnomeui at all in GDM2.  Patch
          provided by Jani Monoses.
parent 4f46297e
2006-01-04 Brian Cameron <brian.cameron@sun.com>
* configure.ac, gui/gdmsetup.c, vicious-extensions/Makefile.am: No
longer require libgnome or libgnomeui at all in GDM2. Patch
provided by Jani Monoses.
2006-01-04 Brian Cameron <brian.cameron@sun.com>
* configure.ac, docs/C/gdm.xml, config/gdm.conf.in: Fix
......
......@@ -14,8 +14,6 @@ GLIB_REQUIRED=2.8.0
GTK_REQUIRED=2.6.0
PANGO_REQUIRED=1.3.0
LIBGLADE_REQUIRED=1.99.2
LIBGNOME_REQUIRED=1.96.0
LIBGNOMEUI_REQUIRED=1.96.0
LIBGNOMECANVAS_REQUIRED=1.109.0
LIBRSVG_REQUIRED=1.1.1
LIBXML_REQUIRED=2.4.12
......@@ -140,7 +138,7 @@ AC_CHECK_FUNCS(_NSGetEnviron)
GNOME_COMPILE_WARNINGS
CFLAGS="$CFLAGS $WARN_CFLAGS"
PKG_CHECK_MODULES(VICIOUS, gtk+-2.0 >= $GTK_REQUIRED libglade-2.0 >= $LIBGLADE_REQUIRED libgnome-2.0 >= $LIBGNOME_REQUIRED)
PKG_CHECK_MODULES(VICIOUS, gtk+-2.0 >= $GTK_REQUIRED libglade-2.0 >= $LIBGLADE_REQUIRED)
AC_SUBST(VICIOUS_CFLAGS)
AC_SUBST(VICIOUS_LIBS)
......@@ -192,14 +190,6 @@ PKG_CHECK_MODULES(GDKPIXBUF, gdk-pixbuf-2.0 >= $GTK_REQUIRED)
AC_SUBST(GDKPIXBUF_CFLAGS)
AC_SUBST(GDKPIXBUF_LIBS)
PKG_CHECK_MODULES(LIBGNOME, libgnome-2.0 >= $LIBGNOME_REQUIRED)
AC_SUBST(LIBGNOME_CFLAGS)
AC_SUBST(LIBGNOME_LIBS)
PKG_CHECK_MODULES(LIBGNOMEUI, libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED)
AC_SUBST(LIBGNOMEUI_CFLAGS)
AC_SUBST(LIBGNOMEUI_LIBS)
dnl Allow users to run gdmsetup using the console helper PAM stuff.
if test "x$enable_console_helper" = "xyes"; then
AM_CONDITIONAL(CONSOLE_HELPER, true)
......@@ -245,8 +235,7 @@ AC_CHECK_FUNC(inet_aton,,[
AC_CHECK_LIB(resolv,inet_aton, [
EXTRA_CHOOSER_LIBS="$EXTRA_CHOOSER_LIBS -lresolv"])])
VICIOUS_GNOME_LIBS="libviciousui.a libviciousui-gnome.a \
libviciousui-minimal.a libvicious-gnome.a"
VICIOUS_GNOME_LIBS="libviciousui.a libviciousui-minimal.a "
AC_SUBST(VICIOUS_GNOME_LIBS)
dnl *****************************
......
This diff is collapsed.
......@@ -37,12 +37,6 @@
#include <gdk/gdkx.h>
#include <glade/glade.h>
#include <glib/gi18n.h>
/*
* libgnomeui is needed for gnome_help_display_uri (), once we find a way
* to replace this function, we can completely get rid of libgnomeui from
* GDM
*/
#include <libgnomeui-2.0/gnome.h>
#include "vicious.h"
#include "viciousui.h"
......@@ -559,7 +553,7 @@ xservers_get_displays (GtkListStore *store)
VeConfig *cfg = ve_config_get (config_file);
GList *list;
GSList *li;
gchar *server, *options, *cpy;
gchar *server, *options;
/* Fill list with all the active displays */
if (custom_cfg) {
......@@ -4958,7 +4952,8 @@ xserver_button_clicked (void)
do {
response = gtk_dialog_run (GTK_DIALOG (dialog));
if (response == GTK_RESPONSE_HELP) {
gnome_help_display_uri ("ghelp:gdm", NULL);
g_spawn_command_line_sync ("gnome-open ghelp:gdm", NULL, NULL,
NULL, NULL);
}
} while (response != GTK_RESPONSE_CLOSE);
......@@ -5293,7 +5288,6 @@ dialog_response (GtkWidget *dlg, int response, gpointer data)
timeout_remove_all ();
gtk_main_quit ();
} else if (response == GTK_RESPONSE_HELP) {
GError *error = NULL;
GtkWidget *setup_dialog = glade_helper_get
(xml, "setup_dialog", GTK_TYPE_WINDOW);
static GtkWidget *dlg = NULL;
......@@ -5304,11 +5298,10 @@ dialog_response (GtkWidget *dlg, int response, gpointer data)
}
if ( ! RUNNING_UNDER_GDM) {
gnome_help_display_uri ("ghelp:gdm", &error);
/* FIXME: handle errors nicer */
if (error == NULL)
gint exit_status;
if (g_spawn_command_line_sync ("gnome-open ghelp:gdm", NULL, NULL,
&exit_status, NULL) && exit_status == 0)
return;
g_error_free (error);
}
/* fallback help dialogue */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment