gdm r6796 - in trunk: . common daemon gui/simple-greeter

[halfline svn gnome org]

Author: halfline
Date: Fri Mar 27 14:58:26 2009
New Revision: 6796
URL: http://svn.gnome.org/viewvc/gdm?rev=6796&view=rev

Log:
2009-03-27  Ray Strode  <rstrode redhat com>

	Fix assorted compiler warnings.

	* gui/simple-greeter/gdm-user-chooser-widget.c
	(add_user), (get_stock_person_pixbuf),
	(get_logged_in_pixbuf): Add some widget casts.

	* gui/simple-greeter/gdm-languages.c
	(make_codeset_canonical_for_locale): remove unused
	variable

	* gui/simple-greeter/gdm-layouts.c: Make the layout
	member of LayoutData const char *.

	* gui/simple-greeter/gdm-remote-login-window.c
	(xserver_died), (stop_xserver): drop unused functions

	* gui/simple-greeter/gdm-language-option-widget.c
	(gdm_language_option_widget_set_current_language):
	drop misplaced &

	* gui/simple-greeter/gdm-user.c (curved_rectangle): don't
	assume width == 0, height == 0 conditions will work reliably,
	instead check for < EPSILON

	* common/gdm-common.[hc] (gdm_make_temp_dir):
	Make the constness of the return value and inout argument
	reflect the way it's being called.

	* daemon/gdm-display-access-file.c
	(_create_xauth_file_for_user): Make dir_name const

	* daemon/gdm-display.c (gdm_display_real_manage):
	drop unused variables


Modified:
   trunk/ChangeLog
   trunk/common/gdm-common.c
   trunk/common/gdm-common.h
   trunk/daemon/gdm-display-access-file.c
   trunk/daemon/gdm-display.c
   trunk/gui/simple-greeter/gdm-language-option-widget.c
   trunk/gui/simple-greeter/gdm-languages.c
   trunk/gui/simple-greeter/gdm-layouts.c
   trunk/gui/simple-greeter/gdm-remote-login-window.c
   trunk/gui/simple-greeter/gdm-user-chooser-widget.c
   trunk/gui/simple-greeter/gdm-user.c

Modified: trunk/common/gdm-common.c
==============================================================================
--- trunk/common/gdm-common.c	(original)
+++ trunk/common/gdm-common.c	Fri Mar 27 14:58:26 2009
@@ -37,8 +37,8 @@
 #include "mkdtemp.h"
 #endif
 
-char *
-gdm_make_temp_dir (const char *template)
+const char *
+gdm_make_temp_dir (char *template)
 {
         return mkdtemp (template);
 }

Modified: trunk/common/gdm-common.h
==============================================================================
--- trunk/common/gdm-common.h	(original)
+++ trunk/common/gdm-common.h	Fri Mar 27 14:58:26 2009
@@ -34,7 +34,7 @@
 int            gdm_signal_pid            (int pid,
                                           int signal);
 
-char *         gdm_make_temp_dir         (const char    *template);
+const char *   gdm_make_temp_dir         (char    *template);
 
 gboolean       gdm_string_hex_encode     (const GString *source,
                                           int            start,

Modified: trunk/daemon/gdm-display-access-file.c
==============================================================================
--- trunk/daemon/gdm-display-access-file.c	(original)
+++ trunk/daemon/gdm-display-access-file.c	Fri Mar 27 14:58:26 2009
@@ -252,7 +252,7 @@
                              GError     **error)
 {
         char   *template;
-        char   *dir_name;
+        const char *dir_name;
         char   *auth_filename;
         int     fd;
         FILE   *fp;

Modified: trunk/daemon/gdm-display.c
==============================================================================
--- trunk/daemon/gdm-display.c	(original)
+++ trunk/daemon/gdm-display.c	Fri Mar 27 14:58:26 2009
@@ -604,9 +604,6 @@
 static gboolean
 gdm_display_real_manage (GdmDisplay *display)
 {
-        char    *command;
-        char    *log_file;
-        char    *log_path;
         gboolean res;
 
         g_return_val_if_fail (GDM_IS_DISPLAY (display), FALSE);

Modified: trunk/gui/simple-greeter/gdm-language-option-widget.c
==============================================================================
--- trunk/gui/simple-greeter/gdm-language-option-widget.c	(original)
+++ trunk/gui/simple-greeter/gdm-language-option-widget.c	Fri Mar 27 14:58:26 2009
@@ -301,7 +301,7 @@
 
         if (normalized_language_name != NULL &&
             !gdm_option_widget_lookup_item (GDM_OPTION_WIDGET (widget),
-                                            &normalized_language_name, NULL, NULL, NULL)) {
+                                            normalized_language_name, NULL, NULL, NULL)) {
                 gdm_recent_option_widget_add_item (GDM_RECENT_OPTION_WIDGET (widget),
                                                    normalized_language_name);
         }

Modified: trunk/gui/simple-greeter/gdm-languages.c
==============================================================================
--- trunk/gui/simple-greeter/gdm-languages.c	(original)
+++ trunk/gui/simple-greeter/gdm-languages.c	Fri Mar 27 14:58:26 2009
@@ -217,11 +217,10 @@
 }
 
 static void
-make_codeset_canonical_for_locale (const       *name,
-                                   const char **codeset)
+make_codeset_canonical_for_locale (const char  *name,
+                                   char       **codeset)
 {
         char *old_locale;
-        char *canonical_codeset;
 
         old_locale = setlocale (LC_CTYPE, name);
 

Modified: trunk/gui/simple-greeter/gdm-layouts.c
==============================================================================
--- trunk/gui/simple-greeter/gdm-layouts.c	(original)
+++ trunk/gui/simple-greeter/gdm-layouts.c	Fri Mar 27 14:58:26 2009
@@ -37,7 +37,7 @@
 
 typedef struct {
         GSList *list;
-        char *layout;
+        const char *layout;
 } LayoutData;
 
 #ifdef HAVE_LIBXKLAVIER

Modified: trunk/gui/simple-greeter/gdm-remote-login-window.c
==============================================================================
--- trunk/gui/simple-greeter/gdm-remote-login-window.c	(original)
+++ trunk/gui/simple-greeter/gdm-remote-login-window.c	Fri Mar 27 14:58:26 2009
@@ -67,42 +67,6 @@
 G_DEFINE_TYPE (GdmRemoteLoginWindow, gdm_remote_login_window, GTK_TYPE_WINDOW)
 
 static void
-xserver_died (GdmRemoteLoginWindow *login_window)
-{
-        int exit_status;
-
-        g_debug ("GdmRemoteLoginWindow: Waiting on process %d", login_window->priv->xserver_pid);
-        exit_status = gdm_wait_on_pid (login_window->priv->xserver_pid);
-
-        if (WIFEXITED (exit_status) && (WEXITSTATUS (exit_status) != 0)) {
-                g_debug ("GdmRemoteLoginWindow: Wait on child process failed");
-        } else {
-                /* exited normally */
-        }
-
-        g_spawn_close_pid (login_window->priv->xserver_pid);
-        login_window->priv->xserver_pid = -1;
-
-        g_debug ("GdmRemoteLoginWindow: xserver died");
-}
-
-static void
-stop_xserver (GdmRemoteLoginWindow *login_window)
-{
-        /* remove watch before killing so we don't restart */
-        if (login_window->priv->xserver_watch_id > 0) {
-                g_source_remove (login_window->priv->xserver_watch_id);
-                login_window->priv->xserver_watch_id = 0;
-        }
-
-        g_debug ("GdmRemoteLoginWindow: Stopping xserver");
-        if (login_window->priv->xserver_pid > 0) {
-                gdm_signal_pid (login_window->priv->xserver_pid, SIGTERM);
-                xserver_died (login_window);
-        }
-}
-
-static void
 xserver_child_watch (GPid                  pid,
                      int                   status,
                      GdmRemoteLoginWindow *login_window)

Modified: trunk/gui/simple-greeter/gdm-user-chooser-widget.c
==============================================================================
--- trunk/gui/simple-greeter/gdm-user-chooser-widget.c	(original)
+++ trunk/gui/simple-greeter/gdm-user-chooser-widget.c	Fri Mar 27 14:58:26 2009
@@ -345,7 +345,7 @@
                 return;
         }
 
-        size = get_icon_height_for_widget (widget);
+        size = get_icon_height_for_widget (GTK_WIDGET (widget));
         pixbuf = gdm_user_render_icon (user, size);
         if (pixbuf == NULL && widget->priv->stock_person_pixbuf != NULL) {
                 pixbuf = g_object_ref (widget->priv->stock_person_pixbuf);
@@ -585,7 +585,7 @@
         GdkPixbuf *pixbuf;
         int        size;
 
-        size = get_icon_height_for_widget (widget);
+        size = get_icon_height_for_widget (GTK_WIDGET (widget));
 
         pixbuf = gtk_icon_theme_load_icon (widget->priv->icon_theme,
                                            DEFAULT_USER_ICON,
@@ -602,7 +602,7 @@
         GdkPixbuf *pixbuf;
         int        size;
 
-        size = get_icon_height_for_widget (widget);
+        size = get_icon_height_for_widget (GTK_WIDGET (widget));
 
         pixbuf = gtk_icon_theme_load_icon (widget->priv->icon_theme,
                                            "emblem-default",

Modified: trunk/gui/simple-greeter/gdm-user.c
==============================================================================
--- trunk/gui/simple-greeter/gdm-user.c	(original)
+++ trunk/gui/simple-greeter/gdm-user.c	Fri Mar 27 14:58:26 2009
@@ -20,6 +20,7 @@
 
 #include <config.h>
 
+#include <float.h>
 #include <string.h>
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -881,7 +882,7 @@
         x1 = x0 + width;
         y1 = y0 + height;
 
-        if (!width || !height) {
+        if (width < FLT_EPSILON || height < FLT_EPSILON) {
                 return;
         }