From 33af7687de1650bdc58e537dff621eac5ae0c691 Mon Sep 17 00:00:00 2001 From: Evan Nemerson Date: Wed, 2 Jan 2013 15:35:23 -0800 Subject: [PATCH 1/2] Expose gypsy_server_error_quark and remove gypsy_control_error_quark gypsy_server_error_quark was previously not exposed, though GYPSY_SERVER_ERROR was #defined to it. gypsy_control_error_quark was neither exposed nor used internally. --- gypsy/gypsy-control.c | 11 ----------- src/gypsy-server.h | 1 + 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/gypsy/gypsy-control.c b/gypsy/gypsy-control.c index 0f84b97..c58a6e9 100644 --- a/gypsy/gypsy-control.c +++ b/gypsy/gypsy-control.c @@ -107,17 +107,6 @@ typedef struct _GypsyControlPrivate { G_DEFINE_TYPE (GypsyControl, gypsy_control, G_TYPE_OBJECT); -GQuark -gypsy_control_error_quark (void) -{ - static GQuark quark = 0; - if (G_UNLIKELY (quark == 0)) { - quark = g_quark_from_static_string ("gypsy-control-error-quark"); - } - - return quark; -} - static void dispose (GObject *object) { diff --git a/src/gypsy-server.h b/src/gypsy-server.h index ae5578f..83fb317 100644 --- a/src/gypsy-server.h +++ b/src/gypsy-server.h @@ -54,6 +54,7 @@ GType gypsy_server_get_type (void); GypsyServer *gypsy_server_new (gboolean auto_terminate); void gypsy_server_remove_clients (GypsyServer *gps, const char *prev_owner); +GQuark gypsy_server_error_quark (void); G_END_DECLS #endif -- 1.8.0.2