Skip to content

Commit 582bcba

Browse files
yetistraveit65
yetist
authored and
raveit65
committed
Avoid compile warning for g_type_class_add_private
Fixes the issue with GLib >= 2.58, list of modified files: - mate-session/gs-idle-monitor.c - mate-session/gs-idle-monitor.h
1 parent 851d9fe commit 582bcba

File tree

2 files changed

+37
-64
lines changed

2 files changed

+37
-64
lines changed

‎mate-session/gs-idle-monitor.c‎

Lines changed: 34 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,8 @@ static void gs_idle_monitor_class_init (GSIdleMonitorClass *klass);
4343
static void gs_idle_monitor_init (GSIdleMonitor *idle_monitor);
4444
static void gs_idle_monitor_finalize (GObject *object);
4545

46-
#define GS_IDLE_MONITOR_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GS_TYPE_IDLE_MONITOR, GSIdleMonitorPrivate))
47-
48-
struct GSIdleMonitorPrivate
49-
{
46+
struct _GSIdleMonitor {
47+
GObject parent;
5048
GHashTable *watches;
5149
int sync_event_base;
5250
XSyncCounter counter;
@@ -98,9 +96,9 @@ gs_idle_monitor_dispose (GObject *object)
9896

9997
monitor = GS_IDLE_MONITOR (object);
10098

101-
if (monitor->priv->watches != NULL) {
102-
g_hash_table_destroy (monitor->priv->watches);
103-
monitor->priv->watches = NULL;
99+
if (monitor->watches != NULL) {
100+
g_hash_table_destroy (monitor->watches);
101+
monitor->watches = NULL;
104102
}
105103

106104
G_OBJECT_CLASS (gs_idle_monitor_parent_class)->dispose (object);
@@ -125,7 +123,7 @@ find_watch_for_alarm (GSIdleMonitor *monitor,
125123
{
126124
GSIdleMonitorWatch *watch;
127125

128-
watch = g_hash_table_find (monitor->priv->watches,
126+
watch = g_hash_table_find (monitor->watches,
129127
(GHRFunc)_find_alarm,
130128
&alarm);
131129
return watch;
@@ -135,28 +133,28 @@ find_watch_for_alarm (GSIdleMonitor *monitor,
135133
static gboolean
136134
send_fake_event (GSIdleMonitor *monitor)
137135
{
138-
if (! monitor->priv->have_xtest) {
136+
if (! monitor->have_xtest) {
139137
return FALSE;
140138
}
141139

142140
g_debug ("GSIdleMonitor: sending fake key");
143141

144142
XLockDisplay (GDK_DISPLAY_XDISPLAY(gdk_display_get_default()));
145143
XTestFakeKeyEvent (GDK_DISPLAY_XDISPLAY(gdk_display_get_default()),
146-
*monitor->priv->keycode,
144+
*monitor->keycode,
147145
True,
148146
CurrentTime);
149147
XTestFakeKeyEvent (GDK_DISPLAY_XDISPLAY(gdk_display_get_default()),
150-
*monitor->priv->keycode,
148+
*monitor->keycode,
151149
False,
152150
CurrentTime);
153151
XUnlockDisplay (GDK_DISPLAY_XDISPLAY(gdk_display_get_default()));
154152

155153
/* Swap the keycode */
156-
if (monitor->priv->keycode == &monitor->priv->keycode1) {
157-
monitor->priv->keycode = &monitor->priv->keycode2;
154+
if (monitor->keycode == &monitor->keycode1) {
155+
monitor->keycode = &monitor->keycode2;
158156
} else {
159-
monitor->priv->keycode = &monitor->priv->keycode1;
157+
monitor->keycode = &monitor->keycode1;
160158
}
161159

162160
return TRUE;
@@ -227,7 +225,7 @@ xevent_filter (GdkXEvent *xevent,
227225
XSyncAlarmNotifyEvent *alarm_event;
228226

229227
ev = xevent;
230-
if (ev->xany.type != monitor->priv->sync_event_base + XSyncAlarmNotify) {
228+
if (ev->xany.type != monitor->sync_event_base + XSyncAlarmNotify) {
231229
return GDK_FILTER_CONTINUE;
232230
}
233231

@@ -250,7 +248,7 @@ init_xsync (GSIdleMonitor *monitor)
250248
XSyncSystemCounter *counters;
251249

252250
res = XSyncQueryExtension (GDK_DISPLAY_XDISPLAY(gdk_display_get_default()),
253-
&monitor->priv->sync_event_base,
251+
&monitor->sync_event_base,
254252
&sync_error_base);
255253
if (! res) {
256254
g_warning ("GSIdleMonitor: Sync extension not present");
@@ -267,13 +265,13 @@ init_xsync (GSIdleMonitor *monitor)
267265
for (i = 0; i < ncounters; i++) {
268266
if (counters[i].name != NULL
269267
&& strcmp (counters[i].name, "IDLETIME") == 0) {
270-
monitor->priv->counter = counters[i].counter;
268+
monitor->counter = counters[i].counter;
271269
break;
272270
}
273271
}
274272
XSyncFreeSystemCounterList (counters);
275273

276-
if (monitor->priv->counter == None) {
274+
if (monitor->counter == None) {
277275
g_warning ("GSIdleMonitor: IDLETIME counter not found");
278276
return FALSE;
279277
}
@@ -290,20 +288,20 @@ _init_xtest (GSIdleMonitor *monitor)
290288
int a, b, c, d;
291289

292290
XLockDisplay (GDK_DISPLAY_XDISPLAY(gdk_display_get_default()));
293-
monitor->priv->have_xtest = (XTestQueryExtension (GDK_DISPLAY_XDISPLAY(gdk_display_get_default()), &a, &b, &c, &d) == True);
294-
if (monitor->priv->have_xtest) {
295-
monitor->priv->keycode1 = XKeysymToKeycode (GDK_DISPLAY_XDISPLAY(gdk_display_get_default()), XK_Alt_L);
296-
if (monitor->priv->keycode1 == 0) {
291+
monitor->have_xtest = (XTestQueryExtension (GDK_DISPLAY_XDISPLAY(gdk_display_get_default()), &a, &b, &c, &d) == True);
292+
if (monitor->have_xtest) {
293+
monitor->keycode1 = XKeysymToKeycode (GDK_DISPLAY_XDISPLAY(gdk_display_get_default()), XK_Alt_L);
294+
if (monitor->keycode1 == 0) {
297295
g_warning ("keycode1 not existent");
298296
}
299-
monitor->priv->keycode2 = XKeysymToKeycode (GDK_DISPLAY_XDISPLAY(gdk_display_get_default()), XK_Alt_R);
300-
if (monitor->priv->keycode2 == 0) {
301-
monitor->priv->keycode2 = XKeysymToKeycode (GDK_DISPLAY_XDISPLAY(gdk_display_get_default()), XK_Alt_L);
302-
if (monitor->priv->keycode2 == 0) {
297+
monitor->keycode2 = XKeysymToKeycode (GDK_DISPLAY_XDISPLAY(gdk_display_get_default()), XK_Alt_R);
298+
if (monitor->keycode2 == 0) {
299+
monitor->keycode2 = XKeysymToKeycode (GDK_DISPLAY_XDISPLAY(gdk_display_get_default()), XK_Alt_L);
300+
if (monitor->keycode2 == 0) {
303301
g_warning ("keycode2 not existent");
304302
}
305303
}
306-
monitor->priv->keycode = &monitor->priv->keycode1;
304+
monitor->keycode = &monitor->keycode1;
307305
}
308306
XUnlockDisplay (GDK_DISPLAY_XDISPLAY(gdk_display_get_default()));
309307
#endif /* HAVE_XTEST */
@@ -338,8 +336,6 @@ gs_idle_monitor_class_init (GSIdleMonitorClass *klass)
338336
object_class->finalize = gs_idle_monitor_finalize;
339337
object_class->dispose = gs_idle_monitor_dispose;
340338
object_class->constructor = gs_idle_monitor_constructor;
341-
342-
g_type_class_add_private (klass, sizeof (GSIdleMonitorPrivate));
343339
}
344340

345341
static guint32
@@ -390,14 +386,12 @@ idle_monitor_watch_free (GSIdleMonitorWatch *watch)
390386
static void
391387
gs_idle_monitor_init (GSIdleMonitor *monitor)
392388
{
393-
monitor->priv = GS_IDLE_MONITOR_GET_PRIVATE (monitor);
394-
395-
monitor->priv->watches = g_hash_table_new_full (NULL,
396-
NULL,
397-
NULL,
398-
(GDestroyNotify)idle_monitor_watch_free);
389+
monitor->watches = g_hash_table_new_full (NULL,
390+
NULL,
391+
NULL,
392+
(GDestroyNotify)idle_monitor_watch_free);
399393

400-
monitor->priv->counter = None;
394+
monitor->counter = None;
401395
}
402396

403397
static void
@@ -410,7 +404,7 @@ gs_idle_monitor_finalize (GObject *object)
410404

411405
idle_monitor = GS_IDLE_MONITOR (object);
412406

413-
g_return_if_fail (idle_monitor->priv != NULL);
407+
g_return_if_fail (idle_monitor != NULL);
414408

415409
G_OBJECT_CLASS (gs_idle_monitor_parent_class)->finalize (object);
416410
}
@@ -442,7 +436,7 @@ _xsync_alarm_set (GSIdleMonitor *monitor,
442436
| XSyncCAEvents;
443437

444438
XSyncIntToValue (&delta, 0);
445-
attr.trigger.counter = monitor->priv->counter;
439+
attr.trigger.counter = monitor->counter;
446440
attr.trigger.value_type = XSyncAbsolute;
447441
attr.trigger.wait_value = watch->interval;
448442
attr.delta = delta;
@@ -491,7 +485,7 @@ gs_idle_monitor_add_watch (GSIdleMonitor *monitor,
491485

492486
_xsync_alarm_set (monitor, watch);
493487

494-
g_hash_table_insert (monitor->priv->watches,
488+
g_hash_table_insert (monitor->watches,
495489
GUINT_TO_POINTER (watch->id),
496490
watch);
497491
return watch->id;
@@ -503,6 +497,6 @@ gs_idle_monitor_remove_watch (GSIdleMonitor *monitor,
503497
{
504498
g_return_if_fail (GS_IS_IDLE_MONITOR (monitor));
505499

506-
g_hash_table_remove (monitor->priv->watches,
500+
g_hash_table_remove (monitor->watches,
507501
GUINT_TO_POINTER (id));
508502
}

‎mate-session/gs-idle-monitor.h‎

Lines changed: 3 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -25,29 +25,10 @@
2525

2626
#include <glib-object.h>
2727

28-
#ifdef __cplusplus
29-
extern "C" {
30-
#endif
28+
G_BEGIN_DECLS
3129

3230
#define GS_TYPE_IDLE_MONITOR (gs_idle_monitor_get_type ())
33-
#define GS_IDLE_MONITOR(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GS_TYPE_IDLE_MONITOR, GSIdleMonitor))
34-
#define GS_IDLE_MONITOR_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), GS_TYPE_IDLE_MONITOR, GSIdleMonitorClass))
35-
#define GS_IS_IDLE_MONITOR(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GS_TYPE_IDLE_MONITOR))
36-
#define GS_IS_IDLE_MONITOR_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), GS_TYPE_IDLE_MONITOR))
37-
#define GS_IDLE_MONITOR_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), GS_TYPE_IDLE_MONITOR, GSIdleMonitorClass))
38-
39-
typedef struct GSIdleMonitorPrivate GSIdleMonitorPrivate;
40-
41-
typedef struct
42-
{
43-
GObject parent;
44-
GSIdleMonitorPrivate *priv;
45-
} GSIdleMonitor;
46-
47-
typedef struct
48-
{
49-
GObjectClass parent_class;
50-
} GSIdleMonitorClass;
31+
G_DECLARE_FINAL_TYPE (GSIdleMonitor, gs_idle_monitor, GS, IDLE_MONITOR, GObject)
5132

5233
typedef gboolean (*GSIdleMonitorWatchFunc) (GSIdleMonitor *monitor,
5334
guint id,
@@ -68,8 +49,6 @@ void gs_idle_monitor_remove_watch (GSIdleMonitor *monitor,
6849
void gs_idle_monitor_reset (GSIdleMonitor *monitor);
6950

7051

71-
#ifdef __cplusplus
72-
}
73-
#endif
52+
G_END_DECLS
7453

7554
#endif /* __GS_IDLE_MONITOR_H */

0 commit comments

Comments
 (0)