projects
/
platform
/
upstream
/
glib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[kdbus] Enable 'initial_read()' - is no longer needed
[platform/upstream/glib.git]
/
gio
/
gdbusauthmechanismanon.c
diff --git
a/gio/gdbusauthmechanismanon.c
b/gio/gdbusauthmechanismanon.c
index
4c666ec
..
f7c9917
100644
(file)
--- a/
gio/gdbusauthmechanismanon.c
+++ b/
gio/gdbusauthmechanismanon.c
@@
-1,6
+1,6
@@
/* GDBus - GLib D-Bus Library
*
/* GDBus - GLib D-Bus Library
*
- * Copyright (C) 2008-20
09
Red Hat, Inc.
+ * Copyright (C) 2008-20
10
Red Hat, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@
-13,21
+13,19
@@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
+ * Public License along with this library; if not, see <http://www.gnu.org/licenses/>.
*
* Author: David Zeuthen <davidz@redhat.com>
*/
#include "config.h"
*
* Author: David Zeuthen <davidz@redhat.com>
*/
#include "config.h"
-#include <glib/gi18n.h>
-
#include "gdbusauthmechanismanon.h"
#include "gdbuserror.h"
#include "gioenumtypes.h"
#include "gdbusauthmechanismanon.h"
#include "gdbuserror.h"
#include "gioenumtypes.h"
+#include "glibintl.h"
+
struct _GDBusAuthMechanismAnonPrivate
{
gboolean is_client;
struct _GDBusAuthMechanismAnonPrivate
{
gboolean is_client;
@@
-70,7
+68,7
@@
static void mechanism_client_shutdown (GDBusAuthMe
/* ---------------------------------------------------------------------------------------------------- */
/* ---------------------------------------------------------------------------------------------------- */
-G_DEFINE_TYPE
(GDBusAuthMechanismAnon, _g_dbus_auth_mechanism_anon, G_TYPE_DBUS_AUTH_MECHANISM);
+G_DEFINE_TYPE
_WITH_PRIVATE (GDBusAuthMechanismAnon, _g_dbus_auth_mechanism_anon, G_TYPE_DBUS_AUTH_MECHANISM)
/* ---------------------------------------------------------------------------------------------------- */
/* ---------------------------------------------------------------------------------------------------- */
@@
-89,8
+87,6
@@
_g_dbus_auth_mechanism_anon_class_init (GDBusAuthMechanismAnonClass *klass)
GObjectClass *gobject_class;
GDBusAuthMechanismClass *mechanism_class;
GObjectClass *gobject_class;
GDBusAuthMechanismClass *mechanism_class;
- g_type_class_add_private (klass, sizeof (GDBusAuthMechanismAnonPrivate));
-
gobject_class = G_OBJECT_CLASS (klass);
gobject_class->finalize = _g_dbus_auth_mechanism_anon_finalize;
gobject_class = G_OBJECT_CLASS (klass);
gobject_class->finalize = _g_dbus_auth_mechanism_anon_finalize;
@@
-116,9
+112,7
@@
_g_dbus_auth_mechanism_anon_class_init (GDBusAuthMechanismAnonClass *klass)
static void
_g_dbus_auth_mechanism_anon_init (GDBusAuthMechanismAnon *mechanism)
{
static void
_g_dbus_auth_mechanism_anon_init (GDBusAuthMechanismAnon *mechanism)
{
- mechanism->priv = G_TYPE_INSTANCE_GET_PRIVATE (mechanism,
- G_TYPE_DBUS_AUTH_MECHANISM_ANON,
- GDBusAuthMechanismAnonPrivate);
+ mechanism->priv = _g_dbus_auth_mechanism_anon_get_instance_private (mechanism);
}
/* ---------------------------------------------------------------------------------------------------- */
}
/* ---------------------------------------------------------------------------------------------------- */
@@
-187,8
+181,7
@@
mechanism_server_initiate (GDBusAuthMechanism *mechanism,
g_return_if_fail (G_IS_DBUS_AUTH_MECHANISM_ANON (mechanism));
g_return_if_fail (!m->priv->is_server && !m->priv->is_client);
g_return_if_fail (G_IS_DBUS_AUTH_MECHANISM_ANON (mechanism));
g_return_if_fail (!m->priv->is_server && !m->priv->is_client);
- if (initial_response != NULL)
- g_debug ("ANONYMOUS: initial_response was `%s'", initial_response);
+ //g_debug ("ANONYMOUS: initial_response was '%s'", initial_response);
m->priv->is_server = TRUE;
m->priv->state = G_DBUS_AUTH_MECHANISM_STATE_ACCEPTED;
m->priv->is_server = TRUE;
m->priv->state = G_DBUS_AUTH_MECHANISM_STATE_ACCEPTED;