diff options
Diffstat (limited to 'gsearchtool/libeggsmclient')
-rw-r--r-- | gsearchtool/libeggsmclient/eggsmclient-private.h | 8 | ||||
-rw-r--r-- | gsearchtool/libeggsmclient/eggsmclient-xsmp.c | 2 | ||||
-rw-r--r-- | gsearchtool/libeggsmclient/eggsmclient.c | 8 |
3 files changed, 9 insertions, 9 deletions
diff --git a/gsearchtool/libeggsmclient/eggsmclient-private.h b/gsearchtool/libeggsmclient/eggsmclient-private.h index a79f05df..1313855b 100644 --- a/gsearchtool/libeggsmclient/eggsmclient-private.h +++ b/gsearchtool/libeggsmclient/eggsmclient-private.h @@ -34,14 +34,14 @@ void egg_sm_client_quit_cancelled (EggSMClient *client); void egg_sm_client_quit (EggSMClient *client); #if defined (GDK_WINDOWING_X11) -# ifdef EGG_SM_CLIENT_BACKEND_XSMP +#ifdef EGG_SM_CLIENT_BACKEND_XSMP GType egg_sm_client_xsmp_get_type (void); EggSMClient *egg_sm_client_xsmp_new (void); -# endif -# ifdef EGG_SM_CLIENT_BACKEND_DBUS +#endif +#ifdef EGG_SM_CLIENT_BACKEND_DBUS GType egg_sm_client_dbus_get_type (void); EggSMClient *egg_sm_client_dbus_new (void); -# endif +#endif #endif G_END_DECLS diff --git a/gsearchtool/libeggsmclient/eggsmclient-xsmp.c b/gsearchtool/libeggsmclient/eggsmclient-xsmp.c index 2121ae85..4dbb3ad2 100644 --- a/gsearchtool/libeggsmclient/eggsmclient-xsmp.c +++ b/gsearchtool/libeggsmclient/eggsmclient-xsmp.c @@ -567,7 +567,7 @@ idle_do_pending_events (gpointer data) do_save_yourself (xsmp); } - out: +out: #if !GTK_CHECK_VERSION (3, 0, 0) gdk_threads_leave (); #endif diff --git a/gsearchtool/libeggsmclient/eggsmclient.c b/gsearchtool/libeggsmclient/eggsmclient.c index 4b114e1e..c1720381 100644 --- a/gsearchtool/libeggsmclient/eggsmclient.c +++ b/gsearchtool/libeggsmclient/eggsmclient.c @@ -324,13 +324,13 @@ egg_sm_client_get (void) * (since it supports state saving) and fall back to D-Bus * if XSMP isn't available. */ -# ifdef EGG_SM_CLIENT_BACKEND_XSMP +#ifdef EGG_SM_CLIENT_BACKEND_XSMP global_client = egg_sm_client_xsmp_new (); -# endif -# ifdef EGG_SM_CLIENT_BACKEND_DBUS +#endif +#ifdef EGG_SM_CLIENT_BACKEND_DBUS if (!global_client) global_client = egg_sm_client_dbus_new (); -# endif +#endif } /* Fallback: create a dummy client, so that callers don't have |