diff options
author | Ray Strode <rstrode@redhat.com> | 2015-01-19 09:13:14 -0500 |
---|---|---|
committer | Ray Strode <rstrode@redhat.com> | 2015-02-18 17:34:10 -0500 |
commit | 8d3d988b18bb1b2f51216f9db2f5f02f54295ebd (patch) | |
tree | 471fbf87aaab99a5f98b8d3bf5cc2510f26e3292 /daemon | |
parent | f196d21e7f7e865112cdb8e467a463776fd8d250 (diff) | |
download | gdm-8d3d988b18bb1b2f51216f9db2f5f02f54295ebd.tar.gz |
display: drop unsubclassed vfuncs
gdm-display has a whole host of vfuncs that are now completely unused.
This commit drops thems.
https://bugzilla.gnome.org/show_bug.cgi?id=744764
Diffstat (limited to 'daemon')
-rw-r--r-- | daemon/gdm-display.c | 131 | ||||
-rw-r--r-- | daemon/gdm-display.h | 11 |
2 files changed, 17 insertions, 125 deletions
diff --git a/daemon/gdm-display.c b/daemon/gdm-display.c index 486d167e..0ad521f5 100644 --- a/daemon/gdm-display.c +++ b/daemon/gdm-display.c @@ -154,8 +154,8 @@ _create_access_file_for_user (GdmDisplay *display, return access_file; } -static gboolean -gdm_display_real_create_authority (GdmDisplay *display) +gboolean +gdm_display_create_authority (GdmDisplay *display) { GdmDisplayAccessFile *access_file; GError *error; @@ -196,24 +196,10 @@ gdm_display_real_create_authority (GdmDisplay *display) } gboolean -gdm_display_create_authority (GdmDisplay *display) -{ - gboolean ret; - - g_return_val_if_fail (GDM_IS_DISPLAY (display), FALSE); - - g_object_ref (display); - ret = GDM_DISPLAY_GET_CLASS (display)->create_authority (display); - g_object_unref (display); - - return ret; -} - -static gboolean -gdm_display_real_add_user_authorization (GdmDisplay *display, - const char *username, - char **filename, - GError **error) +gdm_display_add_user_authorization (GdmDisplay *display, + const char *username, + char **filename, + GError **error) { GdmDisplayAccessFile *access_file; GError *access_file_error; @@ -221,6 +207,10 @@ gdm_display_real_add_user_authorization (GdmDisplay *display, g_return_val_if_fail (GDM_IS_DISPLAY (display), FALSE); + g_debug ("GdmDisplay: Adding authorization for user:%s on display %s", username, display->priv->x11_display_name); + + g_return_val_if_fail (GDM_IS_DISPLAY (display), FALSE); + if (display->priv->user_access_file != NULL) { g_set_error (error, G_DBUS_ERROR, @@ -264,25 +254,6 @@ gdm_display_real_add_user_authorization (GdmDisplay *display, return TRUE; } -gboolean -gdm_display_add_user_authorization (GdmDisplay *display, - const char *username, - char **filename, - GError **error) -{ - gboolean ret; - - g_return_val_if_fail (GDM_IS_DISPLAY (display), FALSE); - - g_debug ("GdmDisplay: Adding authorization for user:%s on display %s", username, display->priv->x11_display_name); - - g_object_ref (display); - ret = GDM_DISPLAY_GET_CLASS (display)->add_user_authorization (display, username, filename, error); - g_object_unref (display); - - return ret; -} - static void gdm_display_real_get_timed_login_details (GdmDisplay *display, gboolean *enabledp, @@ -396,32 +367,18 @@ gdm_display_get_timed_login_details (GdmDisplay *display, return TRUE; } -static gboolean -gdm_display_real_remove_user_authorization (GdmDisplay *display, - const char *username, - GError **error) -{ - gdm_display_access_file_close (display->priv->user_access_file); - - return TRUE; -} - gboolean gdm_display_remove_user_authorization (GdmDisplay *display, const char *username, GError **error) { - gboolean ret; - g_return_val_if_fail (GDM_IS_DISPLAY (display), FALSE); g_debug ("GdmDisplay: Removing authorization for user:%s on display %s", username, display->priv->x11_display_name); - g_object_ref (display); - ret = GDM_DISPLAY_GET_CLASS (display)->remove_user_authorization (display, username, error); - g_object_unref (display); + gdm_display_access_file_close (display->priv->user_access_file); - return ret; + return TRUE; } gboolean @@ -607,14 +564,14 @@ gdm_display_prepare (GdmDisplay *display) return ret; } -static gboolean -gdm_display_real_manage (GdmDisplay *display) +gboolean +gdm_display_manage (GdmDisplay *display) { gboolean res; g_return_val_if_fail (GDM_IS_DISPLAY (display), FALSE); - g_debug ("GdmDisplay: manage display"); + g_debug ("GdmDisplay: Managing display: %s", display->priv->id); /* If not explicitly prepared, do it now */ if (display->priv->status == GDM_DISPLAY_UNMANAGED) { @@ -631,23 +588,7 @@ gdm_display_real_manage (GdmDisplay *display) } gboolean -gdm_display_manage (GdmDisplay *display) -{ - gboolean ret; - - g_return_val_if_fail (GDM_IS_DISPLAY (display), FALSE); - - g_debug ("GdmDisplay: Managing display: %s", display->priv->id); - - g_object_ref (display); - ret = GDM_DISPLAY_GET_CLASS (display)->manage (display); - g_object_unref (display); - - return ret; -} - -static gboolean -gdm_display_real_finish (GdmDisplay *display) +gdm_display_finish (GdmDisplay *display) { g_return_val_if_fail (GDM_IS_DISPLAY (display), FALSE); @@ -659,23 +600,7 @@ gdm_display_real_finish (GdmDisplay *display) } gboolean -gdm_display_finish (GdmDisplay *display) -{ - gboolean ret; - - g_return_val_if_fail (GDM_IS_DISPLAY (display), FALSE); - - g_debug ("GdmDisplay: Finishing display: %s", display->priv->id); - - g_object_ref (display); - ret = GDM_DISPLAY_GET_CLASS (display)->finish (display); - g_object_unref (display); - - return ret; -} - -static gboolean -gdm_display_real_unmanage (GdmDisplay *display) +gdm_display_unmanage (GdmDisplay *display) { gdouble elapsed; @@ -719,22 +644,6 @@ gdm_display_real_unmanage (GdmDisplay *display) } gboolean -gdm_display_unmanage (GdmDisplay *display) -{ - gboolean ret; - - g_return_val_if_fail (GDM_IS_DISPLAY (display), FALSE); - - g_debug ("GdmDisplay: Unmanaging display"); - - g_object_ref (display); - ret = GDM_DISPLAY_GET_CLASS (display)->unmanage (display); - g_object_unref (display); - - return ret; -} - -gboolean gdm_display_get_id (GdmDisplay *display, char **id, GError **error) @@ -1270,14 +1179,8 @@ gdm_display_class_init (GdmDisplayClass *klass) object_class->dispose = gdm_display_dispose; object_class->finalize = gdm_display_finalize; - klass->create_authority = gdm_display_real_create_authority; - klass->add_user_authorization = gdm_display_real_add_user_authorization; - klass->remove_user_authorization = gdm_display_real_remove_user_authorization; klass->get_timed_login_details = gdm_display_real_get_timed_login_details; klass->prepare = gdm_display_real_prepare; - klass->manage = gdm_display_real_manage; - klass->finish = gdm_display_real_finish; - klass->unmanage = gdm_display_real_unmanage; g_object_class_install_property (object_class, PROP_ID, diff --git a/daemon/gdm-display.h b/daemon/gdm-display.h index 32fa290f..03018144 100644 --- a/daemon/gdm-display.h +++ b/daemon/gdm-display.h @@ -56,18 +56,7 @@ typedef struct GObjectClass parent_class; /* methods */ - gboolean (*create_authority) (GdmDisplay *display); - gboolean (*add_user_authorization) (GdmDisplay *display, - const char *username, - char **filename, - GError **error); - gboolean (*remove_user_authorization) (GdmDisplay *display, - const char *username, - GError **error); gboolean (*prepare) (GdmDisplay *display); - gboolean (*manage) (GdmDisplay *display); - gboolean (*finish) (GdmDisplay *display); - gboolean (*unmanage) (GdmDisplay *display); void (*get_timed_login_details) (GdmDisplay *display, gboolean *enabled, char **username, |