[mutter] Export meta_get_replace_current_wm()
- From: Colin Walters <walters src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [mutter] Export meta_get_replace_current_wm()
- Date: Wed, 23 Mar 2011 20:40:21 +0000 (UTC)
commit c13e62f72cfe528fefa62ece8ea8a5d594f4f079
Author: Colin Walters <walters verbum org>
Date: Wed Mar 23 13:11:05 2011 -0400
Export meta_get_replace_current_wm()
This is necessary for gnome-shell to know whether it should try to
replace the org.gnome.Shell DBus name.
Note: We can't just #include <meta/util.h> because it #defines '_'
at least which obviously conflicts with core gettext. We should
un-export util.h or fix it.
https://bugzilla.gnome.org/show_bug.cgi?id=645590
src/core/screen.c | 1 +
src/meta/main.h | 1 +
src/meta/util.h | 1 -
3 files changed, 2 insertions(+), 1 deletions(-)
---
diff --git a/src/core/screen.c b/src/core/screen.c
index 59dd254..cbfcdb8 100644
--- a/src/core/screen.c
+++ b/src/core/screen.c
@@ -28,6 +28,7 @@
#include <config.h>
#include "screen-private.h"
+#include <meta/main.h>
#include <meta/util.h>
#include <meta/errors.h>
#include "window-private.h"
diff --git a/src/meta/main.h b/src/meta/main.h
index 23beebc..f1aab67 100644
--- a/src/meta/main.h
+++ b/src/meta/main.h
@@ -29,6 +29,7 @@
GOptionContext *meta_get_option_context (void);
void meta_init (void);
int meta_run (void);
+gboolean meta_get_replace_current_wm (void); /* Actually defined in util.c */
typedef enum
{
diff --git a/src/meta/util.h b/src/meta/util.h
index 096cdb3..d345840 100644
--- a/src/meta/util.h
+++ b/src/meta/util.h
@@ -36,7 +36,6 @@ gboolean meta_is_debugging (void);
void meta_set_debugging (gboolean setting);
gboolean meta_is_syncing (void);
void meta_set_syncing (gboolean setting);
-gboolean meta_get_replace_current_wm (void);
void meta_set_replace_current_wm (gboolean setting);
void meta_debug_spew_real (const char *format,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]