From: Jan Rękorajski Date: Wed, 16 Apr 2014 18:44:38 +0000 (+0200) Subject: - added upower 0.99.0 support patches from fedora X-Git-Tag: auto/th/mate-power-manager-1.8.0-2 X-Git-Url: http://git.pld-linux.org/gitweb.cgi?a=commitdiff_plain;h=51e6162aa705d87639908c8dc88e59ef84cc9407;p=packages%2Fmate-power-manager.git - added upower 0.99.0 support patches from fedora - rel 2 --- diff --git a/mate-power-manager.spec b/mate-power-manager.spec index 391fe25..0f33376 100644 --- a/mate-power-manager.spec +++ b/mate-power-manager.spec @@ -7,12 +7,17 @@ Summary: MATE power management service Summary(pl.UTF-8): Usługa zarządzania energią dla MATE Name: mate-power-manager Version: 1.8.0 -Release: 1 +Release: 2 License: GPL v2+ Group: X11/Applications Source0: http://pub.mate-desktop.org/releases/1.8/%{name}-%{version}.tar.xz # Source0-md5: 09688f0422adce20de79f17d2f7a07b0 Patch0: uidir.patch +Patch1: mate-power-manager_upower.patch +Patch2: mate-power-manager_upower-remove-recall.patch +Patch3: mate-power-manager_upower-use-g_signal-notify.patch +Patch4: mate-power-manager_upower-update-for-libupower-glib-API-changes.patch +Patch5: mate-power-manager_fix-use-g_signal-notify.patch URL: http://wiki.mate-desktop.org/mate-power-manager BuildRequires: autoconf >= 2.63 BuildRequires: automake >= 1:1.9 @@ -79,6 +84,11 @@ interaktywnej sesji MATE. %prep %setup -q %patch0 -p1 +%patch1 -p1 +%patch2 -p1 +%patch3 -p1 +%patch4 -p1 +%patch5 -p1 %build %{__intltoolize} diff --git a/mate-power-manager_fix-use-g_signal-notify.patch b/mate-power-manager_fix-use-g_signal-notify.patch new file mode 100644 index 0000000..3458131 --- /dev/null +++ b/mate-power-manager_fix-use-g_signal-notify.patch @@ -0,0 +1,15 @@ +diff -upr mate-power-manager-orig/src/gpm-manager.c mate-power-manager-test/src/gpm-manager.c +--- mate-power-manager-orig/src/gpm-manager.c 2013-11-09 21:19:14.954669000 +0100 ++++ mate-power-manager-test/src/gpm-manager.c 2013-11-10 15:19:23.540948886 +0100 +@@ -972,9 +972,9 @@ gpm_manager_get_spindown_timeout (GpmMan + **/ + static void + #if UP_CHECK_VERSION(0, 99, 0) +-gpm_manager_client_changed_cb (UpClient *client, GpmManager *manager) +-#else + gpm_manager_client_changed_cb (UpClient *client, GParamSpec *pspec, GpmManager *manager) ++#else ++gpm_manager_client_changed_cb (UpClient *client, GpmManager *manager) + #endif + { + gboolean event_when_closed; diff --git a/mate-power-manager_upower-remove-recall.patch b/mate-power-manager_upower-remove-recall.patch new file mode 100644 index 0000000..7270d7c --- /dev/null +++ b/mate-power-manager_upower-remove-recall.patch @@ -0,0 +1,117 @@ +diff -upr mate-power-manager-orig/data/org.mate.power-manager.gschema.xml.in mate-power-manager-test/data/org.mate.power-manager.gschema.xml.in +--- mate-power-manager-orig/data/org.mate.power-manager.gschema.xml.in 2013-10-21 11:01:49.245340000 +0200 ++++ mate-power-manager-test/data/org.mate.power-manager.gschema.xml.in 2013-11-09 01:00:37.801114147 +0100 +@@ -211,11 +211,6 @@ + <_summary>Seconds of inactivity to spin down when on battery + <_description>The number of seconds of inactivity to spin down the disks when on battery power. + +- +- true +- <_summary>If we should show the recalled battery warning for a broken battery +- <_description>If we should show the recalled battery warning for a broken battery. Set this to false only if you know your battery is okay. +- + + true + <_summary>If we should show the low capacity warning for a broken battery +diff -upr mate-power-manager-orig/src/gpm-engine.c mate-power-manager-test/src/gpm-engine.c +--- mate-power-manager-orig/src/gpm-engine.c 2013-11-08 22:45:52.333993000 +0100 ++++ mate-power-manager-test/src/gpm-engine.c 2013-11-08 23:06:27.444397476 +0100 +@@ -760,6 +760,7 @@ gpm_engine_device_add (GpmEngine *engine + } + } + ++#if !UP_CHECK_VERSION(0, 99, 0) + /** + * gpm_engine_check_recall: + **/ +@@ -795,7 +796,7 @@ out: + g_free (recall_url); + return recall_notice; + } +- ++#endif + /** + * gpm_engine_coldplug_idle_cb: + **/ +@@ -831,7 +832,9 @@ gpm_engine_coldplug_idle_cb (GpmEngine * + for (i=0;ilen;i++) { + device = g_ptr_array_index (array, i); + gpm_engine_device_add (engine, device); ++#if !UP_CHECK_VERSION(0, 99, 0) + gpm_engine_check_recall (engine, device); ++#endif + } + #if !UP_CHECK_VERSION(0, 99, 0) + out: +@@ -850,7 +853,9 @@ gpm_engine_device_added_cb (UpClient *cl + { + /* add to list */ + g_ptr_array_add (engine->priv->array, g_object_ref (device)); ++#if !UP_CHECK_VERSION(0, 99, 0) + gpm_engine_check_recall (engine, device); ++#endif + + gpm_engine_recalculate_state (engine); + } +@@ -1154,6 +1159,7 @@ gpm_engine_class_init (GpmEngineClass *k + G_STRUCT_OFFSET (GpmEngineClass, low_capacity), + NULL, NULL, g_cclosure_marshal_VOID__POINTER, + G_TYPE_NONE, 1, G_TYPE_POINTER); ++#if !UP_CHECK_VERSION(0, 99, 0) + signals [PERHAPS_RECALL] = + g_signal_new ("perhaps-recall", + G_TYPE_FROM_CLASS (object_class), +@@ -1162,6 +1168,7 @@ gpm_engine_class_init (GpmEngineClass *k + NULL, NULL, gpm_marshal_VOID__POINTER_STRING_STRING, + G_TYPE_NONE, + 3, G_TYPE_POINTER, G_TYPE_STRING, G_TYPE_STRING); ++#endif + signals [FULLY_CHARGED] = + g_signal_new ("fully-charged", + G_TYPE_FROM_CLASS (object_class), +diff -upr mate-power-manager-orig/src/gpm-engine.h mate-power-manager-test/src/gpm-engine.h +--- mate-power-manager-orig/src/gpm-engine.h 2013-10-14 22:33:51.547439000 +0200 ++++ mate-power-manager-test/src/gpm-engine.h 2013-11-08 22:59:05.547961683 +0100 +@@ -49,10 +49,12 @@ typedef struct + gchar *icon); + void (* summary_changed) (GpmEngine *engine, + gchar *status); ++#if !UP_CHECK_VERSION(0, 99, 0) + void (* perhaps_recall) (GpmEngine *engine, + UpDevice *device, + const gchar *oem_vendor, + const gchar *website); ++#endif + void (* low_capacity) (GpmEngine *engine, + UpDevice *device); + void (* charge_low) (GpmEngine *engine, +diff -upr mate-power-manager-orig/src/gpm-manager.c mate-power-manager-test/src/gpm-manager.c +--- mate-power-manager-orig/src/gpm-manager.c 2013-10-14 22:33:51.549439000 +0200 ++++ mate-power-manager-test/src/gpm-manager.c 2013-11-08 23:02:10.741820700 +0100 +@@ -1090,6 +1090,7 @@ gpm_manager_settings_changed_cb (GSettin + gpm_manager_sync_policy_sleep (manager); + } + ++#if !UP_CHECK_VERSION(0, 99, 0) + /** + * gpm_manager_perhaps_recall_response_cb: + */ +@@ -1194,6 +1195,7 @@ gpm_manager_engine_perhaps_recall_cb (Gp + /* delay by a few seconds so the panel can load */ + g_timeout_add_seconds (GPM_MANAGER_RECALL_DELAY, (GSourceFunc) gpm_manager_perhaps_recall_delay_cb, manager); + } ++#endif + + /** + * gpm_manager_engine_icon_changed_cb: +@@ -2020,8 +2022,10 @@ gpm_manager_init (GpmManager *manager) + gpm_manager_sync_policy_sleep (manager); + + manager->priv->engine = gpm_engine_new (); ++#if !UP_CHECK_VERSION(0, 99, 0) + g_signal_connect (manager->priv->engine, "perhaps-recall", + G_CALLBACK (gpm_manager_engine_perhaps_recall_cb), manager); ++#endif + g_signal_connect (manager->priv->engine, "low-capacity", + G_CALLBACK (gpm_manager_engine_low_capacity_cb), manager); + g_signal_connect (manager->priv->engine, "icon-changed", diff --git a/mate-power-manager_upower-update-for-libupower-glib-API-changes.patch b/mate-power-manager_upower-update-for-libupower-glib-API-changes.patch new file mode 100644 index 0000000..8a2e003 --- /dev/null +++ b/mate-power-manager_upower-update-for-libupower-glib-API-changes.patch @@ -0,0 +1,34 @@ +diff -upr mate-power-manager-orig/src/gpm-engine.c mate-power-manager-test/src/gpm-engine.c +--- mate-power-manager-orig/src/gpm-engine.c 2013-11-09 21:19:14.952669000 +0100 ++++ mate-power-manager-test/src/gpm-engine.c 2013-11-09 22:45:14.729415620 +0100 +@@ -868,6 +868,21 @@ gpm_engine_device_added_cb (UpClient *cl + * gpm_engine_device_removed_cb: + **/ + static void ++#if UP_CHECK_VERSION(0, 99, 0) ++gpm_engine_device_removed_cb (UpClient *client, const char *object_path, GpmEngine *engine) ++{ ++ guint i; ++ ++ for (i = 0; i < engine->priv->array->len; i++) { ++ UpDevice *device = g_ptr_array_index (engine->priv->array, i); ++ ++ if (g_strcmp0 (object_path, up_device_get_object_path (device)) == 0) { ++ g_ptr_array_remove_index (engine->priv->array, i); ++ break; ++ } ++ } ++} ++#else + gpm_engine_device_removed_cb (UpClient *client, UpDevice *device, GpmEngine *engine) + { + gboolean ret; +@@ -876,7 +891,7 @@ gpm_engine_device_removed_cb (UpClient * + return; + gpm_engine_recalculate_state (engine); + } +- ++#endif + + /** + * gpm_engine_device_changed_cb: diff --git a/mate-power-manager_upower-use-g_signal-notify.patch b/mate-power-manager_upower-use-g_signal-notify.patch new file mode 100644 index 0000000..367ffb4 --- /dev/null +++ b/mate-power-manager_upower-use-g_signal-notify.patch @@ -0,0 +1,438 @@ +diff -upr mate-power-manager-orig/src/gpm-backlight.c mate-power-manager-test/src/gpm-backlight.c +--- mate-power-manager-orig/src/gpm-backlight.c 2013-10-14 22:33:51.545439000 +0200 ++++ mate-power-manager-test/src/gpm-backlight.c 2013-11-09 18:32:28.473654040 +0100 +@@ -371,7 +371,11 @@ gpm_backlight_brightness_evaluate_and_se + * We might have to do things when the keys change; do them here. + **/ + static void ++#if UP_CHECK_VERSION(0, 99, 0) ++gpm_settings_key_changed_cb (GSettings *settings, const gchar *key, GParamSpec *pspec, GpmBacklight *backlight) ++#else + gpm_settings_key_changed_cb (GSettings *settings, const gchar *key, GpmBacklight *backlight) ++#endif + { + gboolean on_battery; + +@@ -410,7 +414,11 @@ gpm_settings_key_changed_cb (GSettings * + * Does the actions when the ac power source is inserted/removed. + **/ + static void ++#if UP_CHECK_VERSION(0, 99, 0) ++gpm_backlight_client_changed_cb (UpClient *client, GParamSpec *pspec, GpmBacklight *backlight) ++#else + gpm_backlight_client_changed_cb (UpClient *client, GpmBacklight *backlight) ++#endif + { + gpm_backlight_brightness_evaluate_and_set (backlight, FALSE, TRUE); + } +@@ -727,15 +735,24 @@ gpm_backlight_init (GpmBacklight *backli + + /* we use up_client for the ac-adapter-changed signal */ + backlight->priv->client = up_client_new (); ++#if UP_CHECK_VERSION(0, 99, 0) ++ g_signal_connect (backlight->priv->client, "notify", ++ G_CALLBACK (gpm_backlight_client_changed_cb), backlight); ++#else + g_signal_connect (backlight->priv->client, "changed", + G_CALLBACK (gpm_backlight_client_changed_cb), backlight); ++#endif + + /* gets caps */ + backlight->priv->can_dim = gpm_brightness_has_hw (backlight->priv->brightness); + + /* watch for dim value changes */ + backlight->priv->settings = g_settings_new (GPM_SETTINGS_SCHEMA); ++#if UP_CHECK_VERSION(0, 99, 0) ++ g_signal_connect (backlight->priv->settings, "notify", G_CALLBACK (gpm_settings_key_changed_cb), backlight); ++#else + g_signal_connect (backlight->priv->settings, "changed", G_CALLBACK (gpm_settings_key_changed_cb), backlight); ++#endif + + /* set the main brightness, this is designed to be updated if the user changes the + * brightness so we can undim to the 'correct' value */ +diff -upr mate-power-manager-orig/src/gpm-button.c mate-power-manager-test/src/gpm-button.c +--- mate-power-manager-orig/src/gpm-button.c 2013-10-14 22:33:51.546439000 +0200 ++++ mate-power-manager-test/src/gpm-button.c 2013-11-09 18:52:29.023698446 +0100 +@@ -324,7 +324,11 @@ gpm_button_reset_time (GpmButton *button + * gpm_button_client_changed_cb + **/ + static void ++#if UP_CHECK_VERSION(0, 99, 0) ++gpm_button_client_changed_cb (UpClient *client, GParamSpec *pspec, GpmButton *button) ++#else + gpm_button_client_changed_cb (UpClient *client, GpmButton *button) ++#endif + { + gboolean lid_is_closed; + +@@ -363,9 +367,13 @@ gpm_button_init (GpmButton *button) + + button->priv->client = up_client_new (); + button->priv->lid_is_closed = up_client_get_lid_is_closed (button->priv->client); ++#if UP_CHECK_VERSION(0, 99, 0) ++ g_signal_connect (button->priv->client, "notify", ++ G_CALLBACK (gpm_button_client_changed_cb), button); ++#else + g_signal_connect (button->priv->client, "changed", + G_CALLBACK (gpm_button_client_changed_cb), button); +- ++#endif + /* register the brightness keys */ + gpm_button_xevent_key (button, XF86XK_PowerOff, GPM_BUTTON_POWER); + #ifdef HAVE_XF86XK_SUSPEND +diff -upr mate-power-manager-orig/src/gpm-engine.c mate-power-manager-test/src/gpm-engine.c +--- mate-power-manager-orig/src/gpm-engine.c 2013-11-09 19:24:00.804668000 +0100 ++++ mate-power-manager-test/src/gpm-engine.c 2013-11-09 19:33:10.997189469 +0100 +@@ -511,7 +511,11 @@ gpm_engine_recalculate_state (GpmEngine + * gpm_engine_settings_key_changed_cb: + **/ + static void ++#if UP_CHECK_VERSION(0, 99, 0) ++gpm_engine_settings_key_changed_cb (GSettings *settings, const gchar *key, GParamSpec *pspec, GpmEngine *engine) ++#else + gpm_engine_settings_key_changed_cb (GSettings *settings, const gchar *key, GpmEngine *engine) ++#endif + { + + if (g_strcmp0 (key, GPM_SETTINGS_USE_TIME_POLICY) == 0) { +@@ -878,7 +882,11 @@ gpm_engine_device_removed_cb (UpClient * + * gpm_engine_device_changed_cb: + **/ + static void ++#if UP_CHECK_VERSION(0, 99, 0) ++gpm_engine_device_changed_cb (UpClient *client, UpDevice *device, GParamSpec *pspec, GpmEngine *engine) ++#else + gpm_engine_device_changed_cb (UpClient *client, UpDevice *device, GpmEngine *engine) ++#endif + { + UpDeviceKind kind; + UpDeviceState state; +@@ -1060,12 +1068,23 @@ gpm_engine_init (GpmEngine *engine) + G_CALLBACK (gpm_engine_device_added_cb), engine); + g_signal_connect (engine->priv->client, "device-removed", + G_CALLBACK (gpm_engine_device_removed_cb), engine); ++#if UP_CHECK_VERSION(0, 99, 0) ++ g_signal_connect (engine->priv->client, "notify", ++ G_CALLBACK (gpm_engine_device_changed_cb), engine); ++#else + g_signal_connect (engine->priv->client, "device-changed", + G_CALLBACK (gpm_engine_device_changed_cb), engine); ++#endif + + engine->priv->settings = g_settings_new (GPM_SETTINGS_SCHEMA); ++#if UP_CHECK_VERSION(0, 99, 0) ++ g_signal_connect (engine->priv->settings, "notify", ++ G_CALLBACK (gpm_engine_settings_key_changed_cb), engine); ++#else + g_signal_connect (engine->priv->settings, "changed", + G_CALLBACK (gpm_engine_settings_key_changed_cb), engine); ++#endif ++ + + engine->priv->phone = gpm_phone_new (); + g_signal_connect (engine->priv->phone, "device-added", +diff -upr mate-power-manager-orig/src/gpm-kbd-backlight.c mate-power-manager-test/src/gpm-kbd-backlight.c +--- mate-power-manager-orig/src/gpm-kbd-backlight.c 2013-10-14 22:33:51.548439000 +0200 ++++ mate-power-manager-test/src/gpm-kbd-backlight.c 2013-11-09 21:05:54.589660859 +0100 +@@ -531,8 +531,13 @@ gpm_kbd_backlight_control_resume_cb (Gpm + * Does the actions when the ac power source is inserted/removed. + **/ + static void ++#if UP_CHECK_VERSION(0, 99, 0) ++gpm_kbd_backlight_client_changed_cb (UpClient *client, GParamSpec *pspec, ++ GpmKbdBacklight *backlight) ++#else + gpm_kbd_backlight_client_changed_cb (UpClient *client, + GpmKbdBacklight *backlight) ++#endif + { + gpm_kbd_backlight_evaluate_power_source_and_set (backlight); + } +@@ -801,8 +806,13 @@ noerr: + + /* Use upower for ac changed signal */ + backlight->priv->client = up_client_new (); ++#if UP_CHECK_VERSION(0, 99, 0) ++ g_signal_connect (backlight->priv->client, "notify", ++ G_CALLBACK (gpm_kbd_backlight_client_changed_cb), backlight); ++#else + g_signal_connect (backlight->priv->client, "changed", + G_CALLBACK (gpm_kbd_backlight_client_changed_cb), backlight); ++#endif + + backlight->priv->settings = g_settings_new (GPM_SETTINGS_SCHEMA); + //g_signal_connect (backlight->priv->settings, "changed", G_CALLBACK (gpm_settings_key_changed_cb), backlight); +diff -upr mate-power-manager-orig/src/gpm-manager.c mate-power-manager-test/src/gpm-manager.c +--- mate-power-manager-orig/src/gpm-manager.c 2013-11-09 01:33:29.050924000 +0100 ++++ mate-power-manager-test/src/gpm-manager.c 2013-11-09 18:33:36.013331734 +0100 +@@ -971,7 +971,11 @@ gpm_manager_get_spindown_timeout (GpmMan + * gpm_manager_client_changed_cb: + **/ + static void ++#if UP_CHECK_VERSION(0, 99, 0) + gpm_manager_client_changed_cb (UpClient *client, GpmManager *manager) ++#else ++gpm_manager_client_changed_cb (UpClient *client, GParamSpec *pspec, GpmManager *manager) ++#endif + { + gboolean event_when_closed; + gint timeout; +@@ -1081,7 +1085,11 @@ gpm_manager_class_init (GpmManagerClass + * We might have to do things when the keys change; do them here. + **/ + static void ++#if UP_CHECK_VERSION(0, 99, 0) ++gpm_manager_settings_changed_cb (GSettings *settings, const gchar *key, GParamSpec *pspec, GpmManager *manager) ++#else + gpm_manager_settings_changed_cb (GSettings *settings, const gchar *key, GpmManager *manager) ++#endif + { + if (g_strcmp0 (key, GPM_SETTINGS_SLEEP_COMPUTER_BATT) == 0 || + g_strcmp0 (key, GPM_SETTINGS_SLEEP_COMPUTER_AC) == 0 || +@@ -1957,11 +1965,19 @@ gpm_manager_init (GpmManager *manager) + manager->priv->notification_fully_charged = NULL; + manager->priv->disks = gpm_disks_new (); + manager->priv->settings = g_settings_new (GPM_SETTINGS_SCHEMA); ++#if UP_CHECK_VERSION(0, 99, 0) ++ g_signal_connect (manager->priv->settings, "notify", ++ G_CALLBACK (gpm_manager_settings_changed_cb), manager); ++ manager->priv->client = up_client_new (); ++ g_signal_connect (manager->priv->client, "notify", ++ G_CALLBACK (gpm_manager_client_changed_cb), manager); ++#else + g_signal_connect (manager->priv->settings, "changed", + G_CALLBACK (gpm_manager_settings_changed_cb), manager); + manager->priv->client = up_client_new (); + g_signal_connect (manager->priv->client, "changed", + G_CALLBACK (gpm_manager_client_changed_cb), manager); ++#endif + + /* use libmatenotify */ + notify_init (GPM_NAME); +diff -upr mate-power-manager-orig/src/gpm-prefs-core.c mate-power-manager-test/src/gpm-prefs-core.c +--- mate-power-manager-orig/src/gpm-prefs-core.c 2013-11-08 21:19:48.232969000 +0100 ++++ mate-power-manager-test/src/gpm-prefs-core.c 2013-11-09 18:34:33.846912025 +0100 +@@ -156,7 +156,11 @@ gpm_prefs_format_percentage_cb (GtkScale + * gpm_prefs_action_combo_changed_cb: + **/ + static void ++#if UP_CHECK_VERSION(0, 99, 0) ++gpm_prefs_action_combo_changed_cb (GtkWidget *widget, GParamSpec *pspec, GpmPrefs *prefs) ++#else + gpm_prefs_action_combo_changed_cb (GtkWidget *widget, GpmPrefs *prefs) ++#endif + { + GpmActionPolicy policy; + const GpmActionPolicy *actions; +@@ -175,7 +179,11 @@ gpm_prefs_action_combo_changed_cb (GtkWi + * gpm_prefs_action_time_changed_cb: + **/ + static void ++#if UP_CHECK_VERSION(0, 99, 0) ++gpm_prefs_action_time_changed_cb (GtkWidget *widget, GParamSpec *pspec, GpmPrefs *prefs) ++#else + gpm_prefs_action_time_changed_cb (GtkWidget *widget, GpmPrefs *prefs) ++#endif + { + guint value; + const gint *values; +@@ -254,8 +262,13 @@ gpm_prefs_setup_action_combo (GpmPrefs * + + array = g_ptr_array_new (); + g_object_set_data (G_OBJECT (widget), "settings_key", (gpointer) gpm_pref_key); ++#if UP_CHECK_VERSION(0, 99, 0) ++ g_signal_connect (G_OBJECT (widget), "notify", ++ G_CALLBACK (gpm_prefs_action_combo_changed_cb), prefs); ++#else + g_signal_connect (G_OBJECT (widget), "changed", + G_CALLBACK (gpm_prefs_action_combo_changed_cb), prefs); ++#endif + + for (i=0; actions[i] != -1; i++) { + policy = actions[i]; +@@ -389,8 +402,13 @@ gpm_prefs_setup_time_combo (GpmPrefs *pr + } + + /* connect after set */ ++#if UP_CHECK_VERSION(0, 99, 0) ++ g_signal_connect (G_OBJECT (widget), "notify", ++ G_CALLBACK (gpm_prefs_action_time_changed_cb), prefs); ++#else + g_signal_connect (G_OBJECT (widget), "changed", + G_CALLBACK (gpm_prefs_action_time_changed_cb), prefs); ++#endif + } + + /** +diff -upr mate-power-manager-orig/src/gpm-statistics.c mate-power-manager-test/src/gpm-statistics.c +--- mate-power-manager-orig/src/gpm-statistics.c 2013-11-08 21:19:48.233969000 +0100 ++++ mate-power-manager-test/src/gpm-statistics.c 2013-11-09 19:40:14.983443786 +0100 +@@ -1139,7 +1139,11 @@ gpm_stats_button_update_ui (void) + * gpm_stats_devices_treeview_clicked_cb: + **/ + static void ++#if UP_CHECK_VERSION(0, 99, 0) ++gpm_stats_devices_treeview_clicked_cb (GtkTreeSelection *selection, GParamSpec *pspec, gboolean data) ++#else + gpm_stats_devices_treeview_clicked_cb (GtkTreeSelection *selection, gboolean data) ++#endif + { + GtkTreeModel *model; + GtkTreeIter iter; +@@ -1236,7 +1240,11 @@ gpm_stats_device_added_cb (UpClient *cli + * gpm_stats_device_changed_cb: + **/ + static void ++#if UP_CHECK_VERSION(0, 99, 0) ++gpm_stats_device_changed_cb (UpClient *client, UpDevice *device, GParamSpec *pspec, gpointer user_data) ++#else + gpm_stats_device_changed_cb (UpClient *client, UpDevice *device, gpointer user_data) ++#endif + { + const gchar *object_path; + object_path = up_device_get_object_path (device); +@@ -1281,7 +1289,11 @@ gpm_stats_device_removed_cb (UpClient *c + * gpm_stats_history_type_combo_changed_cb: + **/ + static void ++#if UP_CHECK_VERSION(0, 99, 0) ++gpm_stats_history_type_combo_changed_cb (GtkWidget *widget, GParamSpec *pspec, gpointer data) ++#else + gpm_stats_history_type_combo_changed_cb (GtkWidget *widget, gpointer data) ++#endif + { + guint active; + const gchar *axis_x = NULL; +@@ -1333,7 +1345,11 @@ gpm_stats_history_type_combo_changed_cb + * gpm_stats_type_combo_changed_cb: + **/ + static void ++#if UP_CHECK_VERSION(0, 99, 0) ++gpm_stats_type_combo_changed_cb (GtkWidget *widget, GParamSpec *pspec, gpointer data) ++#else + gpm_stats_type_combo_changed_cb (GtkWidget *widget, gpointer data) ++#endif + { + guint active; + const gchar *axis_x = NULL; +@@ -1385,7 +1401,11 @@ gpm_stats_type_combo_changed_cb (GtkWidg + * gpm_stats_range_combo_changed: + **/ + static void ++#if UP_CHECK_VERSION(0, 99, 0) ++gpm_stats_range_combo_changed (GtkWidget *widget, GParamSpec *pspec, gpointer data) ++#else + gpm_stats_range_combo_changed (GtkWidget *widget, gpointer data) ++#endif + { + guint active; + +@@ -1692,8 +1712,13 @@ main (int argc, char *argv[]) + gtk_tree_view_set_model (GTK_TREE_VIEW (widget), + GTK_TREE_MODEL (list_store_devices)); + selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (widget)); ++#if UP_CHECK_VERSION(0, 99, 0) ++ g_signal_connect (selection, "notify", ++ G_CALLBACK (gpm_stats_devices_treeview_clicked_cb), NULL); ++#else + g_signal_connect (selection, "changed", + G_CALLBACK (gpm_stats_devices_treeview_clicked_cb), NULL); ++#endif + + /* add columns to the tree view */ + gpm_stats_add_devices_columns (GTK_TREE_VIEW (widget)); +@@ -1736,8 +1761,13 @@ main (int argc, char *argv[]) + gtk_combo_box_set_active (GTK_COMBO_BOX (widget), 0); + else + gtk_combo_box_set_active (GTK_COMBO_BOX (widget), 1); ++#if UP_CHECK_VERSION(0, 99, 0) ++ g_signal_connect (G_OBJECT (widget), "notify", ++ G_CALLBACK (gpm_stats_history_type_combo_changed_cb), NULL); ++#else + g_signal_connect (G_OBJECT (widget), "changed", + G_CALLBACK (gpm_stats_history_type_combo_changed_cb), NULL); ++#endif + + widget = GTK_WIDGET (gtk_builder_get_object (builder, "combobox_stats_type")); + gpm_stats_set_combo_simple_text (widget); +@@ -1762,8 +1792,13 @@ main (int argc, char *argv[]) + gtk_combo_box_set_active (GTK_COMBO_BOX (widget), 0); + else + gtk_combo_box_set_active (GTK_COMBO_BOX (widget), 3); ++#if UP_CHECK_VERSION(0, 99, 0) ++ g_signal_connect (G_OBJECT (widget), "notify", ++ G_CALLBACK (gpm_stats_type_combo_changed_cb), NULL); ++#else + g_signal_connect (G_OBJECT (widget), "changed", + G_CALLBACK (gpm_stats_type_combo_changed_cb), NULL); ++#endif + + widget = GTK_WIDGET (gtk_builder_get_object (builder, "combobox_history_time")); + gpm_stats_set_combo_simple_text (widget); +@@ -1787,8 +1822,13 @@ main (int argc, char *argv[]) + gtk_combo_box_set_active (GTK_COMBO_BOX (widget), 1); + else + gtk_combo_box_set_active (GTK_COMBO_BOX (widget), 2); ++#if UP_CHECK_VERSION(0, 99, 0) ++ g_signal_connect (G_OBJECT (widget), "notify", ++ G_CALLBACK (gpm_stats_range_combo_changed), NULL); ++#else + g_signal_connect (G_OBJECT (widget), "changed", + G_CALLBACK (gpm_stats_range_combo_changed), NULL); ++#endif + + client = up_client_new (); + +@@ -1815,7 +1855,11 @@ main (int argc, char *argv[]) + /* connect now the coldplug is done */ + g_signal_connect (client, "device-added", G_CALLBACK (gpm_stats_device_added_cb), NULL); + g_signal_connect (client, "device-removed", G_CALLBACK (gpm_stats_device_removed_cb), NULL); ++#if UP_CHECK_VERSION(0, 99, 0) ++ g_signal_connect (client, "notify", G_CALLBACK (gpm_stats_device_changed_cb), NULL); ++#else + g_signal_connect (client, "device-changed", G_CALLBACK (gpm_stats_device_changed_cb), NULL); ++#endif + + /* set current device */ + if (devices->len > 0) { +@@ -1847,9 +1891,9 @@ main (int argc, char *argv[]) + + /* set axis */ + widget = GTK_WIDGET (gtk_builder_get_object (builder, "combobox_history_type")); +- gpm_stats_history_type_combo_changed_cb (widget, NULL); ++ gpm_stats_history_type_combo_changed_cb (widget, NULL, NULL); + widget = GTK_WIDGET (gtk_builder_get_object (builder, "combobox_stats_type")); +- gpm_stats_type_combo_changed_cb (widget, NULL); ++ gpm_stats_type_combo_changed_cb (widget, NULL, NULL); + + widget = GTK_WIDGET (gtk_builder_get_object (builder, "dialog_stats")); + gtk_widget_show (widget); +diff -upr mate-power-manager-orig/src/gpm-tray-icon.c mate-power-manager-test/src/gpm-tray-icon.c +--- mate-power-manager-orig/src/gpm-tray-icon.c 2013-10-14 22:33:51.552439000 +0200 ++++ mate-power-manager-test/src/gpm-tray-icon.c 2013-11-09 18:34:52.573099918 +0100 +@@ -343,7 +343,11 @@ gpm_tray_icon_activate_cb (GtkStatusIcon + * We might have to do things when the settings change; do them here. + **/ + static void ++#if UP_CHECK_VERSION(0, 99, 0) ++gpm_tray_icon_settings_changed_cb (GSettings *settings, const gchar *key, GParamSpec *pspec, GpmTrayIcon *icon) ++#else + gpm_tray_icon_settings_changed_cb (GSettings *settings, const gchar *key, GpmTrayIcon *icon) ++#endif + { + gboolean allowed_in_menu; + +@@ -368,8 +372,13 @@ gpm_tray_icon_init (GpmTrayIcon *icon) + icon->priv->engine = gpm_engine_new (); + + icon->priv->settings = g_settings_new (GPM_SETTINGS_SCHEMA); ++#if UP_CHECK_VERSION(0, 99, 0) ++ g_signal_connect (icon->priv->settings, "notify", ++ G_CALLBACK (gpm_tray_icon_settings_changed_cb), icon); ++#else + g_signal_connect (icon->priv->settings, "changed", + G_CALLBACK (gpm_tray_icon_settings_changed_cb), icon); ++#endif + + icon->priv->status_icon = gtk_status_icon_new (); + g_signal_connect_object (G_OBJECT (icon->priv->status_icon), diff --git a/mate-power-manager_upower.patch b/mate-power-manager_upower.patch new file mode 100644 index 0000000..ae2e097 --- /dev/null +++ b/mate-power-manager_upower.patch @@ -0,0 +1,137 @@ +diff -upr mate-power-manager-orig/src/gpm-control.c mate-power-manager-test/src/gpm-control.c +--- mate-power-manager-orig/src/gpm-control.c 2013-11-01 01:49:11.015502000 +0100 ++++ mate-power-manager-test/src/gpm-control.c 2013-11-08 11:41:38.444731266 +0100 +@@ -288,10 +288,11 @@ gpm_control_suspend (GpmControl *control + } + g_object_unref(proxy); + } ++#if !UP_CHECK_VERSION(0, 99, 0) + else { + ret = up_client_suspend_sync (control->priv->client, NULL, error); + } +- ++#endif + egg_debug ("emitting resume"); + g_signal_emit (control, signals [RESUME], 0, GPM_CONTROL_ACTION_SUSPEND); + +@@ -398,10 +399,11 @@ gpm_control_hibernate (GpmControl *contr + ret = TRUE; + } + } ++#if !UP_CHECK_VERSION(0, 99, 0) + else { + ret = up_client_hibernate_sync (control->priv->client, NULL, error); + } +- ++#endif + egg_debug ("emitting resume"); + g_signal_emit (control, signals [RESUME], 0, GPM_CONTROL_ACTION_HIBERNATE); + +diff -upr mate-power-manager-orig/src/gpm-engine.c mate-power-manager-test/src/gpm-engine.c +--- mate-power-manager-orig/src/gpm-engine.c 2013-10-14 22:33:51.547439000 +0200 ++++ mate-power-manager-test/src/gpm-engine.c 2013-11-08 14:37:29.681600913 +0100 +@@ -805,12 +805,14 @@ gpm_engine_coldplug_idle_cb (GpmEngine * + guint i; + GPtrArray *array = NULL; + UpDevice *device; ++#if !UP_CHECK_VERSION(0, 99, 0) + gboolean ret; + GError *error = NULL; ++#endif + + g_return_val_if_fail (engine != NULL, FALSE); + g_return_val_if_fail (GPM_IS_ENGINE (engine), FALSE); +- ++#if !UP_CHECK_VERSION(0, 99, 0) + /* get devices from UPower */ + ret = up_client_enumerate_devices_sync (engine->priv->client, NULL, &error); + if (!ret) { +@@ -818,7 +820,7 @@ gpm_engine_coldplug_idle_cb (GpmEngine * + g_error_free (error); + goto out; + } +- ++#endif + /* connected mobile phones */ + gpm_phone_coldplug (engine->priv->phone); + +@@ -831,7 +833,9 @@ gpm_engine_coldplug_idle_cb (GpmEngine * + gpm_engine_device_add (engine, device); + gpm_engine_check_recall (engine, device); + } ++#if !UP_CHECK_VERSION(0, 99, 0) + out: ++#endif + if (array != NULL) + g_ptr_array_unref (array); + /* never repeat */ +diff -upr mate-power-manager-orig/src/gpm-prefs-core.c mate-power-manager-test/src/gpm-prefs-core.c +--- mate-power-manager-orig/src/gpm-prefs-core.c 2013-11-01 01:49:00.864400000 +0100 ++++ mate-power-manager-test/src/gpm-prefs-core.c 2013-11-08 15:40:30.067567455 +0100 +@@ -810,7 +810,9 @@ gpm_prefs_init (GpmPrefs *prefs) + UpDevice *device; + UpDeviceKind kind; + GpmBrightness *brightness; ++#if !UP_CHECK_VERSION(0, 99, 0) + gboolean ret; ++#endif + guint i; + + GDBusProxy *proxy; +@@ -896,9 +898,11 @@ gpm_prefs_init (GpmPrefs *prefs) + else { + /* are we allowed to shutdown? */ + egg_console_kit_can_stop (prefs->priv->console, &prefs->priv->can_shutdown, NULL); ++#if !UP_CHECK_VERSION(0, 99, 0) + /* get values from UpClient */ + prefs->priv->can_suspend = up_client_get_can_suspend (prefs->priv->client); + prefs->priv->can_hibernate = up_client_get_can_hibernate (prefs->priv->client); ++#endif + } + + if (LOGIND_RUNNING()) { +@@ -952,14 +956,14 @@ gpm_prefs_init (GpmPrefs *prefs) + brightness = gpm_brightness_new (); + prefs->priv->has_lcd = gpm_brightness_has_hw (brightness); + g_object_unref (brightness); +- ++#if !UP_CHECK_VERSION(0, 99, 0) + /* get device list */ + ret = up_client_enumerate_devices_sync (prefs->priv->client, NULL, &error); + if (!ret) { + egg_warning ("failed to get device list: %s", error->message); + g_error_free (error); + } +- ++#endif + devices = up_client_get_devices (prefs->priv->client); + for (i=0; ilen; i++) { + device = g_ptr_array_index (devices, i); +diff -upr mate-power-manager-orig/src/gpm-statistics.c mate-power-manager-test/src/gpm-statistics.c +--- mate-power-manager-orig/src/gpm-statistics.c 2013-10-14 22:33:51.552439000 +0200 ++++ mate-power-manager-test/src/gpm-statistics.c 2013-11-08 14:38:15.855069197 +0100 +@@ -1794,11 +1794,12 @@ main (int argc, char *argv[]) + + wakeups = up_wakeups_new (); + g_signal_connect (wakeups, "data-changed", G_CALLBACK (gpm_stats_data_changed_cb), NULL); +- ++#if !UP_CHECK_VERSION(0, 99, 0) + /* coldplug */ + ret = up_client_enumerate_devices_sync (client, NULL, NULL); + if (!ret) + goto out; ++#endif + devices = up_client_get_devices (client); + + /* add devices in visually pleasing order */ +@@ -1854,8 +1855,9 @@ main (int argc, char *argv[]) + gtk_widget_show (widget); + + gtk_main (); +- ++#if !UP_CHECK_VERSION(0, 99, 0) + out: ++#endif + g_object_unref (settings); + g_object_unref (client); + g_object_unref (wakeups);