luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-09-27 17:52:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

gio: Fix GLocaleMonitor compilation

Browse Source
This commit is contained in:
Rodrigo Moya
2011-06-21 14:34:06 +02:00
parent 0abf66e304
commit 534b98f638
3 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
gio/glocalemonitor.c
View File

@@ -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);
}

1
gio/glocalemonitor.h
View File

@@ -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);

6
gobject/gmarshal.c
View File

@@ -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)