[gnome-flashback] idle-monitor: make meta_idle_monitor_watch_fire static
- From: Alberts Muktupāvels <muktupavels src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-flashback] idle-monitor: make meta_idle_monitor_watch_fire static
- Date: Tue, 24 May 2022 10:10:07 +0000 (UTC)
commit 323b22308d8bd76c398e261b284a53fed7e28808
Author: Alberts Muktupāvels <alberts muktupavels gmail com>
Date: Tue May 24 13:05:41 2022 +0300
idle-monitor: make meta_idle_monitor_watch_fire static
daemons/idle-monitor/meta-idle-monitor.c | 20 ++++++++++++++++----
daemons/idle-monitor/meta-idle-monitor.h | 14 --------------
2 files changed, 16 insertions(+), 18 deletions(-)
---
diff --git a/daemons/idle-monitor/meta-idle-monitor.c b/daemons/idle-monitor/meta-idle-monitor.c
index 8934461..b264e48 100644
--- a/daemons/idle-monitor/meta-idle-monitor.c
+++ b/daemons/idle-monitor/meta-idle-monitor.c
@@ -43,12 +43,24 @@ struct _MetaIdleMonitor
XSyncAlarm user_active_alarm;
};
+typedef struct
+{
+ MetaIdleMonitor *monitor;
+ guint id;
+ MetaIdleMonitorWatchFunc callback;
+ gpointer user_data;
+ GDestroyNotify notify;
+ guint64 timeout_msec;
+ int idle_source_id;
+ XSyncAlarm xalarm;
+} MetaIdleMonitorWatch;
+
G_STATIC_ASSERT(sizeof(unsigned long) == sizeof(gpointer));
G_DEFINE_TYPE (MetaIdleMonitor, meta_idle_monitor, G_TYPE_OBJECT)
-void
-_meta_idle_monitor_watch_fire (MetaIdleMonitorWatch *watch)
+static void
+meta_idle_monitor_watch_fire (MetaIdleMonitorWatch *watch)
{
MetaIdleMonitor *monitor;
guint id;
@@ -242,7 +254,7 @@ check_x11_watches (MetaIdleMonitor *self,
watch = g_hash_table_lookup (self->watches, GUINT_TO_POINTER (watch_id));
if (watch && watch->xalarm == alarm)
- _meta_idle_monitor_watch_fire (watch);
+ meta_idle_monitor_watch_fire (watch);
}
g_list_free (watch_ids);
@@ -313,7 +325,7 @@ fire_watch_idle (gpointer data)
MetaIdleMonitorWatch *watch = data;
watch->idle_source_id = 0;
- _meta_idle_monitor_watch_fire (watch);
+ meta_idle_monitor_watch_fire (watch);
return FALSE;
}
diff --git a/daemons/idle-monitor/meta-idle-monitor.h b/daemons/idle-monitor/meta-idle-monitor.h
index 83c73c4..a1c4b7a 100644
--- a/daemons/idle-monitor/meta-idle-monitor.h
+++ b/daemons/idle-monitor/meta-idle-monitor.h
@@ -36,20 +36,6 @@ typedef void (*MetaIdleMonitorWatchFunc) (MetaIdleMonitor *monitor,
guint watch_id,
gpointer user_data);
-typedef struct
-{
- MetaIdleMonitor *monitor;
- guint id;
- MetaIdleMonitorWatchFunc callback;
- gpointer user_data;
- GDestroyNotify notify;
- guint64 timeout_msec;
- int idle_source_id;
- XSyncAlarm xalarm;
-} MetaIdleMonitorWatch;
-
-void _meta_idle_monitor_watch_fire (MetaIdleMonitorWatch *watch);
-
struct _MetaIdleMonitorClass
{
GObjectClass parent_class;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]