diff options
| author | Rodrigo Moya <rodrigo@gnome-db.org> | 2011-06-21 14:34:06 +0200 |
|---|---|---|
| committer | Rodrigo Moya <rodrigo@gnome-db.org> | 2011-06-21 14:34:06 +0200 |
| commit | 534b98f63839ad20a27a999f00c1bf219a28c37c (patch) | |
| tree | 83e3ba1d5b9a814c54319638c74bf96f1460f935 | |
| parent | 0abf66e3048c52dbd930250c95fef785c1dfda87 (diff) | |
| download | glib-wip/locale-monitor.tar.gz | |
gio: Fix GLocaleMonitor compilationwip/locale-monitor
| -rw-r--r-- | gio/glocalemonitor.c | 9 | ||||
| -rw-r--r-- | gio/glocalemonitor.h | 1 | ||||
| -rw-r--r-- | gobject/gmarshal.c | 6 |
3 files changed, 11 insertions, 5 deletions
diff --git a/gio/glocalemonitor.c b/gio/glocalemonitor.c index 408194304..da228efa1 100644 --- a/gio/glocalemonitor.c +++ b/gio/glocalemonitor.c @@ -20,6 +20,7 @@ */ #include "glocalemonitor.h" +#include "gsettings.h" /** * SECTION:glocalemonitor @@ -73,9 +74,9 @@ locale_settings_changed (GSettings *settings, const gchar *key, gpointer user_data) { - GLocaleMonitor = G_LOCALE_MONITOR (user_data); + GLocaleMonitor *monitor = G_LOCALE_MONITOR (user_data); - if (g_str_is_equal (key, "region")) + if (g_str_equal (key, "region")) { /* FIXME: call setlocale here? */ g_signal_emit (monitor, g_locale_monitor_changed_signal, 0); @@ -85,8 +86,8 @@ locale_settings_changed (GSettings *settings, static void g_locale_monitor_init (GLocaleMonitor *monitor) { - monitor->settings = g_settings_new ("org.gnome.system.locale"); - g_signal_connect (G_OBJECT (monitor->settings), "changed", + monitor->locale_settings = g_settings_new ("org.gnome.system.locale"); + g_signal_connect (G_OBJECT (monitor->locale_settings), "changed", G_CALLBACK (locale_settings_changed), monitor); } diff --git a/gio/glocalemonitor.h b/gio/glocalemonitor.h index ad40bda4b..55f628724 100644 --- a/gio/glocalemonitor.h +++ b/gio/glocalemonitor.h @@ -35,7 +35,6 @@ G_BEGIN_DECLS #define G_IS_LOCALE_MONITOR(inst) (G_TYPE_CHECK_INSTANCE_TYPE ((inst), G_TYPE_LOCALE_MONITOR)) typedef struct _GLocaleMonitor GLocaleMonitor; -typedef struct _GLocaleMonitorClass GLocaleMonitorClass; GType g_locale_monitor_get_type (void) G_GNUC_CONST; GLocaleMonitor *g_locale_monitor_get (void); diff --git a/gobject/gmarshal.c b/gobject/gmarshal.c index 48047d845..bc53b5d9e 100644 --- a/gobject/gmarshal.c +++ b/gobject/gmarshal.c @@ -1,4 +1,10 @@ +#include "config.h" + +#include "gobject.h" +#include "genums.h" +#include "gboxed.h" +#include "gvaluetypes.h" #ifdef G_ENABLE_DEBUG #define g_marshal_value_peek_boolean(v) g_value_get_boolean (v) |