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
This commit is contained in:
Colin Walters 2011-03-23 13:11:05 -04:00
parent 3d958de33e
commit c13e62f72c
3 changed files with 2 additions and 1 deletions

View File

@ -28,6 +28,7 @@
#include <config.h> #include <config.h>
#include "screen-private.h" #include "screen-private.h"
#include <meta/main.h>
#include <meta/util.h> #include <meta/util.h>
#include <meta/errors.h> #include <meta/errors.h>
#include "window-private.h" #include "window-private.h"

View File

@ -29,6 +29,7 @@
GOptionContext *meta_get_option_context (void); GOptionContext *meta_get_option_context (void);
void meta_init (void); void meta_init (void);
int meta_run (void); int meta_run (void);
gboolean meta_get_replace_current_wm (void); /* Actually defined in util.c */
typedef enum typedef enum
{ {

View File

@ -36,7 +36,6 @@ gboolean meta_is_debugging (void);
void meta_set_debugging (gboolean setting); void meta_set_debugging (gboolean setting);
gboolean meta_is_syncing (void); gboolean meta_is_syncing (void);
void meta_set_syncing (gboolean setting); void meta_set_syncing (gboolean setting);
gboolean meta_get_replace_current_wm (void);
void meta_set_replace_current_wm (gboolean setting); void meta_set_replace_current_wm (gboolean setting);
void meta_debug_spew_real (const char *format, void meta_debug_spew_real (const char *format,