1 |
diff -upr mate-power-manager-orig/src/gpm-control.c mate-power-manager-test/src/gpm-control.c |
2 |
--- mate-power-manager-orig/src/gpm-control.c 2013-11-01 01:49:11.015502000 +0100 |
3 |
+++ mate-power-manager-test/src/gpm-control.c 2013-11-08 11:41:38.444731266 +0100 |
4 |
@@ -288,10 +288,11 @@ gpm_control_suspend (GpmControl *control |
5 |
} |
6 |
g_object_unref(proxy); |
7 |
} |
8 |
+#if !UP_CHECK_VERSION(0, 99, 0) |
9 |
else { |
10 |
ret = up_client_suspend_sync (control->priv->client, NULL, error); |
11 |
} |
12 |
- |
13 |
+#endif |
14 |
egg_debug ("emitting resume"); |
15 |
g_signal_emit (control, signals [RESUME], 0, GPM_CONTROL_ACTION_SUSPEND); |
16 |
|
17 |
@@ -398,10 +399,11 @@ gpm_control_hibernate (GpmControl *contr |
18 |
ret = TRUE; |
19 |
} |
20 |
} |
21 |
+#if !UP_CHECK_VERSION(0, 99, 0) |
22 |
else { |
23 |
ret = up_client_hibernate_sync (control->priv->client, NULL, error); |
24 |
} |
25 |
- |
26 |
+#endif |
27 |
egg_debug ("emitting resume"); |
28 |
g_signal_emit (control, signals [RESUME], 0, GPM_CONTROL_ACTION_HIBERNATE); |
29 |
|
30 |
diff -upr mate-power-manager-orig/src/gpm-engine.c mate-power-manager-test/src/gpm-engine.c |
31 |
--- mate-power-manager-orig/src/gpm-engine.c 2013-10-14 22:33:51.547439000 +0200 |
32 |
+++ mate-power-manager-test/src/gpm-engine.c 2013-11-08 14:37:29.681600913 +0100 |
33 |
@@ -805,12 +805,14 @@ gpm_engine_coldplug_idle_cb (GpmEngine * |
34 |
guint i; |
35 |
GPtrArray *array = NULL; |
36 |
UpDevice *device; |
37 |
+#if !UP_CHECK_VERSION(0, 99, 0) |
38 |
gboolean ret; |
39 |
GError *error = NULL; |
40 |
+#endif |
41 |
|
42 |
g_return_val_if_fail (engine != NULL, FALSE); |
43 |
g_return_val_if_fail (GPM_IS_ENGINE (engine), FALSE); |
44 |
- |
45 |
+#if !UP_CHECK_VERSION(0, 99, 0) |
46 |
/* get devices from UPower */ |
47 |
ret = up_client_enumerate_devices_sync (engine->priv->client, NULL, &error); |
48 |
if (!ret) { |
49 |
@@ -818,7 +820,7 @@ gpm_engine_coldplug_idle_cb (GpmEngine * |
50 |
g_error_free (error); |
51 |
goto out; |
52 |
} |
53 |
- |
54 |
+#endif |
55 |
/* connected mobile phones */ |
56 |
gpm_phone_coldplug (engine->priv->phone); |
57 |
|
58 |
@@ -831,7 +833,9 @@ gpm_engine_coldplug_idle_cb (GpmEngine * |
59 |
gpm_engine_device_add (engine, device); |
60 |
gpm_engine_check_recall (engine, device); |
61 |
} |
62 |
+#if !UP_CHECK_VERSION(0, 99, 0) |
63 |
out: |
64 |
+#endif |
65 |
if (array != NULL) |
66 |
g_ptr_array_unref (array); |
67 |
/* never repeat */ |
68 |
diff -upr mate-power-manager-orig/src/gpm-prefs-core.c mate-power-manager-test/src/gpm-prefs-core.c |
69 |
--- mate-power-manager-orig/src/gpm-prefs-core.c 2013-11-01 01:49:00.864400000 +0100 |
70 |
+++ mate-power-manager-test/src/gpm-prefs-core.c 2013-11-08 15:40:30.067567455 +0100 |
71 |
@@ -810,7 +810,9 @@ gpm_prefs_init (GpmPrefs *prefs) |
72 |
UpDevice *device; |
73 |
UpDeviceKind kind; |
74 |
GpmBrightness *brightness; |
75 |
+#if !UP_CHECK_VERSION(0, 99, 0) |
76 |
gboolean ret; |
77 |
+#endif |
78 |
guint i; |
79 |
|
80 |
GDBusProxy *proxy; |
81 |
@@ -896,9 +898,11 @@ gpm_prefs_init (GpmPrefs *prefs) |
82 |
else { |
83 |
/* are we allowed to shutdown? */ |
84 |
egg_console_kit_can_stop (prefs->priv->console, &prefs->priv->can_shutdown, NULL); |
85 |
+#if !UP_CHECK_VERSION(0, 99, 0) |
86 |
/* get values from UpClient */ |
87 |
prefs->priv->can_suspend = up_client_get_can_suspend (prefs->priv->client); |
88 |
prefs->priv->can_hibernate = up_client_get_can_hibernate (prefs->priv->client); |
89 |
+#endif |
90 |
} |
91 |
|
92 |
if (LOGIND_RUNNING()) { |
93 |
@@ -952,14 +956,14 @@ gpm_prefs_init (GpmPrefs *prefs) |
94 |
brightness = gpm_brightness_new (); |
95 |
prefs->priv->has_lcd = gpm_brightness_has_hw (brightness); |
96 |
g_object_unref (brightness); |
97 |
- |
98 |
+#if !UP_CHECK_VERSION(0, 99, 0) |
99 |
/* get device list */ |
100 |
ret = up_client_enumerate_devices_sync (prefs->priv->client, NULL, &error); |
101 |
if (!ret) { |
102 |
egg_warning ("failed to get device list: %s", error->message); |
103 |
g_error_free (error); |
104 |
} |
105 |
- |
106 |
+#endif |
107 |
devices = up_client_get_devices (prefs->priv->client); |
108 |
for (i=0; i<devices->len; i++) { |
109 |
device = g_ptr_array_index (devices, i); |
110 |
diff -upr mate-power-manager-orig/src/gpm-statistics.c mate-power-manager-test/src/gpm-statistics.c |
111 |
--- mate-power-manager-orig/src/gpm-statistics.c 2013-10-14 22:33:51.552439000 +0200 |
112 |
+++ mate-power-manager-test/src/gpm-statistics.c 2013-11-08 14:38:15.855069197 +0100 |
113 |
@@ -1794,11 +1794,12 @@ main (int argc, char *argv[]) |
114 |
|
115 |
wakeups = up_wakeups_new (); |
116 |
g_signal_connect (wakeups, "data-changed", G_CALLBACK (gpm_stats_data_changed_cb), NULL); |
117 |
- |
118 |
+#if !UP_CHECK_VERSION(0, 99, 0) |
119 |
/* coldplug */ |
120 |
ret = up_client_enumerate_devices_sync (client, NULL, NULL); |
121 |
if (!ret) |
122 |
goto out; |
123 |
+#endif |
124 |
devices = up_client_get_devices (client); |
125 |
|
126 |
/* add devices in visually pleasing order */ |
127 |
@@ -1854,8 +1855,9 @@ main (int argc, char *argv[]) |
128 |
gtk_widget_show (widget); |
129 |
|
130 |
gtk_main (); |
131 |
- |
132 |
+#if !UP_CHECK_VERSION(0, 99, 0) |
133 |
out: |
134 |
+#endif |
135 |
g_object_unref (settings); |
136 |
g_object_unref (client); |
137 |
g_object_unref (wakeups); |