diff options
author | Brian Cameron <brian.cameron@sun.com> | 2005-12-12 23:42:18 +0000 |
---|---|---|
committer | Brian Cameron <bcameron@src.gnome.org> | 2005-12-12 23:42:18 +0000 |
commit | 6fd945a86046057ff3be393b8c1edc6fd2184288 (patch) | |
tree | a18c17b612d80ec18ab1f9e9ece946c35f46390e /gui | |
parent | 8aa784b4d9d58a7634abc0859d7b89241252df79 (diff) | |
download | gdm-6fd945a86046057ff3be393b8c1edc6fd2184288.tar.gz |
Remove libgnome dependencies except in gdmflexiserver.c and gdmsetup.c.
2005-12-12 Brian Cameron <brian.cameron@sun.com>
* daemon/misc.c, daemon/server.c, daemon/verify-crypt.c,
daemon/verify-pam.c, daemon/verify-shadow.c,
daemon/xdmcp.c, gui/gdmXnestchooser.c, gui/gdmchooser.c,
gui/gdmcomm.c, gui/gdmcommon.[ch], gui/gdmdynamic.c,
gui/gdmlanguages.c, gui/gdmlogin.c, gui/gdmphotosetup.c,
gui/gdmsession.c, gui/gdmuser.c, gui/gdmwm.[ch],
gui/greeter/greeter.c, gui/greeter/greeter_action_language.c,
gui/greeter/greeter_canvas_item.c,
gui/greeter/greeter_item.c,
gui/greeter/greeter_item_capslock.c,
gui/greeter/greeter_item_pam.c,
gui/greeter/greeter_item_timed.c,
gui/greeter/greeter_item_ulist.c,
gui/greeter/greeter_parser.c,
gui/greeter/greeter_session.c,
gui/greeter/greeter_system.c,
gui/misc.c, gui/modules/dwellmouselistener.c,
gui/modules/keymouselistener.c,
utils/gdm-dmx-reconnect-proxy.c,
utils/gdmaskpass.c: Remove libgnome dependencies except
in gdmflexiserver.c and gdmsetup.c. Patch provided by
Jani Monoses on gdm-list@gnome.org.
Diffstat (limited to 'gui')
-rw-r--r-- | gui/gdmXnestchooser.c | 29 | ||||
-rw-r--r-- | gui/gdmchooser.c | 4 | ||||
-rw-r--r-- | gui/gdmcomm.c | 79 | ||||
-rw-r--r-- | gui/gdmcommon.h | 1 | ||||
-rw-r--r-- | gui/gdmdynamic.c | 2 | ||||
-rw-r--r-- | gui/gdmlanguages.c | 5 | ||||
-rw-r--r-- | gui/gdmlogin.c | 10 | ||||
-rw-r--r-- | gui/gdmphotosetup.c | 9 | ||||
-rw-r--r-- | gui/gdmsession.c | 5 | ||||
-rw-r--r-- | gui/gdmuser.c | 4 | ||||
-rw-r--r-- | gui/gdmwm.c | 2 | ||||
-rw-r--r-- | gui/gdmwm.h | 2 | ||||
-rw-r--r-- | gui/greeter/greeter.c | 1 | ||||
-rw-r--r-- | gui/greeter/greeter_action_language.c | 2 | ||||
-rw-r--r-- | gui/greeter/greeter_canvas_item.c | 2 | ||||
-rw-r--r-- | gui/greeter/greeter_item.c | 2 | ||||
-rw-r--r-- | gui/greeter/greeter_item_capslock.c | 2 | ||||
-rw-r--r-- | gui/greeter/greeter_item_pam.c | 2 | ||||
-rw-r--r-- | gui/greeter/greeter_item_timed.c | 2 | ||||
-rw-r--r-- | gui/greeter/greeter_item_ulist.c | 2 | ||||
-rw-r--r-- | gui/greeter/greeter_parser.c | 2 | ||||
-rw-r--r-- | gui/greeter/greeter_session.c | 2 | ||||
-rw-r--r-- | gui/greeter/greeter_system.c | 2 | ||||
-rw-r--r-- | gui/misc.c | 4 | ||||
-rw-r--r-- | gui/modules/dwellmouselistener.c | 3 | ||||
-rw-r--r-- | gui/modules/keymouselistener.c | 2 |
26 files changed, 88 insertions, 94 deletions
diff --git a/gui/gdmXnestchooser.c b/gui/gdmXnestchooser.c index 3ae52b8e..de5c5780 100644 --- a/gui/gdmXnestchooser.c +++ b/gui/gdmXnestchooser.c @@ -20,11 +20,11 @@ */ #include "config.h" -#include <libgnome/libgnome.h> -#include <libgnomeui/libgnomeui.h> +#include <glib/gi18n.h> #include <stdlib.h> #include <unistd.h> #include <stdio.h> +#include <popt.h> #include <sys/types.h> #include <sys/wait.h> #include <fcntl.h> @@ -469,33 +469,22 @@ main (int argc, char *argv[]) char *xnest; char **execvec; struct sigaction term; + int nextopt; bindtextdomain (GETTEXT_PACKAGE, GNOMELOCALEDIR); bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); textdomain (GETTEXT_PACKAGE); if (strcmp (base (argv[0]), "gdmXnest") == 0) { - GnomeProgram *program = gnome_program_init - ("gdmXnest", VERSION, - LIBGNOMEUI_MODULE /* module_info */, - argc, argv, - GNOME_PARAM_POPT_TABLE, xnest_only_options, - NULL); - g_object_get (G_OBJECT (program), - GNOME_PARAM_POPT_CONTEXT, &ctx, - NULL); + gtk_init(&argc, &argv); + ctx = poptGetContext(NULL, argc, (const char**)argv, xnest_only_options, 0); + while ((nextopt = poptGetNextOpt(ctx)) > 0 || nextopt == POPT_ERROR_BADOPT); no_query = TRUE; no_gdm_check = TRUE; } else { - GnomeProgram *program = gnome_program_init - ("gdmXnestchooser", VERSION, - LIBGNOMEUI_MODULE /* module_info */, - argc, argv, - GNOME_PARAM_POPT_TABLE, options, - NULL); - g_object_get (G_OBJECT (program), - GNOME_PARAM_POPT_CONTEXT, &ctx, - NULL); + gtk_init(&argc, &argv); + ctx = poptGetContext(NULL, argc, (const char**)argv, options, 0); + while ((nextopt = poptGetNextOpt(ctx)) > 0 || nextopt == POPT_ERROR_BADOPT); } args = poptGetArgs (ctx); diff --git a/gui/gdmchooser.c b/gui/gdmchooser.c index 8e55318a..997a3c17 100644 --- a/gui/gdmchooser.c +++ b/gui/gdmchooser.c @@ -27,6 +27,7 @@ #include <dirent.h> #include <string.h> #include <unistd.h> +#include <popt.h> #include <ctype.h> #include <gdk/gdkx.h> #include <X11/Xmd.h> @@ -46,8 +47,7 @@ #include <sys/sockio.h> #endif -#include <libgnome/libgnome.h> -#include <libgnomeui/libgnomeui.h> +#include <glib/gi18n.h> #include <glade/glade.h> #include "gdm.h" diff --git a/gui/gdmcomm.c b/gui/gdmcomm.c index dc704506..2a438cd0 100644 --- a/gui/gdmcomm.c +++ b/gui/gdmcomm.c @@ -19,7 +19,7 @@ */ #include "config.h" -#include <libgnome/libgnome.h> +#include <glib/gi18n.h> #include <gtk/gtk.h> #include <gdk/gdkx.h> #include <X11/Xauth.h> @@ -111,44 +111,52 @@ version_ok_p (const char *version, const char *min_version) char * gdmcomm_call_gdm (const char *command, const char * auth_cookie, const char *min_version, int tries) { - struct sockaddr_un addr; - int fd; + static int fd = 0; char *ret; if (tries <= 0) return NULL; - fd = socket (AF_UNIX, SOCK_STREAM, 0); - if (fd < 0) { - return gdmcomm_call_gdm (command, auth_cookie, min_version, tries - 1); - } + if (fd <= 0) { + struct sockaddr_un addr; + strcpy (addr.sun_path, GDM_SUP_SOCKET); + addr.sun_family = AF_UNIX; - strcpy (addr.sun_path, GDM_SUP_SOCKET); - addr.sun_family = AF_UNIX; + fd = socket (AF_UNIX, SOCK_STREAM, 0); + if (fd < 0) { + return gdmcomm_call_gdm (command, auth_cookie, min_version, tries - 1); + } - if (connect (fd, (struct sockaddr *)&addr, sizeof (addr)) < 0) { - VE_IGNORE_EINTR (close (fd)); - return gdmcomm_call_gdm (command, auth_cookie, min_version, tries - 1); - } + if (connect (fd, (struct sockaddr *)&addr, sizeof (addr)) < 0) { + VE_IGNORE_EINTR (close (fd)); + fd = 0; + return gdmcomm_call_gdm (command, auth_cookie, min_version, tries - 1); + } - /* Version check first */ - ret = do_command (fd, GDM_SUP_VERSION, TRUE /* get_response */); - if (ret == NULL) { - VE_IGNORE_EINTR (close (fd)); - return gdmcomm_call_gdm (command, auth_cookie, min_version, tries - 1); - } - if (strncmp (ret, "GDM ", strlen ("GDM ")) != 0) { - g_free (ret); - VE_IGNORE_EINTR (close (fd)); - return NULL; - } - if ( ! version_ok_p (&ret[4], min_version)) { + /* Version check first - only check first time */ + ret = do_command (fd, GDM_SUP_VERSION, TRUE /* get_response */); + if (ret == NULL) { + VE_IGNORE_EINTR (close (fd)); + fd = 0; + return gdmcomm_call_gdm (command, auth_cookie, min_version, tries - 1); + } + if (strncmp (ret, "GDM ", strlen ("GDM ")) != 0) { + g_free (ret); + VE_IGNORE_EINTR (close (fd)); + fd = 0; + return NULL; + } + if ( ! version_ok_p (&ret[4], min_version)) { + g_free (ret); +/* + do_command (fd, GDM_SUP_CLOSE, FALSE); +*/ + VE_IGNORE_EINTR (close (fd)); + fd = 0; + return NULL; + } g_free (ret); - do_command (fd, GDM_SUP_CLOSE, FALSE /* get_response */); - VE_IGNORE_EINTR (close (fd)); - return NULL; } - g_free (ret); /* require authentication */ if (auth_cookie != NULL) { @@ -158,14 +166,18 @@ gdmcomm_call_gdm (const char *command, const char * auth_cookie, const char *min g_free (auth_cmd); if (ret == NULL) { VE_IGNORE_EINTR (close (fd)); + fd = 0; return gdmcomm_call_gdm (command, auth_cookie, min_version, tries - 1); } /* not auth'ed */ if (strcmp (ret, "OK") != 0) { +/* do_command (fd, GDM_SUP_CLOSE, - FALSE /* get_response */); + FALSE); +*/ VE_IGNORE_EINTR (close (fd)); + fd = 0; /* returns the error */ return ret; } @@ -175,12 +187,13 @@ gdmcomm_call_gdm (const char *command, const char * auth_cookie, const char *min ret = do_command (fd, command, TRUE /* get_response */); if (ret == NULL) { VE_IGNORE_EINTR (close (fd)); + fd = 0; return gdmcomm_call_gdm (command, auth_cookie, min_version, tries - 1); } - do_command (fd, GDM_SUP_CLOSE, FALSE /* get_response */); - - VE_IGNORE_EINTR (close (fd)); +/* + do_command (fd, GDM_SUP_CLOSE, FALSE); +*/ return ret; } diff --git a/gui/gdmcommon.h b/gui/gdmcommon.h index 450c109d..de7be093 100644 --- a/gui/gdmcommon.h +++ b/gui/gdmcommon.h @@ -23,6 +23,7 @@ #define GDM_COMMON_H #include "misc.h" +#include <gtk/gtk.h> void gdm_common_show_info_msg (const gchar *msg_file, const gchar *msg_font); diff --git a/gui/gdmdynamic.c b/gui/gdmdynamic.c index f9f983b7..e2ae7b1a 100644 --- a/gui/gdmdynamic.c +++ b/gui/gdmdynamic.c @@ -19,8 +19,6 @@ */ #include "config.h" -#include <libgnome/libgnome.h> -#include <libgnomeui/libgnomeui.h> #include <gdk/gdkx.h> #include <X11/Xauth.h> diff --git a/gui/gdmlanguages.c b/gui/gdmlanguages.c index 76896108..a2e4657c 100644 --- a/gui/gdmlanguages.c +++ b/gui/gdmlanguages.c @@ -19,10 +19,11 @@ */ #include "config.h" +#include <gtk/gtk.h> +#include <glib/gi18n.h> #include <locale.h> -#include <libgnome/libgnome.h> -#include <libgnomeui/libgnomeui.h> #include <string.h> +#include <stdio.h> #include "gdmlanguages.h" #include "gdmconfig.h" diff --git a/gui/gdmlogin.c b/gui/gdmlogin.c index 3cb6271e..cfe8ecd0 100644 --- a/gui/gdmlogin.c +++ b/gui/gdmlogin.c @@ -20,8 +20,6 @@ #include <config.h> -#include <libgnome/libgnome.h> -#include <libgnomeui/libgnomeui.h> #include <math.h> #include <stdio.h> #include <stdlib.h> @@ -36,7 +34,9 @@ #include <signal.h> #include <dirent.h> #include <locale.h> +#include <glib/gi18n.h> #include <gdk/gdkx.h> +#include <gdk/gdkkeysyms.h> #include <X11/X.h> #include <X11/Xlib.h> #include <X11/XKBlib.h> @@ -2325,12 +2325,10 @@ create_handle (void) hbox = gtk_hbox_new (FALSE, 0); gtk_container_add (GTK_CONTAINER (title_box), hbox); - w = gtk_label_new (_("GNOME Desktop Manager")); - gtk_misc_set_padding (GTK_MISC (w), - GNOME_PAD_SMALL, GNOME_PAD_SMALL); + gtk_misc_set_padding (GTK_MISC (w), 4, 4); gtk_box_pack_start (GTK_BOX (hbox), w, - TRUE, TRUE, GNOME_PAD_SMALL); + TRUE, TRUE, 4); gtk_widget_show_all (title_box); diff --git a/gui/gdmphotosetup.c b/gui/gdmphotosetup.c index b138ec49..dcc47844 100644 --- a/gui/gdmphotosetup.c +++ b/gui/gdmphotosetup.c @@ -26,13 +26,13 @@ #include <signal.h> #include <fcntl.h> #include <errno.h> +#include <unistd.h> #include <glib.h> #include <glib/gi18n.h> #include <glib/gstdio.h> #include <gtk/gtk.h> #include <glade/glade.h> -#include <libgnomeui/libgnomeui.h> #include "gdm.h" #include "gdmcommon.h" @@ -303,12 +303,7 @@ main (int argc, char *argv[]) bindtextdomain (GETTEXT_PACKAGE, GNOMELOCALEDIR); bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); textdomain (GETTEXT_PACKAGE); - - gnome_program_init ("gdmphotosetup", VERSION, - LIBGNOMEUI_MODULE /* module_info */, - argc, argv, - NULL); - + gtk_init(&argc, &argv); photofile = g_build_filename (g_get_home_dir (), ".face", NULL); face_browser = gdm_config_get_bool (GDM_KEY_BROWSER); diff --git a/gui/gdmsession.c b/gui/gdmsession.c index acc5da6f..2231dd91 100644 --- a/gui/gdmsession.c +++ b/gui/gdmsession.c @@ -24,9 +24,8 @@ #include <unistd.h> #include <dirent.h> #include <syslog.h> - -#include <libgnome/libgnome.h> -#include <libgnomeui/libgnomeui.h> +#include <gtk/gtk.h> +#include <glib/gi18n.h> #include "vicious.h" diff --git a/gui/gdmuser.c b/gui/gdmuser.c index f3d59eee..ca362d8e 100644 --- a/gui/gdmuser.c +++ b/gui/gdmuser.c @@ -23,9 +23,9 @@ #include "config.h" #include <locale.h> -#include <libgnome/libgnome.h> -#include <libgnomeui/libgnomeui.h> +#include <glib/gi18n.h> #include <string.h> +#include <unistd.h> #include <pwd.h> diff --git a/gui/gdmwm.c b/gui/gdmwm.c index 631c824d..4dfa98f3 100644 --- a/gui/gdmwm.c +++ b/gui/gdmwm.c @@ -33,8 +33,6 @@ #include <syslog.h> #include <gdk/gdkx.h> -#include <libgnome/libgnome.h> -#include <libgnomeui/libgnomeui.h> #include "gdmwm.h" #include "gdm.h" diff --git a/gui/gdmwm.h b/gui/gdmwm.h index dbe38b9f..ecc522b6 100644 --- a/gui/gdmwm.h +++ b/gui/gdmwm.h @@ -21,7 +21,7 @@ #ifndef GDM_WM_H #define GDM_WM_H -#include <libgnome/libgnome.h> +#include <gtk/gtk.h> #include <gdk/gdkx.h> #include <X11/X.h> #include <X11/Xlib.h> diff --git a/gui/greeter/greeter.c b/gui/greeter/greeter.c index b257b6a3..c3127101 100644 --- a/gui/greeter/greeter.c +++ b/gui/greeter/greeter.c @@ -32,6 +32,7 @@ #define PW_ENTRY_SIZE GDM_MAX_PASS #endif +#include <glib/gi18n.h> #include <gtk/gtk.h> #include <gdk/gdkkeysyms.h> #include <libgnomecanvas/libgnomecanvas.h> diff --git a/gui/greeter/greeter_action_language.c b/gui/greeter/greeter_action_language.c index 226409b1..1dfb6155 100644 --- a/gui/greeter/greeter_action_language.c +++ b/gui/greeter/greeter_action_language.c @@ -18,7 +18,7 @@ #include "config.h" -#include <libgnome/libgnome.h> +#include <glib/gi18n.h> #include <gtk/gtk.h> #include <string.h> diff --git a/gui/greeter/greeter_canvas_item.c b/gui/greeter/greeter_canvas_item.c index 7f1d3539..558930d6 100644 --- a/gui/greeter/greeter_canvas_item.c +++ b/gui/greeter/greeter_canvas_item.c @@ -21,7 +21,7 @@ #include <math.h> #include <string.h> #include <gtk/gtk.h> -#include <libgnome/libgnome.h> +#include <glib/gi18n.h> #include <librsvg/rsvg.h> #include "gdm.h" diff --git a/gui/greeter/greeter_item.c b/gui/greeter/greeter_item.c index 80d47c87..6c32cd8c 100644 --- a/gui/greeter/greeter_item.c +++ b/gui/greeter/greeter_item.c @@ -18,7 +18,7 @@ #include "config.h" -#include <libgnome/libgnome.h> +#include <glib/gi18n.h> #include <gtk/gtk.h> #include <string.h> #include <stdlib.h> diff --git a/gui/greeter/greeter_item_capslock.c b/gui/greeter/greeter_item_capslock.c index 7531bae6..385c0374 100644 --- a/gui/greeter/greeter_item_capslock.c +++ b/gui/greeter/greeter_item_capslock.c @@ -19,7 +19,7 @@ #include "config.h" #include <gtk/gtk.h> -#include <libgnome/libgnome.h> +#include <glib/gi18n.h> #include <gdk/gdkkeysyms.h> #include <string.h> #include <gdk/gdkx.h> diff --git a/gui/greeter/greeter_item_pam.c b/gui/greeter/greeter_item_pam.c index 7669a335..812e5abd 100644 --- a/gui/greeter/greeter_item_pam.c +++ b/gui/greeter/greeter_item_pam.c @@ -20,7 +20,7 @@ #include <string.h> #include <gtk/gtk.h> -#include <libgnome/libgnome.h> +#include <glib/gi18n.h> #include <gdk/gdkkeysyms.h> #include "viciousui.h" diff --git a/gui/greeter/greeter_item_timed.c b/gui/greeter/greeter_item_timed.c index 4bbdbee2..024f5ff5 100644 --- a/gui/greeter/greeter_item_timed.c +++ b/gui/greeter/greeter_item_timed.c @@ -19,7 +19,7 @@ #include "config.h" #include <gtk/gtk.h> -#include <libgnome/libgnome.h> +#include <glib/gi18n.h> #include "gdm.h" #include "gdmconfig.h" diff --git a/gui/greeter/greeter_item_ulist.c b/gui/greeter/greeter_item_ulist.c index 9e8f9575..d859e454 100644 --- a/gui/greeter/greeter_item_ulist.c +++ b/gui/greeter/greeter_item_ulist.c @@ -31,7 +31,7 @@ #include <math.h> #include <string.h> #include <gtk/gtk.h> -#include <libgnome/libgnome.h> +#include <glib/gi18n.h> #include <librsvg/rsvg.h> #include "gdm.h" diff --git a/gui/greeter/greeter_parser.c b/gui/greeter/greeter_parser.c index 48a116c6..5b5fea4c 100644 --- a/gui/greeter/greeter_parser.c +++ b/gui/greeter/greeter_parser.c @@ -26,7 +26,7 @@ #include <math.h> #include <gdk/gdkx.h> #include <locale.h> -#include <libgnome/gnome-i18n.h> +#include <glib/gi18n.h> #include "gdmwm.h" #include "gdmcommon.h" diff --git a/gui/greeter/greeter_session.c b/gui/greeter/greeter_session.c index 7dc536ee..d2543fda 100644 --- a/gui/greeter/greeter_session.c +++ b/gui/greeter/greeter_session.c @@ -26,7 +26,7 @@ #include <string.h> #include <gtk/gtk.h> -#include <libgnome/libgnome.h> +#include <glib/gi18n.h> #include "gdm.h" #include "gdmwm.h" diff --git a/gui/greeter/greeter_system.c b/gui/greeter/greeter_system.c index e48b2bb7..82a3fb21 100644 --- a/gui/greeter/greeter_system.c +++ b/gui/greeter/greeter_system.c @@ -19,7 +19,7 @@ #include "config.h" #include <gtk/gtk.h> -#include <libgnome/libgnome.h> +#include <glib/gi18n.h> #include "greeter.h" #include "greeter_configuration.h" #include "greeter_system.h" @@ -17,9 +17,9 @@ */ #include <config.h> -#include <libgnome/libgnome.h> -#include <libgnomeui/libgnomeui.h> +#include <gtk/gtk.h> #include <glade/glade.h> +#include <string.h> #include "misc.h" #include "gdmconfig.h" diff --git a/gui/modules/dwellmouselistener.c b/gui/modules/dwellmouselistener.c index 265bf6a3..58435f9b 100644 --- a/gui/modules/dwellmouselistener.c +++ b/gui/modules/dwellmouselistener.c @@ -20,6 +20,7 @@ #include <ctype.h> #include <string.h> +#include <stdlib.h> #include <syslog.h> #include <math.h> @@ -28,7 +29,7 @@ #include <gdk/gdk.h> #include <gdk/gdkx.h> #include <gtk/gtk.h> -#include <gnome.h> +#include <glib/gi18n.h> #include <X11/Xlib.h> #include <config.h> diff --git a/gui/modules/keymouselistener.c b/gui/modules/keymouselistener.c index e6867389..9e01e557 100644 --- a/gui/modules/keymouselistener.c +++ b/gui/modules/keymouselistener.c @@ -33,7 +33,7 @@ #include <gdk/gdk.h> #include <gdk/gdkx.h> #include <gtk/gtk.h> -#include <gnome.h> +#include <glib/gi18n.h> #include <config.h> |