[packages/xfce4-power-manager] - up to 1.3.1
baggins
baggins at pld-linux.org
Fri Aug 15 21:46:00 CEST 2014
commit b40c9133749b6053378f6625611d26919bcd6cab
Author: Jan Rękorajski <baggins at pld-linux.org>
Date: Fri Aug 15 21:45:50 2014 +0200
- up to 1.3.1
0049-Autotools-updates.patch | 27 -
...om-OSD-brightness-popup-use-libnotify-ins.patch | 1418 --------------------
...nore-useless-deprecation-warnings-for-now.patch | 81 --
0074-Don-t-init-thread-on-gobject-3.32.patch | 49 -
...nge-brightness-level-from-glong-to-gint32.patch | 313 -----
0079-Fix-Typo-in-xfpm-power.c.patch | 25 -
0080-Fix-typo-in-error-message.patch | 553 --------
0081-Fix-typo.patch | 744 ----------
...ct-check-for-suspend-permissions-bug-8438.patch | 1418 --------------------
...n-reboot-functionality-for-systemd-Bug-10.patch | 639 ---------
...ystray-icon-in-some-panels-on-battery-rem.patch | 49 -
0147-Display-power-percentage.patch | 42 -
...icon-for-devices-other-than-battery-and-u.patch | 52 -
0149-Update-to-XFCE_PANEL_PLUGIN_REGISTER.patch | 192 ---
...-for-keyboard-backlight-control-Bug-10470.patch | 544 --------
...-systemd-to-handle-suspend-hibernate-even.patch | 128 --
...-info-add-current-percentage-of-batteries.patch | 41 -
...ttery-do-not-show-an-icon-for-HID-devices.patch | 47 -
...-Update-xfce4-session-lock-screen-setting.patch | 137 --
0155-Use-the-online-docs-for-help.patch | 1318 ------------------
0156-Add-xfpm-backlight.c-to-potfiles.patch | 24 -
0157-Remove-the-doc-configure-deps.patch | 53 -
...upport-for-logind-suspend-resume-Bug-9963.patch | 185 ---
0172-Update-min-requirements-and-autotools.patch | 179 ---
...o-libupower-glib-add-support-for-upower-0.patch | 1240 -----------------
...rid-of-XfpmDeviceState-and-XfpmDeviceType.patch | 661 ---------
...light_button_pressed_cb-fix-popup-display.patch | 56 -
0178-Fix-potential-uninitialized-variable.patch | 25 -
...ption-for-network-manager-sleep-Bug-10702.patch | 170 ---
0201-Fix-for-enable-deprecared-and-gseal.patch | 527 --------
0202-Uninitialized-variable-start_time.patch | 25 -
0203-Fix-uninitialized-pointer-read.patch | 81 --
...Warn-when-no-lock-tool-succeeded-Bug-6413.patch | 118 --
xfce4-power-manager.spec | 88 +-
xfpm-enum-types.patch | 71 -
35 files changed, 11 insertions(+), 11309 deletions(-)
---
diff --git a/xfce4-power-manager.spec b/xfce4-power-manager.spec
index 021b63b..e71f6e0 100644
--- a/xfce4-power-manager.spec
+++ b/xfce4-power-manager.spec
@@ -1,46 +1,12 @@
Summary: Power manager for the Xfce desktop environment
Summary(pl.UTF-8): Zarządca energii dla środowiska Xfce
Name: xfce4-power-manager
-Version: 1.2.0
-Release: 2
+Version: 1.3.1
+Release: 1
License: GPL v2
Group: X11/Applications
-Source0: http://archive.xfce.org/src/apps/xfce4-power-manager/1.2/%{name}-%{version}.tar.bz2
-# Source0-md5: 935599b7114b0a4b0e2c9a5d6c72524c
-Patch100: 0049-Autotools-updates.patch
-Patch101: 0061-Remove-custom-OSD-brightness-popup-use-libnotify-ins.patch
-Patch102: 0073-Ignore-useless-deprecation-warnings-for-now.patch
-Patch103: 0074-Don-t-init-thread-on-gobject-3.32.patch
-Patch104: 0075-Change-brightness-level-from-glong-to-gint32.patch
-Patch105: 0079-Fix-Typo-in-xfpm-power.c.patch
-Patch106: 0080-Fix-typo-in-error-message.patch
-Patch107: 0081-Fix-typo.patch
-Patch108: 0082-Fix-incorrect-check-for-suspend-permissions-bug-8438.patch
-Patch109: 0145-Add-shutdown-reboot-functionality-for-systemd-Bug-10.patch
-Patch110: 0146-Fix-empty-systray-icon-in-some-panels-on-battery-rem.patch
-Patch111: 0147-Display-power-percentage.patch
-Patch112: 0148-Fix-status-icon-for-devices-other-than-battery-and-u.patch
-Patch113: 0149-Update-to-XFCE_PANEL_PLUGIN_REGISTER.patch
-Patch114: 0150-Add-support-for-keyboard-backlight-control-Bug-10470.patch
-Patch115: 0151-Don-t-allow-systemd-to-handle-suspend-hibernate-even.patch
-Patch116: 0152-xfpm-power-info-add-current-percentage-of-batteries.patch
-Patch117: 0153-xfpm-battery-do-not-show-an-icon-for-HID-devices.patch
-Patch118: 0154-Update-xfce4-session-lock-screen-setting.patch
-Patch119: 0155-Use-the-online-docs-for-help.patch
-Patch120: 0156-Add-xfpm-backlight.c-to-potfiles.patch
-Patch121: 0157-Remove-the-doc-configure-deps.patch
-Patch122: 0171-Add-support-for-logind-suspend-resume-Bug-9963.patch
-Patch123: 0172-Update-min-requirements-and-autotools.patch
-Patch124: 0175-port-xfpm-to-libupower-glib-add-support-for-upower-0.patch
-Patch125: 0176-get-rid-of-XfpmDeviceState-and-XfpmDeviceType.patch
-Patch126: 0177-xfpm_backlight_button_pressed_cb-fix-popup-display.patch
-Patch127: 0178-Fix-potential-uninitialized-variable.patch
-Patch128: 0200-Add-a-option-for-network-manager-sleep-Bug-10702.patch
-Patch129: 0201-Fix-for-enable-deprecared-and-gseal.patch
-Patch130: 0202-Uninitialized-variable-start_time.patch
-Patch131: 0203-Fix-uninitialized-pointer-read.patch
-Patch132: 0206-Warn-when-no-lock-tool-succeeded-Bug-6413.patch
-Patch133: xfpm-enum-types.patch
+Source0: http://archive.xfce.org/src/apps/xfce4-power-manager/1.3/%{name}-%{version}.tar.bz2
+# Source0-md5: b97bfabe8ad54baa11ac79aadcb6e81a
URL: http://goodies.xfce.org/projects/applications/xfce4-power-manager
BuildRequires: autoconf >= 2.50
BuildRequires: automake >= 1:1.8
@@ -55,8 +21,8 @@ BuildRequires: libxfce4ui-devel >= 4.10.0
BuildRequires: pkgconfig
BuildRequires: rpmbuild(macros) >= 1.601
BuildRequires: upower-devel
-BuildRequires: xfce4-dev-tools >= 4.10.0
-BuildRequires: xfce4-panel-devel >= 4.10.0
+BuildRequires: xfce4-dev-tools >= 4.11.0
+BuildRequires: xfce4-panel-devel >= 4.11.0
BuildRequires: xfconf-devel >= 4.10.0
Requires: gtk-update-icon-cache
Requires: upower
@@ -71,40 +37,6 @@ Zarządca energii dla środowiska Xfce.
%prep
%setup -q
-%patch100 -p1
-%patch101 -p1
-%patch102 -p1
-%patch103 -p1
-%patch104 -p1
-%patch105 -p1
-%patch106 -p1
-%patch107 -p1
-%patch108 -p1
-%patch109 -p1
-%patch110 -p1
-%patch111 -p1
-%patch112 -p1
-%patch113 -p1
-%patch114 -p1
-%patch115 -p1
-%patch116 -p1
-%patch117 -p1
-%patch118 -p1
-%patch119 -p1
-%patch120 -p1
-%patch121 -p1
-%patch122 -p1
-%patch123 -p1
-%patch124 -p1
-%patch125 -p1
-%patch126 -p1
-%patch127 -p1
-%patch128 -p1
-%patch129 -p1
-%patch130 -p1
-%patch131 -p1
-%patch132 -p1
-%patch133 -p1
%build
%{__intltoolize}
@@ -125,6 +57,7 @@ rm -rf $RPM_BUILD_ROOT
DESTDIR=$RPM_BUILD_ROOT
%{__rm} -r $RPM_BUILD_ROOT%{_datadir}/locale/ur_PK
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/xfce4/panel/plugins/libxfce4battery.la
%find_lang %{name}
@@ -141,13 +74,14 @@ rm -rf $RPM_BUILD_ROOT
%defattr(644,root,root,755)
%doc AUTHORS ChangeLog NEWS README TODO
%{_sysconfdir}/xdg/autostart/xfce4-power-manager.desktop
-%attr(755,root,root) %{_bindir}/xfce4-power-information
%attr(755,root,root) %{_bindir}/xfce4-power-manager
%attr(755,root,root) %{_bindir}/xfce4-power-manager-settings
%attr(755,root,root) %{_sbindir}/xfpm-power-backlight-helper
-%attr(755,root,root) %{_libdir}/xfce4/panel/plugins/libxfce4brightness.so
+%attr(755,root,root) %{_sbindir}/xfce4-pm-helper
+%attr(755,root,root) %{_libdir}/xfce4/panel/plugins/libxfce4battery.so
%{_desktopdir}/xfce4-power-manager-settings.desktop
-%{_datadir}/xfce4/panel-plugins/xfce4-brightness-plugin.desktop
+%{_datadir}/xfce4/panel-plugins/xfce4-battery-plugin.desktop
%{_iconsdir}/hicolor/*/*/*
%{_datadir}/polkit-1/actions/org.xfce.power.policy
+%{_datadir}/appdata/xfce4-power-manager.appdata.xml
%{_mandir}/man1/xfce4-power-manager*.1*
diff --git a/0049-Autotools-updates.patch b/0049-Autotools-updates.patch
deleted file mode 100644
index 64aff54..0000000
--- a/0049-Autotools-updates.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 6176d68fc8e9717d2c96ff55e29a42c48e1395e8 Mon Sep 17 00:00:00 2001
-From: Nick Schermer <nick at xfce.org>
-Date: Sun, 6 Jan 2013 12:20:20 +0100
-Subject: [PATCH 049/219] Autotools updates.
-
----
- configure.ac.in | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index aca782a..633b340 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -9,8 +9,8 @@ m4_define([xfpm_version], [xfpm_version_major().xfpm_version_minor().xfpm_versio
- AC_INIT([xfce4-power-manager], [xfpm_version], [http://bugzilla.xfce.org/])
- AC_PREREQ(2.50)
-
--AM_INIT_AUTOMAKE([1.8 dist-bzip2 tar-ustar])
--AM_CONFIG_HEADER([config.h])
-+AM_INIT_AUTOMAKE([1.8 dist-bzip2 tar-ustar no-dist-gzip])
-+AC_CONFIG_HEADERS([config.h])
- AM_MAINTAINER_MODE()
- m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
-
---
-1.9.3
-
diff --git a/0061-Remove-custom-OSD-brightness-popup-use-libnotify-ins.patch b/0061-Remove-custom-OSD-brightness-popup-use-libnotify-ins.patch
deleted file mode 100644
index 5494779..0000000
--- a/0061-Remove-custom-OSD-brightness-popup-use-libnotify-ins.patch
+++ /dev/null
@@ -1,1418 +0,0 @@
-From 5ac47c842bb53ba7ae9240ccd2af7c93fe7eecaf Mon Sep 17 00:00:00 2001
-From: Jannis Pohlmann <jannis at xfce.org>
-Date: Sun, 3 Feb 2013 00:30:48 +0100
-Subject: [PATCH 061/219] Remove custom OSD brightness popup, use libnotify
- instead
-
-The custom rendered OSD popup to indicate the current brightness
-state whenever it changed looked nice but it is better handled in
-the notification daemon. E.g. we could include an extension hint
-in the notification to have xfce4-notifyd render certain
-notifications (e.g. brightness, volume changes) in a different style
-than regular notifications.
-
-This commit simplifies the whole brightness notification logic
-quite a bit.
-
-Signed-off-by: Jannis Pohlmann <jannis at xfce.org>
----
- src/Makefile.am | 4 +-
- src/gsd-media-keys-window.c | 1078 -------------------------------------------
- src/gsd-media-keys-window.h | 71 ---
- src/xfpm-backlight.c | 128 +----
- src/xfpm-notify.c | 2 +-
- 5 files changed, 19 insertions(+), 1264 deletions(-)
- delete mode 100644 src/gsd-media-keys-window.c
- delete mode 100644 src/gsd-media-keys-window.h
-
-diff --git a/src/Makefile.am b/src/Makefile.am
-index eaca181..0435bed 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -37,9 +37,7 @@ xfce4_power_manager_SOURCES = \
- xfpm-polkit.c \
- xfpm-polkit.h \
- xfpm-errors.c \
-- xfpm-errors.h \
-- gsd-media-keys-window.c \
-- gsd-media-keys-window.h
-+ xfpm-errors.h
-
- xfce4_power_manager_CFLAGS = \
- -I$(top_srcdir) \
-diff --git a/src/gsd-media-keys-window.c b/src/gsd-media-keys-window.c
-deleted file mode 100644
-index b2664e2..0000000
---- a/src/gsd-media-keys-window.c
-+++ /dev/null
-@@ -1,1078 +0,0 @@
--/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
-- *
-- * Copyright (C) 2006-2007 William Jon McCann <mccann at jhu.edu>
-- *
-- * This program is free software; you can redistribute it and/or modify
-- * it under the terms of the GNU General Public License as published by
-- * the Free Software Foundation; either version 2 of the License, or
-- * (at your option) any later version.
-- *
-- * This program is distributed in the hope that it will be useful,
-- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-- * GNU General Public License for more details.
-- *
-- * You should have received a copy of the GNU General Public License
-- * along with this program; if not, write to the Free Software
-- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-- *
-- */
--
--#include "config.h"
--
--#include <stdlib.h>
--#include <string.h>
--#include <math.h>
--#include <glib.h>
--#include <glib/gi18n.h>
--#include <gtk/gtk.h>
--
--#include "gsd-media-keys-window.h"
--
--#include "data/interfaces/acme_ui.h"
--
--#define DIALOG_TIMEOUT 2000 /* dialog timeout in ms */
--#define DIALOG_FADE_TIMEOUT 1500 /* timeout before fade starts */
--#define FADE_TIMEOUT 10 /* timeout in ms between each frame of the fade */
--
--#define BG_ALPHA 0.75
--#define FG_ALPHA 1.00
--
--#define GSD_MEDIA_KEYS_WINDOW_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GSD_TYPE_MEDIA_KEYS_WINDOW, GsdMediaKeysWindowPrivate))
--
--struct GsdMediaKeysWindowPrivate
--{
-- guint is_composited : 1;
-- guint hide_timeout_id;
-- guint fade_timeout_id;
-- double fade_out_alpha;
-- GsdMediaKeysWindowAction action;
-- char *icon_name;
-- gboolean show_level;
--
-- guint volume_muted : 1;
-- int volume_level;
--
-- GtkImage *image;
-- GtkWidget *progress;
--};
--
--G_DEFINE_TYPE (GsdMediaKeysWindow, gsd_media_keys_window, GTK_TYPE_WINDOW)
--
--static gboolean
--fade_timeout (GsdMediaKeysWindow *window)
--{
-- if (window->priv->fade_out_alpha <= 0.0) {
-- gtk_widget_hide (GTK_WIDGET (window));
--
-- /* Reset it for the next time */
-- window->priv->fade_out_alpha = 1.0;
-- window->priv->fade_timeout_id = 0;
--
-- return FALSE;
-- } else {
-- GdkRectangle rect;
-- GtkWidget *win = GTK_WIDGET (window);
-- GtkAllocation allocation;
--
-- window->priv->fade_out_alpha -= 0.10;
--
-- rect.x = 0;
-- rect.y = 0;
-- gtk_widget_get_allocation (win, &allocation);
-- rect.width = allocation.width;
-- rect.height = allocation.height;
--
-- gtk_widget_realize (win);
-- gdk_window_invalidate_rect (gtk_widget_get_window (win), &rect, FALSE);
-- }
--
-- return TRUE;
--}
--
--static gboolean
--hide_timeout (GsdMediaKeysWindow *window)
--{
-- if (window->priv->is_composited) {
-- window->priv->hide_timeout_id = 0;
-- window->priv->fade_timeout_id = g_timeout_add (FADE_TIMEOUT,
-- (GSourceFunc) fade_timeout,
-- window);
-- } else {
-- gtk_widget_hide (GTK_WIDGET (window));
-- }
--
-- return FALSE;
--}
--
--static void
--remove_hide_timeout (GsdMediaKeysWindow *window)
--{
-- if (window->priv->hide_timeout_id != 0) {
-- g_source_remove (window->priv->hide_timeout_id);
-- window->priv->hide_timeout_id = 0;
-- }
--
-- if (window->priv->fade_timeout_id != 0) {
-- g_source_remove (window->priv->fade_timeout_id);
-- window->priv->fade_timeout_id = 0;
-- window->priv->fade_out_alpha = 1.0;
-- }
--}
--
--static void
--add_hide_timeout (GsdMediaKeysWindow *window)
--{
-- int timeout;
--
-- if (window->priv->is_composited) {
-- timeout = DIALOG_FADE_TIMEOUT;
-- } else {
-- timeout = DIALOG_TIMEOUT;
-- }
-- window->priv->hide_timeout_id = g_timeout_add (timeout,
-- (GSourceFunc) hide_timeout,
-- window);
--}
--
--static void
--update_window (GsdMediaKeysWindow *window)
--{
-- remove_hide_timeout (window);
-- add_hide_timeout (window);
--
-- if (window->priv->is_composited) {
-- gtk_widget_queue_draw (GTK_WIDGET (window));
-- }
--}
--
--static void
--volume_controls_set_visible (GsdMediaKeysWindow *window,
-- gboolean visible)
--{
-- if (window->priv->progress == NULL)
-- return;
--
-- if (visible) {
-- gtk_widget_show (window->priv->progress);
-- } else {
-- gtk_widget_hide (window->priv->progress);
-- }
--}
--
--static void
--window_set_icon_name (GsdMediaKeysWindow *window,
-- const char *name)
--{
-- if (window->priv->image == NULL)
-- return;
--
-- gtk_image_set_from_icon_name (window->priv->image,
-- name, GTK_ICON_SIZE_DIALOG);
--}
--
--static void
--action_changed (GsdMediaKeysWindow *window)
--{
-- if (! window->priv->is_composited) {
-- switch (window->priv->action) {
-- case GSD_MEDIA_KEYS_WINDOW_ACTION_VOLUME:
-- volume_controls_set_visible (window, TRUE);
--
-- if (window->priv->volume_muted) {
-- window_set_icon_name (window, "audio-volume-muted");
-- } else {
-- window_set_icon_name (window, "audio-volume-high");
-- }
--
-- break;
-- case GSD_MEDIA_KEYS_WINDOW_ACTION_CUSTOM:
-- volume_controls_set_visible (window, window->priv->show_level);
-- window_set_icon_name (window, window->priv->icon_name);
-- break;
-- default:
-- g_assert_not_reached ();
-- break;
-- }
-- }
--
-- update_window (window);
--}
--
--static void
--volume_level_changed (GsdMediaKeysWindow *window)
--{
-- update_window (window);
--
-- if (!window->priv->is_composited && window->priv->progress != NULL) {
-- double fraction;
--
-- fraction = (double) window->priv->volume_level / 100.0;
--
-- gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR (window->priv->progress),
-- fraction);
-- }
--}
--
--static void
--volume_muted_changed (GsdMediaKeysWindow *window)
--{
-- update_window (window);
--
-- if (! window->priv->is_composited) {
-- if (window->priv->volume_muted) {
-- window_set_icon_name (window, "audio-volume-muted");
-- } else {
-- window_set_icon_name (window, "audio-volume-high");
-- }
-- }
--}
--
--void
--gsd_media_keys_window_set_action (GsdMediaKeysWindow *window,
-- GsdMediaKeysWindowAction action)
--{
-- g_return_if_fail (GSD_IS_MEDIA_KEYS_WINDOW (window));
-- g_return_if_fail (action == GSD_MEDIA_KEYS_WINDOW_ACTION_VOLUME);
--
-- if (window->priv->action != action) {
-- window->priv->action = action;
-- action_changed (window);
-- } else {
-- update_window (window);
-- }
--}
--
--void
--gsd_media_keys_window_set_action_custom (GsdMediaKeysWindow *window,
-- const char *icon_name,
-- gboolean show_level)
--{
-- g_return_if_fail (GSD_IS_MEDIA_KEYS_WINDOW (window));
-- g_return_if_fail (icon_name != NULL);
--
-- if (window->priv->action != GSD_MEDIA_KEYS_WINDOW_ACTION_CUSTOM ||
-- g_strcmp0 (window->priv->icon_name, icon_name) != 0 ||
-- window->priv->show_level != show_level) {
-- window->priv->action = GSD_MEDIA_KEYS_WINDOW_ACTION_CUSTOM;
-- g_free (window->priv->icon_name);
-- window->priv->icon_name = g_strdup (icon_name);
-- window->priv->show_level = show_level;
-- action_changed (window);
-- } else {
-- update_window (window);
-- }
--}
--
--void
--gsd_media_keys_window_set_volume_muted (GsdMediaKeysWindow *window,
-- gboolean muted)
--{
-- g_return_if_fail (GSD_IS_MEDIA_KEYS_WINDOW (window));
--
-- if (window->priv->volume_muted != muted) {
-- window->priv->volume_muted = muted;
-- volume_muted_changed (window);
-- }
--}
--
--void
--gsd_media_keys_window_set_volume_level (GsdMediaKeysWindow *window,
-- int level)
--{
-- g_return_if_fail (GSD_IS_MEDIA_KEYS_WINDOW (window));
--
-- if (window->priv->volume_level != level) {
-- window->priv->volume_level = level;
-- volume_level_changed (window);
-- }
--}
--
--static void
--rounded_rectangle (cairo_t* cr,
-- gdouble aspect,
-- gdouble x,
-- gdouble y,
-- gdouble corner_radius,
-- gdouble width,
-- gdouble height)
--{
-- gdouble radius = corner_radius / aspect;
--
-- cairo_move_to (cr, x + radius, y);
--
-- cairo_line_to (cr,
-- x + width - radius,
-- y);
-- cairo_arc (cr,
-- x + width - radius,
-- y + radius,
-- radius,
-- -90.0f * G_PI / 180.0f,
-- 0.0f * G_PI / 180.0f);
-- cairo_line_to (cr,
-- x + width,
-- y + height - radius);
-- cairo_arc (cr,
-- x + width - radius,
-- y + height - radius,
-- radius,
-- 0.0f * G_PI / 180.0f,
-- 90.0f * G_PI / 180.0f);
-- cairo_line_to (cr,
-- x + radius,
-- y + height);
-- cairo_arc (cr,
-- x + radius,
-- y + height - radius,
-- radius,
-- 90.0f * G_PI / 180.0f,
-- 180.0f * G_PI / 180.0f);
-- cairo_line_to (cr,
-- x,
-- y + radius);
-- cairo_arc (cr,
-- x + radius,
-- y + radius,
-- radius,
-- 180.0f * G_PI / 180.0f,
-- 270.0f * G_PI / 180.0f);
-- cairo_close_path (cr);
--}
--
--static GdkPixbuf *
--load_pixbuf (GsdMediaKeysWindow *window,
-- const char *name,
-- int icon_size)
--{
-- GtkIconTheme *theme;
-- GdkPixbuf *pixbuf;
--
-- if (window != NULL && gtk_widget_has_screen (GTK_WIDGET (window))) {
-- theme = gtk_icon_theme_get_for_screen (gtk_widget_get_screen (GTK_WIDGET (window)));
-- } else {
-- theme = gtk_icon_theme_get_default ();
-- }
--
-- pixbuf = gtk_icon_theme_load_icon (theme,
-- name,
-- icon_size,
-- GTK_ICON_LOOKUP_FORCE_SVG,
-- NULL);
--
-- /* make sure the pixbuf is close to the requested size
-- * this is necessary because GTK_ICON_LOOKUP_FORCE_SVG
-- * seems to be broken */
-- if (pixbuf != NULL) {
-- int width;
--
-- width = gdk_pixbuf_get_width (pixbuf);
-- if (width < (float)icon_size * 0.75) {
-- g_object_unref (pixbuf);
-- pixbuf = NULL;
-- }
-- }
--
-- return pixbuf;
--}
--
--static void
--draw_eject (cairo_t *cr,
-- double _x0,
-- double _y0,
-- double width,
-- double height)
--{
-- int box_height;
-- int tri_height;
-- int separation;
--
-- box_height = height * 0.2;
-- separation = box_height / 3;
-- tri_height = height - box_height - separation;
--
-- cairo_rectangle (cr, _x0, _y0 + height - box_height, width, box_height);
--
-- cairo_move_to (cr, _x0, _y0 + tri_height);
-- cairo_rel_line_to (cr, width, 0);
-- cairo_rel_line_to (cr, -width / 2, -tri_height);
-- cairo_rel_line_to (cr, -width / 2, tri_height);
-- cairo_close_path (cr);
-- cairo_set_source_rgba (cr, 1.0, 1.0, 1.0, FG_ALPHA);
-- cairo_fill_preserve (cr);
--
-- cairo_set_source_rgba (cr, 0.6, 0.6, 0.6, FG_ALPHA / 2);
-- cairo_set_line_width (cr, 2);
-- cairo_stroke (cr);
--}
--
--static void
--draw_waves (cairo_t *cr,
-- double cx,
-- double cy,
-- double max_radius,
-- int volume_level)
--{
-- const int n_waves = 3;
-- int last_wave;
-- int i;
--
-- last_wave = n_waves * volume_level / 100;
--
-- for (i = 0; i < n_waves; i++) {
-- double angle1;
-- double angle2;
-- double radius;
-- double alpha;
--
-- angle1 = -M_PI / 4;
-- angle2 = M_PI / 4;
--
-- if (i < last_wave)
-- alpha = 1.0;
-- else if (i > last_wave)
-- alpha = 0.1;
-- else alpha = 0.1 + 0.9 * (n_waves * volume_level % 100) / 100.0;
--
-- radius = (i + 1) * (max_radius / n_waves);
-- cairo_arc (cr, cx, cy, radius, angle1, angle2);
-- cairo_set_source_rgba (cr, 0.6, 0.6, 0.6, alpha / 2);
-- cairo_set_line_width (cr, 14);
-- cairo_set_line_cap (cr, CAIRO_LINE_CAP_ROUND);
-- cairo_stroke_preserve (cr);
--
-- cairo_set_source_rgba (cr, 1.0, 1.0, 1.0, alpha);
-- cairo_set_line_width (cr, 10);
-- cairo_set_line_cap (cr, CAIRO_LINE_CAP_ROUND);
-- cairo_stroke (cr);
-- }
--}
--
--static void
--draw_cross (cairo_t *cr,
-- double cx,
-- double cy,
-- double size)
--{
-- cairo_move_to (cr, cx, cy - size/2.0);
-- cairo_rel_line_to (cr, size, size);
--
-- cairo_move_to (cr, cx, cy + size/2.0);
-- cairo_rel_line_to (cr, size, -size);
--
-- cairo_set_source_rgba (cr, 0.6, 0.6, 0.6, FG_ALPHA / 2);
-- cairo_set_line_width (cr, 14);
-- cairo_set_line_cap (cr, CAIRO_LINE_CAP_ROUND);
-- cairo_stroke_preserve (cr);
--
-- cairo_set_source_rgba (cr, 1.0, 1.0, 1.0, FG_ALPHA);
-- cairo_set_line_width (cr, 10);
-- cairo_set_line_cap (cr, CAIRO_LINE_CAP_ROUND);
-- cairo_stroke (cr);
--}
--
--static void
--draw_speaker (cairo_t *cr,
-- double cx,
-- double cy,
-- double width,
-- double height)
--{
-- double box_width;
-- double box_height;
-- double _x0;
-- double _y0;
--
-- box_width = width / 3;
-- box_height = height / 3;
--
-- _x0 = cx - (width / 2) + box_width;
-- _y0 = cy - box_height / 2;
--
-- cairo_move_to (cr, _x0, _y0);
-- cairo_rel_line_to (cr, - box_width, 0);
-- cairo_rel_line_to (cr, 0, box_height);
-- cairo_rel_line_to (cr, box_width, 0);
--
-- cairo_line_to (cr, cx + box_width, cy + height / 2);
-- cairo_rel_line_to (cr, 0, -height);
-- cairo_line_to (cr, _x0, _y0);
-- cairo_close_path (cr);
--
-- cairo_set_source_rgba (cr, 1.0, 1.0, 1.0, FG_ALPHA);
-- cairo_fill_preserve (cr);
--
-- cairo_set_source_rgba (cr, 0.6, 0.6, 0.6, FG_ALPHA / 2);
-- cairo_set_line_width (cr, 2);
-- cairo_stroke (cr);
--}
--
--static gboolean
--render_speaker (GsdMediaKeysWindow *window,
-- cairo_t *cr,
-- double _x0,
-- double _y0,
-- double width,
-- double height)
--{
-- GdkPixbuf *pixbuf;
-- int icon_size;
-- int n;
-- static const char *icon_names[] = {
-- "audio-volume-muted",
-- "audio-volume-low",
-- "audio-volume-medium",
-- "audio-volume-high",
-- NULL
-- };
--
-- if (window->priv->volume_muted) {
-- n = 0;
-- } else {
-- /* select image */
-- n = 3 * window->priv->volume_level / 100 + 1;
-- if (n < 1) {
-- n = 1;
-- } else if (n > 3) {
-- n = 3;
-- }
-- }
--
-- icon_size = (int)width;
--
-- pixbuf = load_pixbuf (window, icon_names[n], icon_size);
--
-- if (pixbuf == NULL) {
-- return FALSE;
-- }
--
-- gdk_cairo_set_source_pixbuf (cr, pixbuf, _x0, _y0);
-- cairo_paint_with_alpha (cr, FG_ALPHA);
--
-- g_object_unref (pixbuf);
--
-- return TRUE;
--}
--
--static void
--color_reverse (const GdkColor *a,
-- GdkColor *b)
--{
-- gdouble red;
-- gdouble green;
-- gdouble blue;
-- gdouble h;
-- gdouble s;
-- gdouble v;
--
-- red = (gdouble) a->red / 65535.0;
-- green = (gdouble) a->green / 65535.0;
-- blue = (gdouble) a->blue / 65535.0;
--
-- gtk_rgb_to_hsv (red, green, blue, &h, &s, &v);
--
-- v = 0.5 + (0.5 - v);
-- if (v > 1.0)
-- v = 1.0;
-- else if (v < 0.0)
-- v = 0.0;
--
-- gtk_hsv_to_rgb (h, s, v, &red, &green, &blue);
--
-- b->red = red * 65535.0;
-- b->green = green * 65535.0;
-- b->blue = blue * 65535.0;
--}
--
--static void
--draw_volume_boxes (GsdMediaKeysWindow *window,
-- cairo_t *cr,
-- double percentage,
-- double _x0,
-- double _y0,
-- double width,
-- double height)
--{
-- gdouble x1;
-- GdkColor color;
-- double r, g, b;
-- GtkStyle *style;
--
-- _x0 += 0.5;
-- _y0 += 0.5;
-- height = round (height) - 1;
-- width = round (width) - 1;
-- x1 = round ((width - 1) * percentage);
-- style = gtk_widget_get_style (GTK_WIDGET (window));
--
-- /* bar background */
-- color_reverse (&style->dark[GTK_STATE_NORMAL], &color);
-- r = (float)color.red / 65535.0;
-- g = (float)color.green / 65535.0;
-- b = (float)color.blue / 65535.0;
-- rounded_rectangle (cr, 1.0, _x0, _y0, height / 6, width, height);
-- cairo_set_source_rgba (cr, r, g, b, FG_ALPHA / 2);
-- cairo_fill_preserve (cr);
--
-- /* bar border */
-- color_reverse (&style->light[GTK_STATE_NORMAL], &color);
-- r = (float)color.red / 65535.0;
-- g = (float)color.green / 65535.0;
-- b = (float)color.blue / 65535.0;
-- cairo_set_source_rgba (cr, r, g, b, FG_ALPHA / 2);
-- cairo_set_line_width (cr, 1);
-- cairo_stroke (cr);
--
-- /* bar progress */
-- if (percentage < 0.01)
-- return;
-- color = style->bg[GTK_STATE_NORMAL];
-- r = (float)color.red / 65535.0;
-- g = (float)color.green / 65535.0;
-- b = (float)color.blue / 65535.0;
-- rounded_rectangle (cr, 1.0, _x0 + 0.5, _y0 + 0.5, height / 6 - 0.5, x1, height - 1);
-- cairo_set_source_rgba (cr, r, g, b, FG_ALPHA);
-- cairo_fill (cr);
--}
--
--static void
--draw_action_volume (GsdMediaKeysWindow *window,
-- cairo_t *cr)
--{
-- int window_width;
-- int window_height;
-- double icon_box_width;
-- double icon_box_height;
-- double icon_box_x0;
-- double icon_box_y0;
-- double volume_box_x0;
-- double volume_box_y0;
-- double volume_box_width;
-- double volume_box_height;
-- gboolean res;
--
-- gtk_window_get_size (GTK_WINDOW (window), &window_width, &window_height);
--
-- icon_box_width = round (window_width * 0.65);
-- icon_box_height = round (window_height * 0.65);
-- volume_box_width = icon_box_width;
-- volume_box_height = round (window_height * 0.05);
--
-- icon_box_x0 = (window_width - icon_box_width) / 2;
-- icon_box_y0 = (window_height - icon_box_height - volume_box_height) / 2;
-- volume_box_x0 = round (icon_box_x0);
-- volume_box_y0 = round (icon_box_height + icon_box_y0);
--
--#if 0
-- g_message ("icon box: w=%f h=%f _x0=%f _y0=%f",
-- icon_box_width,
-- icon_box_height,
-- icon_box_x0,
-- icon_box_y0);
-- g_message ("volume box: w=%f h=%f _x0=%f _y0=%f",
-- volume_box_width,
-- volume_box_height,
-- volume_box_x0,
-- volume_box_y0);
--#endif
--
-- res = render_speaker (window,
-- cr,
-- icon_box_x0, icon_box_y0,
-- icon_box_width, icon_box_height);
-- if (! res) {
-- double speaker_width;
-- double speaker_height;
-- double speaker_cx;
-- double speaker_cy;
--
-- speaker_width = icon_box_width * 0.5;
-- speaker_height = icon_box_height * 0.75;
-- speaker_cx = icon_box_x0 + speaker_width / 2;
-- speaker_cy = icon_box_y0 + speaker_height / 2;
--
--#if 0
-- g_message ("speaker box: w=%f h=%f cx=%f cy=%f",
-- speaker_width,
-- speaker_height,
-- speaker_cx,
-- speaker_cy);
--#endif
--
-- /* draw speaker symbol */
-- draw_speaker (cr, speaker_cx, speaker_cy, speaker_width, speaker_height);
--
-- if (! window->priv->volume_muted) {
-- /* draw sound waves */
-- double wave_x0;
-- double wave_y0;
-- double wave_radius;
--
-- wave_x0 = window_width / 2;
-- wave_y0 = speaker_cy;
-- wave_radius = icon_box_width / 2;
--
-- draw_waves (cr, wave_x0, wave_y0, wave_radius, window->priv->volume_level);
-- } else {
-- /* draw 'mute' cross */
-- double cross_x0;
-- double cross_y0;
-- double cross_size;
--
-- cross_size = speaker_width * 3 / 4;
-- cross_x0 = icon_box_x0 + icon_box_width - cross_size;
-- cross_y0 = speaker_cy;
--
-- draw_cross (cr, cross_x0, cross_y0, cross_size);
-- }
-- }
--
-- /* draw volume meter */
-- draw_volume_boxes (window,
-- cr,
-- (double)window->priv->volume_level / 100.0,
-- volume_box_x0,
-- volume_box_y0,
-- volume_box_width,
-- volume_box_height);
--}
--
--static gboolean
--render_custom (GsdMediaKeysWindow *window,
-- cairo_t *cr,
-- double _x0,
-- double _y0,
-- double width,
-- double height)
--{
-- GdkPixbuf *pixbuf;
-- int icon_size;
--
-- icon_size = (int)width;
--
-- pixbuf = load_pixbuf (window, window->priv->icon_name, icon_size);
--
-- if (pixbuf == NULL) {
-- char *name;
-- if (gtk_widget_get_direction (GTK_WIDGET (window)) == GTK_TEXT_DIR_RTL)
-- name = g_strdup_printf ("%s-rtl", window->priv->icon_name);
-- else
-- name = g_strdup_printf ("%s-ltr", window->priv->icon_name);
-- pixbuf = load_pixbuf (window, name, icon_size);
-- g_free (name);
-- if (pixbuf == NULL)
-- return FALSE;
-- }
--
-- gdk_cairo_set_source_pixbuf (cr, pixbuf, _x0, _y0);
-- cairo_paint_with_alpha (cr, FG_ALPHA);
--
-- g_object_unref (pixbuf);
--
-- return TRUE;
--}
--
--static void
--draw_action_custom (GsdMediaKeysWindow *window,
-- cairo_t *cr)
--{
-- int window_width;
-- int window_height;
-- double icon_box_width;
-- double icon_box_height;
-- double icon_box_x0;
-- double icon_box_y0;
-- double bright_box_x0;
-- double bright_box_y0;
-- double bright_box_width;
-- double bright_box_height;
-- gboolean res;
--
-- gtk_window_get_size (GTK_WINDOW (window), &window_width, &window_height);
--
-- icon_box_width = round (window_width * 0.65);
-- icon_box_height = round (window_height * 0.65);
-- bright_box_width = round (icon_box_width);
-- bright_box_height = round (window_height * 0.05);
--
-- icon_box_x0 = (window_width - icon_box_width) / 2;
-- icon_box_y0 = (window_height - icon_box_height - bright_box_height) / 2;
-- bright_box_x0 = round (icon_box_x0);
-- bright_box_y0 = round (icon_box_height + icon_box_y0);
--
--#if 0
-- g_message ("icon box: w=%f h=%f _x0=%f _y0=%f",
-- icon_box_width,
-- icon_box_height,
-- icon_box_x0,
-- icon_box_y0);
-- g_message ("brightness box: w=%f h=%f _x0=%f _y0=%f",
-- bright_box_width,
-- bright_box_height,
-- bright_box_x0,
-- bright_box_y0);
--#endif
--
-- res = render_custom (window,
-- cr,
-- icon_box_x0, icon_box_y0,
-- icon_box_width, icon_box_height);
-- if (! res && g_strcmp0 (window->priv->icon_name, "media-eject") == 0) {
-- /* draw eject symbol */
-- draw_eject (cr,
-- icon_box_x0, icon_box_y0,
-- icon_box_width, icon_box_height);
-- }
--
-- if (window->priv->show_level != FALSE) {
-- /* draw volume meter */
-- draw_volume_boxes (window,
-- cr,
-- (double)window->priv->volume_level / 100.0,
-- bright_box_x0,
-- bright_box_y0,
-- bright_box_width,
-- bright_box_height);
-- }
--}
--
--static void
--draw_action (GsdMediaKeysWindow *window,
-- cairo_t *cr)
--{
-- switch (window->priv->action) {
-- case GSD_MEDIA_KEYS_WINDOW_ACTION_VOLUME:
-- draw_action_volume (window, cr);
-- break;
-- case GSD_MEDIA_KEYS_WINDOW_ACTION_CUSTOM:
-- draw_action_custom (window, cr);
-- break;
-- default:
-- break;
-- }
--}
--
--static gboolean
--on_expose_event (GtkWidget *widget,
-- GdkEventExpose *event,
-- GsdMediaKeysWindow *window)
--{
-- cairo_t *context;
-- cairo_t *cr;
-- cairo_surface_t *surface;
-- int width;
-- int height;
-- GtkStyle *style;
-- GdkColor color;
-- double r, g, b;
--
-- context = gdk_cairo_create (gtk_widget_get_window (widget));
--
-- style = gtk_widget_get_style (widget);
-- cairo_set_operator (context, CAIRO_OPERATOR_SOURCE);
-- gtk_window_get_size (GTK_WINDOW (widget), &width, &height);
--
-- surface = cairo_surface_create_similar (cairo_get_target (context),
-- CAIRO_CONTENT_COLOR_ALPHA,
-- width,
-- height);
--
-- if (cairo_surface_status (surface) != CAIRO_STATUS_SUCCESS) {
-- goto done;
-- }
--
-- cr = cairo_create (surface);
-- if (cairo_status (cr) != CAIRO_STATUS_SUCCESS) {
-- goto done;
-- }
-- cairo_set_source_rgba (cr, 1.0, 1.0, 1.0, 0.0);
-- cairo_set_operator (cr, CAIRO_OPERATOR_OVER);
-- cairo_paint (cr);
--
-- /* draw a box */
-- rounded_rectangle (cr, 1.0, 0.5, 0.5, height / 10, width-1, height-1);
-- color_reverse (&style->bg[GTK_STATE_NORMAL], &color);
-- r = (float)color.red / 65535.0;
-- g = (float)color.green / 65535.0;
-- b = (float)color.blue / 65535.0;
-- cairo_set_source_rgba (cr, r, g, b, BG_ALPHA);
-- cairo_fill_preserve (cr);
--
-- color_reverse (&style->text_aa[GTK_STATE_NORMAL], &color);
-- r = (float)color.red / 65535.0;
-- g = (float)color.green / 65535.0;
-- b = (float)color.blue / 65535.0;
-- cairo_set_source_rgba (cr, r, g, b, BG_ALPHA / 2);
-- cairo_set_line_width (cr, 1);
-- cairo_stroke (cr);
--
-- /* draw action */
-- draw_action (window, cr);
--
-- cairo_destroy (cr);
--
-- /* Make sure we have a transparent background */
-- cairo_rectangle (context, 0, 0, width, height);
-- cairo_set_source_rgba (context, 0.0, 0.0, 0.0, 0.0);
-- cairo_fill (context);
--
-- cairo_set_source_surface (context, surface, 0, 0);
-- cairo_paint_with_alpha (context, window->priv->fade_out_alpha);
--
-- done:
-- if (surface != NULL) {
-- cairo_surface_destroy (surface);
-- }
-- cairo_destroy (context);
--
-- return FALSE;
--}
--
--static void
--gsd_media_keys_window_real_show (GtkWidget *widget)
--{
-- GsdMediaKeysWindow *window;
--
-- if (GTK_WIDGET_CLASS (gsd_media_keys_window_parent_class)->show) {
-- GTK_WIDGET_CLASS (gsd_media_keys_window_parent_class)->show (widget);
-- }
--
-- window = GSD_MEDIA_KEYS_WINDOW (widget);
-- remove_hide_timeout (window);
-- add_hide_timeout (window);
--}
--
--static void
--gsd_media_keys_window_real_hide (GtkWidget *widget)
--{
-- GsdMediaKeysWindow *window;
--
-- if (GTK_WIDGET_CLASS (gsd_media_keys_window_parent_class)->hide) {
-- GTK_WIDGET_CLASS (gsd_media_keys_window_parent_class)->hide (widget);
-- }
--
-- window = GSD_MEDIA_KEYS_WINDOW (widget);
-- remove_hide_timeout (window);
--}
--
--static void
--gsd_media_keys_window_real_realize (GtkWidget *widget)
--{
-- GdkColormap *colormap;
-- GtkAllocation allocation;
-- GdkBitmap *mask;
-- cairo_t *cr;
--
-- colormap = gdk_screen_get_rgba_colormap (gtk_widget_get_screen (widget));
--
-- if (colormap != NULL) {
-- gtk_widget_set_colormap (widget, colormap);
-- }
--
-- if (GTK_WIDGET_CLASS (gsd_media_keys_window_parent_class)->realize) {
-- GTK_WIDGET_CLASS (gsd_media_keys_window_parent_class)->realize (widget);
-- }
--
-- gtk_widget_get_allocation (widget, &allocation);
-- mask = gdk_pixmap_new (gtk_widget_get_window (widget),
-- allocation.width,
-- allocation.height,
-- 1);
-- cr = gdk_cairo_create (mask);
--
-- cairo_set_source_rgba (cr, 1., 1., 1., 0.);
-- cairo_set_operator (cr, CAIRO_OPERATOR_SOURCE);
-- cairo_paint (cr);
--
-- /* make the whole window ignore events */
-- gdk_window_input_shape_combine_mask (gtk_widget_get_window (widget), mask, 0, 0);
-- g_object_unref (mask);
-- cairo_destroy (cr);
--}
--
--static void
--gsd_media_keys_window_class_init (GsdMediaKeysWindowClass *klass)
--{
-- GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
--
-- widget_class->show = gsd_media_keys_window_real_show;
-- widget_class->hide = gsd_media_keys_window_real_hide;
-- widget_class->realize = gsd_media_keys_window_real_realize;
--
-- g_type_class_add_private (klass, sizeof (GsdMediaKeysWindowPrivate));
--}
--
--gboolean
--gsd_media_keys_window_is_valid (GsdMediaKeysWindow *window)
--{
-- GdkScreen *screen = gtk_widget_get_screen (GTK_WIDGET (window));
-- return gdk_screen_is_composited (screen) == window->priv->is_composited;
--}
--
--static void
--gsd_media_keys_window_init (GsdMediaKeysWindow *window)
--{
-- GdkScreen *screen;
--
-- window->priv = GSD_MEDIA_KEYS_WINDOW_GET_PRIVATE (window);
--
-- screen = gtk_widget_get_screen (GTK_WIDGET (window));
--
-- window->priv->is_composited = gdk_screen_is_composited (screen);
--
-- if (window->priv->is_composited) {
-- gdouble scalew, scaleh, scale;
-- gint size;
--
-- gtk_window_set_decorated (GTK_WINDOW (window), FALSE);
-- gtk_widget_set_app_paintable (GTK_WIDGET (window), TRUE);
--
-- /* assume 130x130 on a 640x480 display and scale from there */
-- scalew = gdk_screen_get_width (screen) / 640.0;
-- scaleh = gdk_screen_get_height (screen) / 480.0;
-- scale = MIN (scalew, scaleh);
-- size = 130 * MAX (1, scale);
--
-- gtk_window_set_default_size (GTK_WINDOW (window), size, size);
-- g_signal_connect (window, "expose-event", G_CALLBACK (on_expose_event), window);
--
-- window->priv->fade_out_alpha = 1.0;
-- } else {
-- GtkBuilder *builder;
-- const gchar *objects[] = {"acme_frame", NULL};
-- GtkWidget *frame;
--
-- builder = gtk_builder_new ();
-- gtk_builder_add_objects_from_string (builder, acme_ui, acme_ui_length, (char **)objects, NULL);
--
-- window->priv->image = GTK_IMAGE (gtk_builder_get_object (builder, "acme_image"));
-- window->priv->progress = GTK_WIDGET (gtk_builder_get_object (builder, "acme_volume_progressbar"));
-- frame = GTK_WIDGET (gtk_builder_get_object (builder,
-- "acme_frame"));
--
-- if (frame != NULL) {
-- gtk_container_add (GTK_CONTAINER (window), frame);
-- gtk_widget_show_all (frame);
-- }
--
-- /* The builder needs to stay alive until the window
-- takes ownership of the frame (and its children) */
-- g_object_unref (builder);
-- }
--}
--
--GtkWidget *
--gsd_media_keys_window_new (void)
--{
-- GObject *object;
--
-- object = g_object_new (GSD_TYPE_MEDIA_KEYS_WINDOW,
-- "type", GTK_WINDOW_POPUP,
-- "type-hint", GDK_WINDOW_TYPE_HINT_NOTIFICATION,
-- "skip-taskbar-hint", TRUE,
-- "skip-pager-hint", TRUE,
-- "focus-on-map", FALSE,
-- NULL);
--
-- return GTK_WIDGET (object);
--}
-diff --git a/src/gsd-media-keys-window.h b/src/gsd-media-keys-window.h
-deleted file mode 100644
-index 9c74bf5..0000000
---- a/src/gsd-media-keys-window.h
-+++ /dev/null
-@@ -1,71 +0,0 @@
--/* -*- Mode: C; indent-tabs-mode: nil; c-basic-offset: 8; tab-width: 8 -*-
-- *
-- * Copyright (C) 2006 William Jon McCann <mccann at jhu.edu>
-- *
-- * This program is free software; you can redistribute it and/or
-- * modify it under the terms of the GNU General Public License as
-- * published by the Free Software Foundation; either version 2 of the
-- * License, or (at your option) any later version.
-- *
-- * This program is distributed in the hope that it will be useful,
-- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-- * General Public License for more details.
-- *
-- * You should have received a copy of the GNU General Public
-- * License along with this program; if not, write to the
-- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-- * Boston, MA 02111-1307, USA.
-- *
-- */
--
--#ifndef GSD_MEDIA_KEYS_WINDOW_H
--#define GSD_MEDIA_KEYS_WINDOW_H
--
--#include <glib-object.h>
--#include <gtk/gtk.h>
--
--G_BEGIN_DECLS
--
--#define GSD_TYPE_MEDIA_KEYS_WINDOW (gsd_media_keys_window_get_type ())
--#define GSD_MEDIA_KEYS_WINDOW(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GSD_TYPE_MEDIA_KEYS_WINDOW, GsdMediaKeysWindow))
--#define GSD_MEDIA_KEYS_WINDOW_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GSD_TYPE_MEDIA_KEYS_WINDOW, GsdMediaKeysWindowClass))
--#define GSD_IS_MEDIA_KEYS_WINDOW(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GSD_TYPE_MEDIA_KEYS_WINDOW))
--#define GSD_IS_MEDIA_KEYS_WINDOW_CLASS(klass) (G_TYPE_INSTANCE_GET_CLASS ((klass), GSD_TYPE_MEDIA_KEYS_WINDOW))
--
--typedef struct GsdMediaKeysWindow GsdMediaKeysWindow;
--typedef struct GsdMediaKeysWindowClass GsdMediaKeysWindowClass;
--typedef struct GsdMediaKeysWindowPrivate GsdMediaKeysWindowPrivate;
--
--struct GsdMediaKeysWindow {
-- GtkWindow parent;
--
-- GsdMediaKeysWindowPrivate *priv;
--};
--
--struct GsdMediaKeysWindowClass {
-- GtkWindowClass parent_class;
--};
--
--typedef enum {
-- GSD_MEDIA_KEYS_WINDOW_ACTION_VOLUME,
-- GSD_MEDIA_KEYS_WINDOW_ACTION_CUSTOM
--} GsdMediaKeysWindowAction;
--
--GType gsd_media_keys_window_get_type (void);
--
--GtkWidget * gsd_media_keys_window_new (void);
--void gsd_media_keys_window_set_action (GsdMediaKeysWindow *window,
-- GsdMediaKeysWindowAction action);
--void gsd_media_keys_window_set_action_custom (GsdMediaKeysWindow *window,
-- const char *icon_name,
-- gboolean show_level);
--void gsd_media_keys_window_set_volume_muted (GsdMediaKeysWindow *window,
-- gboolean muted);
--void gsd_media_keys_window_set_volume_level (GsdMediaKeysWindow *window,
-- int level);
--gboolean gsd_media_keys_window_is_valid (GsdMediaKeysWindow *window);
--
--G_END_DECLS
--
--#endif
-diff --git a/src/xfpm-backlight.c b/src/xfpm-backlight.c
-index 73bd5f6..baeeb43 100644
---- a/src/xfpm-backlight.c
-+++ b/src/xfpm-backlight.c
-@@ -42,14 +42,9 @@
- #include "xfpm-debug.h"
- #include "xfpm-icons.h"
-
--#include "gsd-media-keys-window.h"
--
- static void xfpm_backlight_finalize (GObject *object);
-
--static void xfpm_backlight_create_popup (XfpmBacklight *backlight);
--
- #define ALARM_DISABLED 9
--#define BRIGHTNESS_POPUP_SIZE 180
-
- #define XFPM_BACKLIGHT_GET_PRIVATE(o) \
- (G_TYPE_INSTANCE_GET_PRIVATE ((o), XFPM_TYPE_BACKLIGHT, XfpmBacklightPrivate))
-@@ -63,12 +58,8 @@ struct XfpmBacklightPrivate
- XfpmButton *button;
- XfpmNotify *notify;
-
-- GtkWidget *osd;
- NotifyNotification *n;
-
--
-- gulong destroy_id;
--
- gboolean has_hw;
- gboolean on_battery;
-
-@@ -123,12 +114,6 @@ xfpm_backlight_destroy_popup (gpointer data)
-
- backlight = XFPM_BACKLIGHT (data);
-
-- if ( backlight->priv->osd )
-- {
-- gtk_widget_destroy (backlight->priv->osd);
-- backlight->priv->osd = NULL;
-- }
--
- if ( backlight->priv->n )
- {
- g_object_unref (backlight->priv->n);
-@@ -139,120 +124,43 @@ xfpm_backlight_destroy_popup (gpointer data)
- }
-
- static void
--xfpm_backlight_composited_changed_cb (XfpmBacklight *backlight)
--{
-- xfpm_backlight_destroy_popup (backlight);
-- xfpm_backlight_create_popup (backlight);
--}
--
--static void
- xfpm_backlight_show_notification (XfpmBacklight *backlight, gfloat value)
- {
-- gint i;
--
-- static const char *display_icon_name[] =
-- {
-- "notification-display-brightness-off",
-- "notification-display-brightness-low",
-- "notification-display-brightness-medium",
-- "notification-display-brightness-high",
-- "notification-display-brightness-full",
-- NULL
-- };
--
-+ gchar *summary;
-+
-+ /* create the notification on demand */
- if ( backlight->priv->n == NULL )
- {
-- backlight->priv->n = xfpm_notify_new_notification (backlight->priv->notify,
-- " ",
-- "",
-- NULL,
-- 0,
-+ backlight->priv->n = xfpm_notify_new_notification (backlight->priv->notify,
-+ "",
-+ "",
-+ "xfpm-brightness-lcd",
-+ 0,
- XFPM_NOTIFY_NORMAL,
- NULL);
- }
-+
-+ /* generate a human-readable summary for the notification */
-+ summary = g_strdup_printf (_("Brightness: %.0f percent"), value);
-+ notify_notification_update (backlight->priv->n, summary, NULL, NULL);
-+ g_free (summary);
-
-- i = (gint)value / 25;
--
-- if ( i > 4 || i < 0 )
-- return;
--
-- notify_notification_set_hint_int32 (backlight->priv->n,
-- "value",
-- value);
--
-- notify_notification_set_hint_string (backlight->priv->n,
-- "x-canonical-private-synchronous",
-- "brightness");
-+ /* add the brightness value to the notification */
-+ notify_notification_set_hint_int32 (backlight->priv->n, "value", value);
-
-- notify_notification_update (backlight->priv->n,
-- " ",
-- "",
-- display_icon_name[i]);
--
-+ /* show the notification */
- notify_notification_show (backlight->priv->n, NULL);
- }
-
- static void
--xfpm_backlight_create_popup (XfpmBacklight *backlight)
--{
-- if ( backlight->priv->osd != NULL )
-- return;
--
-- backlight->priv->osd = gsd_media_keys_window_new ();
-- gsd_media_keys_window_set_action_custom (GSD_MEDIA_KEYS_WINDOW (backlight->priv->osd),
-- XFPM_DISPLAY_BRIGHTNESS_ICON,
-- TRUE);
-- gtk_window_set_position (GTK_WINDOW (backlight->priv->osd), GTK_WIN_POS_CENTER);
--
-- g_signal_connect_swapped (backlight->priv->osd, "composited-changed",
-- G_CALLBACK (xfpm_backlight_composited_changed_cb), backlight);
--
--}
--
--static void
- xfpm_backlight_show (XfpmBacklight *backlight, gint level)
- {
- gfloat value;
-- gboolean sync_notify;
-- gboolean show_popup;
-
- XFPM_DEBUG ("Level %u", level);
-
-- g_object_get (G_OBJECT (backlight->priv->conf),
-- SHOW_BRIGHTNESS_POPUP, &show_popup,
-- NULL);
--
-- if ( !show_popup )
-- goto out;
--
-- g_object_get (G_OBJECT (backlight->priv->notify),
-- "sync", &sync_notify,
-- NULL);
--
- value = (gfloat) 100 * level / backlight->priv->max_level;
--
-- if ( !sync_notify ) /*Notification server doesn't support sync notifications*/
-- {
-- xfpm_backlight_create_popup (backlight);
-- gsd_media_keys_window_set_volume_level (GSD_MEDIA_KEYS_WINDOW (backlight->priv->osd),
-- round (value));
-- if ( !GTK_WIDGET_VISIBLE (backlight->priv->osd))
-- gtk_window_present (GTK_WINDOW (backlight->priv->osd));
-- }
-- else
-- {
-- xfpm_backlight_show_notification (backlight, value);
-- }
--
-- if ( backlight->priv->destroy_id != 0 )
-- {
-- g_source_remove (backlight->priv->destroy_id);
-- backlight->priv->destroy_id = 0;
-- }
--
--out:
-- /* Release the memory after 60 seconds */
-- backlight->priv->destroy_id = g_timeout_add_seconds (60, (GSourceFunc) xfpm_backlight_destroy_popup, backlight);
-+ xfpm_backlight_show_notification (backlight, value);
- }
-
-
-@@ -386,7 +294,6 @@ xfpm_backlight_init (XfpmBacklight *backlight)
- backlight->priv->brightness = xfpm_brightness_new ();
- backlight->priv->has_hw = xfpm_brightness_setup (backlight->priv->brightness);
-
-- backlight->priv->osd = NULL;
- backlight->priv->notify = NULL;
- backlight->priv->idle = NULL;
- backlight->priv->conf = NULL;
-@@ -394,7 +301,6 @@ xfpm_backlight_init (XfpmBacklight *backlight)
- backlight->priv->power = NULL;
- backlight->priv->dimmed = FALSE;
- backlight->priv->block = FALSE;
-- backlight->priv->destroy_id = 0;
-
- if ( !backlight->priv->has_hw )
- {
-diff --git a/src/xfpm-notify.c b/src/xfpm-notify.c
-index 9b485aa..e4fd548 100644
---- a/src/xfpm-notify.c
-+++ b/src/xfpm-notify.c
-@@ -69,7 +69,7 @@ struct XfpmNotifyPrivate
- gulong notify_id;
-
- gboolean supports_actions;
-- gboolean supports_sync; /*For x-canonical-private-synchronous */
-+ gboolean supports_sync; /* For x-canonical-private-synchronous */
- };
-
- enum
---
-1.9.3
-
diff --git a/0073-Ignore-useless-deprecation-warnings-for-now.patch b/0073-Ignore-useless-deprecation-warnings-for-now.patch
deleted file mode 100644
index c37cfc0..0000000
--- a/0073-Ignore-useless-deprecation-warnings-for-now.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-From 83f83ffb63e8d55a0d44ca5a38765f0ea058de1d Mon Sep 17 00:00:00 2001
-From: Nick Schermer <nick at xfce.org>
-Date: Tue, 23 Jul 2013 11:26:21 +0200
-Subject: [PATCH 073/219] Ignore useless deprecation warnings for now.
-
----
- src/xfpm-polkit.c | 17 +++++++++++++++--
- 1 file changed, 15 insertions(+), 2 deletions(-)
-
-diff --git a/src/xfpm-polkit.c b/src/xfpm-polkit.c
-index b63093a..ccc4233 100644
---- a/src/xfpm-polkit.c
-+++ b/src/xfpm-polkit.c
-@@ -239,7 +239,10 @@ xfpm_polkit_free_data (gpointer data)
-
- g_hash_table_destroy (polkit->priv->details);
- g_hash_table_destroy (polkit->priv->subject_hash);
-+
-+ G_GNUC_BEGIN_IGNORE_DEPRECATIONS
- g_value_array_free (polkit->priv->subject);
-+ G_GNUC_END_IGNORE_DEPRECATIONS
-
- polkit->priv->details = NULL;
- polkit->priv->subject_hash = NULL;
-@@ -342,8 +345,10 @@ xfpm_polkit_init_data (XfpmPolkit *polkit)
- if ( G_LIKELY (start_time != 0 ) )
- {
- GValue val = { 0 }, pid_val = { 0 }, start_time_val = { 0 };
--
-+
-+ G_GNUC_BEGIN_IGNORE_DEPRECATIONS
- polkit->priv->subject = g_value_array_new (2);
-+ G_GNUC_END_IGNORE_DEPRECATIONS
- polkit->priv->subject_hash = g_hash_table_new_full (g_str_hash,
- g_str_equal,
- g_free,
-@@ -351,7 +356,9 @@ xfpm_polkit_init_data (XfpmPolkit *polkit)
-
- g_value_init (&val, G_TYPE_STRING);
- g_value_set_string (&val, "unix-process");
-+ G_GNUC_BEGIN_IGNORE_DEPRECATIONS
- g_value_array_append (polkit->priv->subject, &val);
-+ G_GNUC_END_IGNORE_DEPRECATIONS
-
- g_value_unset (&val);
-
-@@ -379,7 +386,9 @@ xfpm_polkit_init_data (XfpmPolkit *polkit)
- G_TYPE_VALUE));
-
- g_value_set_static_boxed (&hash_elem, polkit->priv->subject_hash);
-+ G_GNUC_BEGIN_IGNORE_DEPRECATIONS
- g_value_array_append (polkit->priv->subject, &hash_elem);
-+ G_GNUC_END_IGNORE_DEPRECATIONS
-
- /**
- * Polkit details, will leave it empty.
-@@ -421,8 +430,10 @@ xfpm_polkit_check_auth_intern (XfpmPolkit *polkit, const gchar *action_id)
-
- g_return_val_if_fail (polkit->priv->proxy != NULL, FALSE);
- g_return_val_if_fail (polkit->priv->subject_valid, FALSE);
--
-+
-+ G_GNUC_BEGIN_IGNORE_DEPRECATIONS
- result = g_value_array_new (0);
-+ G_GNUC_END_IGNORE_DEPRECATIONS
-
- ret = dbus_g_proxy_call (polkit->priv->proxy, "CheckAuthorization", &error,
- polkit->priv->subject_gtype, polkit->priv->subject,
-@@ -450,7 +461,9 @@ xfpm_polkit_check_auth_intern (XfpmPolkit *polkit, const gchar *action_id)
- g_error_free (error);
- }
-
-+ G_GNUC_BEGIN_IGNORE_DEPRECATIONS
- g_value_array_free (result);
-+ G_GNUC_END_IGNORE_DEPRECATIONS
-
- XFPM_DEBUG ("Action=%s is authorized=%s", action_id, xfpm_bool_to_string (is_authorized));
-
---
-1.9.3
-
diff --git a/0074-Don-t-init-thread-on-gobject-3.32.patch b/0074-Don-t-init-thread-on-gobject-3.32.patch
deleted file mode 100644
index 3eed42d..0000000
--- a/0074-Don-t-init-thread-on-gobject-3.32.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From baabf7a258679464ef31610481e4a80c39cf942c Mon Sep 17 00:00:00 2001
-From: Nick Schermer <nick at xfce.org>
-Date: Tue, 23 Jul 2013 11:26:48 +0200
-Subject: [PATCH 074/219] Don't init thread on >= gobject 3.32.
-
----
- settings/xfpm-settings-main.c | 6 ++++--
- src/xfpm-main.c | 4 +++-
- 2 files changed, 7 insertions(+), 3 deletions(-)
-
-diff --git a/settings/xfpm-settings-main.c b/settings/xfpm-settings-main.c
-index 995be00..6071315 100644
---- a/settings/xfpm-settings-main.c
-+++ b/settings/xfpm-settings-main.c
-@@ -125,10 +125,12 @@ int main (int argc, char **argv)
- error = NULL;
- return EXIT_FAILURE;
- }
--
-+
-+#if !GLIB_CHECK_VERSION (2, 32, 0)
- if ( !g_thread_supported () )
- g_thread_init (NULL);
--
-+#endif
-+
- dbus_g_thread_init ();
-
- channel = xfconf_channel_new(XFPM_CHANNEL_CFG);
-diff --git a/src/xfpm-main.c b/src/xfpm-main.c
-index a98583b..40959c8 100644
---- a/src/xfpm-main.c
-+++ b/src/xfpm-main.c
-@@ -272,9 +272,11 @@ int main (int argc, char **argv)
- { NULL, },
- };
-
-+#if !GLIB_CHECK_VERSION (2, 32, 0)
- if ( !g_thread_supported () )
- g_thread_init (NULL);
--
-+#endif
-+
- dbus_g_thread_init ();
-
- xfce_textdomain (GETTEXT_PACKAGE, LOCALEDIR, "UTF-8");
---
-1.9.3
-
diff --git a/0075-Change-brightness-level-from-glong-to-gint32.patch b/0075-Change-brightness-level-from-glong-to-gint32.patch
deleted file mode 100644
index eee4516..0000000
--- a/0075-Change-brightness-level-from-glong-to-gint32.patch
+++ /dev/null
@@ -1,313 +0,0 @@
-From 05d12e12596512f7a31d3cdb4845a69dc2d4c611 Mon Sep 17 00:00:00 2001
-From: Martin Matuska <martin at matuska.org>
-Date: Tue, 23 Jul 2013 11:27:41 +0200
-Subject: [PATCH 075/219] Change brightness level from glong to gint32
-
-The "Backlight" RandR property is a 32-bit integer. This means that the int32 (gint32) type should be used to represent brightness levels. The attached patch does nothing else than changing the brightness level representation from glong to gint32. This fixes the screen auto-dimming issue and brightness panel plugin issue.
----
- common/xfpm-brightness.c | 50 ++++++++++++++--------------
- common/xfpm-brightness.h | 8 ++---
- panel-plugins/brightness/brightness-button.c | 10 +++---
- src/xfpm-backlight.c | 12 +++----
- 4 files changed, 40 insertions(+), 40 deletions(-)
-
-diff --git a/common/xfpm-brightness.c b/common/xfpm-brightness.c
-index aa1ef33..f1524cb 100644
---- a/common/xfpm-brightness.c
-+++ b/common/xfpm-brightness.c
-@@ -92,11 +92,11 @@ out:
- }
-
- static gboolean
--xfpm_brightness_xrandr_get_level (XfpmBrightness *brightness, RROutput output, long *current)
-+xfpm_brightness_xrandr_get_level (XfpmBrightness *brightness, RROutput output, gint32 *current)
- {
- unsigned long nitems;
- unsigned long bytes_after;
-- long *prop;
-+ gint32 *prop;
- Atom actual_type;
- int actual_format;
- gboolean ret = FALSE;
-@@ -124,7 +124,7 @@ xfpm_brightness_xrandr_get_level (XfpmBrightness *brightness, RROutput output, l
- }
-
- static gboolean
--xfpm_brightness_xrandr_set_level (XfpmBrightness *brightness, RROutput output, long level)
-+xfpm_brightness_xrandr_set_level (XfpmBrightness *brightness, RROutput output, gint32 level)
- {
- gboolean ret = TRUE;
-
-@@ -137,7 +137,7 @@ xfpm_brightness_xrandr_set_level (XfpmBrightness *brightness, RROutput output, l
-
- if ( gdk_error_trap_pop () )
- {
-- g_warning ("failed to XRRChangeOutputProperty for brightness %li", level);
-+ g_warning ("failed to XRRChangeOutputProperty for brightness %d", level);
- ret = FALSE;
- }
-
-@@ -225,11 +225,11 @@ xfpm_brightness_setup_xrandr (XfpmBrightness *brightness)
- }
-
- static gboolean
--xfpm_brightness_xrand_up (XfpmBrightness *brightness, glong *new_level)
-+xfpm_brightness_xrand_up (XfpmBrightness *brightness, gint32 *new_level)
- {
-- long hw_level;
-+ gint32 hw_level;
- gboolean ret = FALSE;
-- long set_level;
-+ gint32 set_level;
-
- ret = xfpm_brightness_xrandr_get_level (brightness, brightness->priv->output, &hw_level);
-
-@@ -250,14 +250,14 @@ xfpm_brightness_xrand_up (XfpmBrightness *brightness, glong *new_level)
-
- if ( !ret )
- {
-- g_warning ("xfpm_brightness_xrand_up failed for %li", set_level);
-+ g_warning ("xfpm_brightness_xrand_up failed for %d", set_level);
- return FALSE;
- }
-
- /* Nothing changed in the hardware*/
- if ( *new_level == hw_level )
- {
-- g_warning ("xfpm_brightness_xrand_up did not change the hw level to %li", set_level);
-+ g_warning ("xfpm_brightness_xrand_up did not change the hw level to %d", set_level);
- return FALSE;
- }
-
-@@ -265,11 +265,11 @@ xfpm_brightness_xrand_up (XfpmBrightness *brightness, glong *new_level)
- }
-
- static gboolean
--xfpm_brightness_xrand_down (XfpmBrightness *brightness, long *new_level)
-+xfpm_brightness_xrand_down (XfpmBrightness *brightness, gint32 *new_level)
- {
-- long hw_level;
-+ gint32 hw_level;
- gboolean ret;
-- long set_level;
-+ gint32 set_level;
-
- ret = xfpm_brightness_xrandr_get_level (brightness, brightness->priv->output, &hw_level);
-
-@@ -290,14 +290,14 @@ xfpm_brightness_xrand_down (XfpmBrightness *brightness, long *new_level)
-
- if ( !ret )
- {
-- g_warning ("xfpm_brightness_xrand_down failed for %li", set_level);
-+ g_warning ("xfpm_brightness_xrand_down failed for %d", set_level);
- return FALSE;
- }
-
- /* Nothing changed in the hardware*/
- if ( *new_level == hw_level )
- {
-- g_warning ("xfpm_brightness_xrand_down did not change the hw level to %li", set_level);
-+ g_warning ("xfpm_brightness_xrand_down did not change the hw level to %d", set_level);
- return FALSE;
- }
-
-@@ -361,7 +361,7 @@ xfpm_brightness_setup_helper (XfpmBrightness *brightness)
- }
-
- static gboolean
--xfpm_brightness_helper_get_level (XfpmBrightness *brg, glong *level)
-+xfpm_brightness_helper_get_level (XfpmBrightness *brg, gint32 *level)
- {
- int ret;
-
-@@ -406,11 +406,11 @@ out:
- }
-
- static gboolean
--xfpm_brightness_helper_up (XfpmBrightness *brightness, glong *new_level)
-+xfpm_brightness_helper_up (XfpmBrightness *brightness, gint32 *new_level)
- {
-- glong hw_level;
-+ gint32 hw_level;
- gboolean ret = FALSE;
-- gint set_level;
-+ gint32 set_level;
-
- ret = xfpm_brightness_helper_get_level (brightness, &hw_level);
-
-@@ -446,11 +446,11 @@ xfpm_brightness_helper_up (XfpmBrightness *brightness, glong *new_level)
- }
-
- static gboolean
--xfpm_brightness_helper_down (XfpmBrightness *brightness, glong *new_level)
-+xfpm_brightness_helper_down (XfpmBrightness *brightness, gint32 *new_level)
- {
-- glong hw_level;
-+ gint32 hw_level;
- gboolean ret;
-- gint set_level;
-+ gint32 set_level;
-
- ret = xfpm_brightness_helper_get_level (brightness, &hw_level);
-
-@@ -572,7 +572,7 @@ xfpm_brightness_setup (XfpmBrightness *brightness)
- return FALSE;
- }
-
--gboolean xfpm_brightness_up (XfpmBrightness *brightness, glong *new_level)
-+gboolean xfpm_brightness_up (XfpmBrightness *brightness, gint32 *new_level)
- {
- gboolean ret = FALSE;
-
-@@ -589,7 +589,7 @@ gboolean xfpm_brightness_up (XfpmBrightness *brightness, glong *new_level)
- return ret;
- }
-
--gboolean xfpm_brightness_down (XfpmBrightness *brightness, glong *new_level)
-+gboolean xfpm_brightness_down (XfpmBrightness *brightness, gint32 *new_level)
- {
- gboolean ret = FALSE;
-
-@@ -618,7 +618,7 @@ gint xfpm_brightness_get_max_level (XfpmBrightness *brightness)
- return brightness->priv->max_level;
- }
-
--gboolean xfpm_brightness_get_level (XfpmBrightness *brightness, glong *level)
-+gboolean xfpm_brightness_get_level (XfpmBrightness *brightness, gint32 *level)
- {
- gboolean ret = FALSE;
-
-@@ -632,7 +632,7 @@ gboolean xfpm_brightness_get_level (XfpmBrightness *brightness, glong *level)
- return ret;
- }
-
--gboolean xfpm_brightness_set_level (XfpmBrightness *brightness, glong level)
-+gboolean xfpm_brightness_set_level (XfpmBrightness *brightness, gint32 level)
- {
- gboolean ret = FALSE;
-
-diff --git a/common/xfpm-brightness.h b/common/xfpm-brightness.h
-index 0c4e3ed..26b3dbe 100644
---- a/common/xfpm-brightness.h
-+++ b/common/xfpm-brightness.h
-@@ -51,20 +51,20 @@ XfpmBrightness *xfpm_brightness_new (void);
- gboolean xfpm_brightness_setup (XfpmBrightness *brightness);
-
- gboolean xfpm_brightness_up (XfpmBrightness *brightness,
-- glong *new_level);
-+ gint32 *new_level);
-
- gboolean xfpm_brightness_down (XfpmBrightness *brightness,
-- glong *new_level);
-+ gint32 *new_level);
-
- gboolean xfpm_brightness_has_hw (XfpmBrightness *brightness);
-
- gint xfpm_brightness_get_max_level (XfpmBrightness *brightness);
-
- gboolean xfpm_brightness_get_level (XfpmBrightness *brightness,
-- glong *level);
-+ gint32 *level);
-
- gboolean xfpm_brightness_set_level (XfpmBrightness *brightness,
-- glong level);
-+ gint32 level);
-
- gboolean xfpm_brightness_dim_down (XfpmBrightness *brightness);
-
-diff --git a/panel-plugins/brightness/brightness-button.c b/panel-plugins/brightness/brightness-button.c
-index 6e60c29..bd466c9 100644
---- a/panel-plugins/brightness/brightness-button.c
-+++ b/panel-plugins/brightness/brightness-button.c
-@@ -186,7 +186,7 @@ static gboolean
- brightness_button_popup_win (GtkWidget *widget, GdkEvent *ev, guint32 ev_time)
- {
- gint x, y;
-- glong current_level = 0;
-+ gint32 current_level = 0;
- GdkDisplay *display;
- GdkScreen *screen;
- BrightnessButton *button;
-@@ -342,7 +342,7 @@ plus_clicked (GtkWidget *widget, BrightnessButton *button)
- static void
- range_value_changed (GtkWidget *widget, BrightnessButton *button)
- {
-- glong range_level, hw_level;
-+ gint32 range_level, hw_level;
-
- range_level = (gint) gtk_range_get_value (GTK_RANGE (button->priv->range));
-
-@@ -428,8 +428,8 @@ brightness_button_create_popup (BrightnessButton *button)
- static void
- brightness_button_up (BrightnessButton *button)
- {
-- glong level;
-- glong max_level;
-+ gint32 level;
-+ gint32 max_level;
-
- xfpm_brightness_get_level (button->priv->brightness, &level);
- max_level = xfpm_brightness_get_max_level (button->priv->brightness);
-@@ -443,7 +443,7 @@ brightness_button_up (BrightnessButton *button)
- static void
- brightness_button_down (BrightnessButton *button)
- {
-- glong level;
-+ gint32 level;
- xfpm_brightness_get_level (button->priv->brightness, &level);
-
- if ( level != 0 )
-diff --git a/src/xfpm-backlight.c b/src/xfpm-backlight.c
-index baeeb43..45c990f 100644
---- a/src/xfpm-backlight.c
-+++ b/src/xfpm-backlight.c
-@@ -63,8 +63,8 @@ struct XfpmBacklightPrivate
- gboolean has_hw;
- gboolean on_battery;
-
-- glong last_level;
-- glong max_level;
-+ gint32 last_level;
-+ gint32 max_level;
-
- gboolean dimmed;
- gboolean block;
-@@ -79,7 +79,7 @@ xfpm_backlight_dim_brightness (XfpmBacklight *backlight)
-
- if (xfpm_power_get_mode (backlight->priv->power) == XFPM_POWER_MODE_NORMAL )
- {
-- glong dim_level;
-+ gint32 dim_level;
-
- g_object_get (G_OBJECT (backlight->priv->conf),
- backlight->priv->on_battery ? BRIGHTNESS_LEVEL_ON_BATTERY : BRIGHTNESS_LEVEL_ON_AC, &dim_level,
-@@ -101,7 +101,7 @@ xfpm_backlight_dim_brightness (XfpmBacklight *backlight)
- **/
- if (backlight->priv->last_level > dim_level)
- {
-- XFPM_DEBUG ("Current brightness level before dimming : %li, new %li", backlight->priv->last_level, dim_level);
-+ XFPM_DEBUG ("Current brightness level before dimming : %d, new %d", backlight->priv->last_level, dim_level);
- backlight->priv->dimmed = xfpm_brightness_set_level (backlight->priv->brightness, dim_level);
- }
- }
-@@ -182,7 +182,7 @@ xfpm_backlight_reset_cb (EggIdletime *idle, XfpmBacklight *backlight)
- {
- if ( !backlight->priv->block)
- {
-- XFPM_DEBUG ("Alarm reset, setting level to %li", backlight->priv->last_level);
-+ XFPM_DEBUG ("Alarm reset, setting level to %d", backlight->priv->last_level);
- xfpm_brightness_set_level (backlight->priv->brightness, backlight->priv->last_level);
- }
- backlight->priv->dimmed = FALSE;
-@@ -192,7 +192,7 @@ xfpm_backlight_reset_cb (EggIdletime *idle, XfpmBacklight *backlight)
- static void
- xfpm_backlight_button_pressed_cb (XfpmButton *button, XfpmButtonKey type, XfpmBacklight *backlight)
- {
-- glong level;
-+ gint32 level;
- gboolean ret = TRUE;
-
- gboolean enable_brightness, show_popup;
---
-1.9.3
-
diff --git a/0079-Fix-Typo-in-xfpm-power.c.patch b/0079-Fix-Typo-in-xfpm-power.c.patch
deleted file mode 100644
index 21c3d41..0000000
--- a/0079-Fix-Typo-in-xfpm-power.c.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From b35cee55e065a7ebcbe6062cdcc5916cbe04973f Mon Sep 17 00:00:00 2001
-From: Benjamin Kerensa <bkerensa at ubuntu.com>
-Date: Sun, 10 Mar 2013 19:36:13 -0700
-Subject: [PATCH 079/219] Fix Typo in xfpm-power.c
-
----
- src/xfpm-power.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/xfpm-power.c b/src/xfpm-power.c
-index 796bef8..bcf2fbd 100644
---- a/src/xfpm-power.c
-+++ b/src/xfpm-power.c
-@@ -1034,7 +1034,7 @@ xfpm_power_add_device (XfpmPower *power, const gchar *object_path)
- }
- else if ( device_type != XFPM_DEVICE_TYPE_LINE_POWER )
- {
-- g_warning ("Unable to monitor unkown power device with object_path : %s", object_path);
-+ g_warning ("Unable to monitor unknown power device with object_path : %s", object_path);
- g_object_unref (proxy_prop);
- }
- }
---
-1.9.3
-
diff --git a/0080-Fix-typo-in-error-message.patch b/0080-Fix-typo-in-error-message.patch
deleted file mode 100644
index 8ef4f61..0000000
--- a/0080-Fix-typo-in-error-message.patch
+++ /dev/null
@@ -1,553 +0,0 @@
-From 3b4815eeb2b0edc7e8f24a453feddf069bbea3bc Mon Sep 17 00:00:00 2001
-From: Ian <ifreecarve at gmail.com>
-Date: Sun, 11 Aug 2013 22:34:57 +0200
-Subject: [PATCH 080/219] Fix typo in error message.
-
----
- src/xfpm-manager.c | 180 ++++++++++++++++++++++++++---------------------------
- 1 file changed, 90 insertions(+), 90 deletions(-)
-
-diff --git a/src/xfpm-manager.c b/src/xfpm-manager.c
-index 472ee3e..853d78c 100644
---- a/src/xfpm-manager.c
-+++ b/src/xfpm-manager.c
-@@ -73,9 +73,9 @@ static gboolean xfpm_manager_quit (XfpmManager *manager);
- struct XfpmManagerPrivate
- {
- DBusGConnection *session_bus;
--
-+
- XfceSMClient *client;
--
-+
- XfpmPower *power;
- XfpmButton *button;
- XfpmXfconf *conf;
-@@ -90,7 +90,7 @@ struct XfpmManagerPrivate
- #endif
-
- GTimer *timer;
--
-+
- gboolean inhibited;
- gboolean session_managed;
- };
-@@ -113,7 +113,7 @@ xfpm_manager_init (XfpmManager *manager)
- manager->priv = XFPM_MANAGER_GET_PRIVATE (manager);
-
- manager->priv->timer = g_timer_new ();
--
-+
- notify_init ("xfce4-power-manager");
- }
-
-@@ -126,7 +126,7 @@ xfpm_manager_finalize (GObject *object)
-
- if ( manager->priv->session_bus )
- dbus_g_connection_unref (manager->priv->session_bus);
--
-+
- g_object_unref (manager->priv->power);
- g_object_unref (manager->priv->button);
- g_object_unref (manager->priv->conf);
-@@ -136,15 +136,15 @@ xfpm_manager_finalize (GObject *object)
- g_object_unref (manager->priv->disks);
- g_object_unref (manager->priv->inhibit);
- g_object_unref (manager->priv->idle);
--
-+
- g_timer_destroy (manager->priv->timer);
--
-+
- #ifdef HAVE_DPMS
- g_object_unref (manager->priv->dpms);
- #endif
--
-+
- g_object_unref (manager->priv->backlight);
--
-+
- G_OBJECT_CLASS (xfpm_manager_parent_class)->finalize (object);
- }
-
-@@ -162,7 +162,7 @@ static gboolean
- xfpm_manager_quit (XfpmManager *manager)
- {
- XFPM_DEBUG ("Exiting");
--
-+
- xfpm_manager_release_names (manager);
- gtk_main_quit ();
- return TRUE;
-@@ -188,10 +188,10 @@ xfpm_manager_reserve_names (XfpmManager *manager)
- "org.freedesktop.PowerManagement") )
- {
- g_warning ("Unable to reserve bus name: Maybe any already running instance?\n");
--
-+
- g_object_unref (G_OBJECT (manager));
- gtk_main_quit ();
--
-+
- return FALSE;
- }
- return TRUE;
-@@ -202,7 +202,7 @@ xfpm_manager_shutdown (XfpmManager *manager)
- {
- GError *error = NULL;
- xfpm_console_kit_shutdown (manager->priv->console, &error );
--
-+
- if ( error )
- {
- g_warning ("Failed to shutdown the system : %s", error->message);
-@@ -255,12 +255,12 @@ static void
- xfpm_manager_button_pressed_cb (XfpmButton *bt, XfpmButtonKey type, XfpmManager *manager)
- {
- XfpmShutdownRequest req = XFPM_DO_NOTHING;
--
-+
- XFPM_DEBUG_ENUM (type, XFPM_TYPE_BUTTON_KEY, "Received button press event");
--
-+
- if ( type == BUTTON_MON_BRIGHTNESS_DOWN || type == BUTTON_MON_BRIGHTNESS_UP )
- return;
--
-+
- if ( type == BUTTON_POWER_OFF )
- {
- g_object_get (G_OBJECT (manager->priv->conf),
-@@ -285,7 +285,7 @@ xfpm_manager_button_pressed_cb (XfpmButton *bt, XfpmButtonKey type, XfpmManager
- }
-
- XFPM_DEBUG_ENUM (req, XFPM_TYPE_SHUTDOWN_REQUEST, "Shutdown request : ");
--
-+
- if ( req == XFPM_ASK )
- xfpm_manager_ask_shutdown (manager);
- else
-@@ -303,11 +303,11 @@ xfpm_manager_lid_changed_cb (XfpmPower *power, gboolean lid_is_closed, XfpmManag
- {
- XfpmLidTriggerAction action;
- gboolean on_battery;
--
-+
- g_object_get (G_OBJECT (power),
- "on-battery", &on_battery,
- NULL);
--
-+
- g_object_get (G_OBJECT (manager->priv->conf),
- on_battery ? LID_SWITCH_ON_BATTERY_CFG : LID_SWITCH_ON_AC_CFG, &action,
- NULL);
-@@ -315,7 +315,7 @@ xfpm_manager_lid_changed_cb (XfpmPower *power, gboolean lid_is_closed, XfpmManag
- if ( lid_is_closed )
- {
- XFPM_DEBUG_ENUM (action, XFPM_TYPE_LID_TRIGGER_ACTION, "LID close event");
--
-+
- if ( action == LID_TRIGGER_NOTHING )
- {
- #ifdef HAVE_DPMS
-@@ -328,16 +328,16 @@ xfpm_manager_lid_changed_cb (XfpmPower *power, gboolean lid_is_closed, XfpmManag
- if ( !xfpm_is_multihead_connected () )
- xfpm_lock_screen ();
- }
-- else
-+ else
- {
- /*
- * Force sleep here as lid is closed and no point of asking the
- * user for confirmation in case of an application is inhibiting
-- * the power manager.
-+ * the power manager.
- */
- xfpm_manager_sleep_request (manager, action, TRUE);
- }
--
-+
- }
- else
- {
-@@ -359,34 +359,34 @@ xfpm_manager_alarm_timeout_cb (EggIdletime *idle, guint id, XfpmManager *manager
- {
- if (xfpm_power_get_mode (manager->priv->power) == XFPM_POWER_MODE_PRESENTATION)
- return;
--
-+
- XFPM_DEBUG ("Alarm inactivity timeout id %d", id);
--
-+
- if ( id == TIMEOUT_INACTIVITY_ON_AC || id == TIMEOUT_INACTIVITY_ON_BATTERY )
- {
- XfpmShutdownRequest req = XFPM_DO_NOTHING;
- gchar *sleep_mode;
- gboolean on_battery;
--
-+
- if ( manager->priv->inhibited )
- {
- XFPM_DEBUG ("Idle sleep alarm timeout, but power manager is currently inhibited, action ignored");
- return;
- }
--
-+
- g_object_get (G_OBJECT (manager->priv->conf),
- INACTIVITY_SLEEP_MODE, &sleep_mode,
- NULL);
--
-+
- g_object_get (G_OBJECT (manager->priv->power),
- "on-battery", &on_battery,
- NULL);
--
-+
- if ( !g_strcmp0 (sleep_mode, "Suspend") )
- req = XFPM_DO_SUSPEND;
- else
- req = XFPM_DO_HIBERNATE;
--
-+
- g_free (sleep_mode);
-
- if ( id == TIMEOUT_INACTIVITY_ON_AC && on_battery == FALSE )
-@@ -400,18 +400,18 @@ static void
- xfpm_manager_set_idle_alarm_on_ac (XfpmManager *manager)
- {
- guint on_ac;
--
-+
- g_object_get (G_OBJECT (manager->priv->conf),
- ON_AC_INACTIVITY_TIMEOUT, &on_ac,
- NULL);
--
-+
- #ifdef DEBUG
- if ( on_ac == 14 )
- TRACE ("setting inactivity sleep timeout on ac to never");
- else
- TRACE ("setting inactivity sleep timeout on ac to %d", on_ac);
- #endif
--
-+
- if ( on_ac == 14 )
- {
- egg_idletime_alarm_remove (manager->priv->idle, TIMEOUT_INACTIVITY_ON_AC );
-@@ -426,18 +426,18 @@ static void
- xfpm_manager_set_idle_alarm_on_battery (XfpmManager *manager)
- {
- guint on_battery;
--
-+
- g_object_get (G_OBJECT (manager->priv->conf),
- ON_BATTERY_INACTIVITY_TIMEOUT, &on_battery,
- NULL);
--
-+
- #ifdef DEBUG
- if ( on_battery == 14 )
- TRACE ("setting inactivity sleep timeout on battery to never");
- else
- TRACE ("setting inactivity sleep timeout on battery to %d", on_battery);
- #endif
--
-+
- if ( on_battery == 14 )
- {
- egg_idletime_alarm_remove (manager->priv->idle, TIMEOUT_INACTIVITY_ON_BATTERY );
-@@ -459,7 +459,7 @@ xfpm_manager_set_idle_alarm (XfpmManager *manager)
- {
- xfpm_manager_set_idle_alarm_on_ac (manager);
- xfpm_manager_set_idle_alarm_on_battery (manager);
--
-+
- }
-
- XfpmManager *
-@@ -468,18 +468,18 @@ xfpm_manager_new (DBusGConnection *bus, const gchar *client_id)
- XfpmManager *manager = NULL;
- GError *error = NULL;
- gchar *current_dir;
--
-+
- const gchar *restart_command[] =
- {
- "xfce4-power-manager",
- "--restart",
- NULL
- };
--
-+
- manager = g_object_new (XFPM_TYPE_MANAGER, NULL);
-
- manager->priv->session_bus = bus;
--
-+
- current_dir = g_get_current_dir ();
- manager->priv->client = xfce_sm_client_get_full (XFCE_SM_CLIENT_RESTART_NORMAL,
- XFCE_SM_CLIENT_PRIORITY_DEFAULT,
-@@ -487,14 +487,14 @@ xfpm_manager_new (DBusGConnection *bus, const gchar *client_id)
- current_dir,
- restart_command,
- SYSCONFDIR "/xdg/autostart/" PACKAGE_NAME ".desktop");
--
-+
- g_free (current_dir);
--
-+
- manager->priv->session_managed = xfce_sm_client_connect (manager->priv->client, &error);
--
-+
- if ( error )
- {
-- g_warning ("Unable to connect to session managet : %s", error->message);
-+ g_warning ("Unable to connect to session manager : %s", error->message);
- g_error_free (error);
- }
- else
-@@ -502,10 +502,10 @@ xfpm_manager_new (DBusGConnection *bus, const gchar *client_id)
- g_signal_connect_swapped (manager->priv->client, "quit",
- G_CALLBACK (xfpm_manager_quit), manager);
- }
--
-+
- xfpm_manager_dbus_class_init (XFPM_MANAGER_GET_CLASS (manager));
- xfpm_manager_dbus_init (manager);
--
-+
- return manager;
- }
-
-@@ -513,11 +513,11 @@ void xfpm_manager_start (XfpmManager *manager)
- {
- if ( !xfpm_manager_reserve_names (manager) )
- goto out;
--
-+
- dbus_g_error_domain_register (XFPM_ERROR,
- NULL,
- XFPM_TYPE_ERROR);
--
-+
- manager->priv->power = xfpm_power_get ();
- manager->priv->button = xfpm_button_new ();
- manager->priv->conf = xfpm_xfconf_new ();
-@@ -526,51 +526,51 @@ void xfpm_manager_start (XfpmManager *manager)
- manager->priv->disks = xfpm_disks_new ();
- manager->priv->inhibit = xfpm_inhibit_new ();
- manager->priv->idle = egg_idletime_new ();
--
-+
- g_signal_connect (manager->priv->idle, "alarm-expired",
- G_CALLBACK (xfpm_manager_alarm_timeout_cb), manager);
--
-+
- g_signal_connect_swapped (manager->priv->conf, "notify::" ON_AC_INACTIVITY_TIMEOUT,
- G_CALLBACK (xfpm_manager_set_idle_alarm_on_ac), manager);
--
-+
- g_signal_connect_swapped (manager->priv->conf, "notify::" ON_BATTERY_INACTIVITY_TIMEOUT,
- G_CALLBACK (xfpm_manager_set_idle_alarm_on_battery), manager);
--
-+
- xfpm_manager_set_idle_alarm (manager);
--
-+
- g_signal_connect (manager->priv->inhibit, "has-inhibit-changed",
- G_CALLBACK (xfpm_manager_inhibit_changed_cb), manager);
--
-+
- g_signal_connect (manager->priv->monitor, "system-bus-connection-changed",
- G_CALLBACK (xfpm_manager_system_bus_connection_changed_cb), manager);
--
-+
- manager->priv->backlight = xfpm_backlight_new ();
--
-+
- #ifdef HAVE_DPMS
- manager->priv->dpms = xfpm_dpms_new ();
- #endif
--
-+
- g_signal_connect (manager->priv->button, "button_pressed",
- G_CALLBACK (xfpm_manager_button_pressed_cb), manager);
--
-+
- g_signal_connect (manager->priv->power, "lid-changed",
- G_CALLBACK (xfpm_manager_lid_changed_cb), manager);
--
-+
- g_signal_connect (manager->priv->power, "on-battery-changed",
- G_CALLBACK (xfpm_manager_on_battery_changed_cb), manager);
--
-+
- g_signal_connect_swapped (manager->priv->power, "waking-up",
- G_CALLBACK (xfpm_manager_reset_sleep_timer), manager);
--
-+
- g_signal_connect_swapped (manager->priv->power, "sleeping",
- G_CALLBACK (xfpm_manager_reset_sleep_timer), manager);
--
-+
- g_signal_connect_swapped (manager->priv->power, "ask-shutdown",
- G_CALLBACK (xfpm_manager_ask_shutdown), manager);
--
-+
- g_signal_connect_swapped (manager->priv->power, "shutdown",
- G_CALLBACK (xfpm_manager_shutdown), manager);
--
-+
- out:
- ;
- }
-@@ -585,7 +585,7 @@ void xfpm_manager_stop (XfpmManager *manager)
- GHashTable *xfpm_manager_get_config (XfpmManager *manager)
- {
- GHashTable *hash;
--
-+
- guint8 mapped_buttons;
- gboolean auth_hibernate = FALSE;
- gboolean auth_suspend = FALSE;
-@@ -600,9 +600,9 @@ GHashTable *xfpm_manager_get_config (XfpmManager *manager)
- gboolean has_lid = FALSE;
- gboolean can_spin = FALSE;
- gboolean devkit_disk = FALSE;
--
-+
- hash = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_free);
--
-+
- g_object_get (G_OBJECT (manager->priv->console),
- "can-shutdown", &can_shutdown,
- NULL);
-@@ -611,25 +611,25 @@ GHashTable *xfpm_manager_get_config (XfpmManager *manager)
- "auth-suspend", &auth_suspend,
- "auth-hibernate", &auth_hibernate,
- "can-suspend", &can_suspend,
-- "can-hibernate", &can_hibernate,
-+ "can-hibernate", &can_hibernate,
- "has-lid", &has_lid,
- NULL);
-
- can_spin = xfpm_disks_get_can_spin (manager->priv->disks);
- devkit_disk = xfpm_disks_kit_is_running (manager->priv->disks);
--
-+
- has_battery = xfpm_power_has_battery (manager->priv->power);
- has_lcd_brightness = xfpm_backlight_has_hw (manager->priv->backlight);
--
-+
- mapped_buttons = xfpm_button_get_mapped (manager->priv->button);
--
-+
- if ( mapped_buttons & SLEEP_KEY )
- has_sleep_button = TRUE;
- if ( mapped_buttons & HIBERNATE_KEY )
- has_hibernate_button = TRUE;
- if ( mapped_buttons & POWER_KEY )
- has_power_button = TRUE;
--
-+
- g_hash_table_insert (hash, g_strdup ("sleep-button"), g_strdup (xfpm_bool_to_string (has_sleep_button)));
- g_hash_table_insert (hash, g_strdup ("power-button"), g_strdup (xfpm_bool_to_string (has_power_button)));
- g_hash_table_insert (hash, g_strdup ("hibernate-button"), g_strdup (xfpm_bool_to_string (has_hibernate_button)));
-@@ -638,32 +638,32 @@ GHashTable *xfpm_manager_get_config (XfpmManager *manager)
- g_hash_table_insert (hash, g_strdup ("can-suspend"), g_strdup (xfpm_bool_to_string (can_suspend)));
- g_hash_table_insert (hash, g_strdup ("can-hibernate"), g_strdup (xfpm_bool_to_string (can_hibernate)));
- g_hash_table_insert (hash, g_strdup ("can-shutdown"), g_strdup (xfpm_bool_to_string (can_shutdown)));
--
-+
- g_hash_table_insert (hash, g_strdup ("has-battery"), g_strdup (xfpm_bool_to_string (has_battery)));
- g_hash_table_insert (hash, g_strdup ("has-lid"), g_strdup (xfpm_bool_to_string (has_lid)));
- g_hash_table_insert (hash, g_strdup ("can-spin"), g_strdup (xfpm_bool_to_string (can_spin)));
- g_hash_table_insert (hash, g_strdup ("devkit-disk"), g_strdup (xfpm_bool_to_string (devkit_disk)));
--
-+
- g_hash_table_insert (hash, g_strdup ("has-brightness"), g_strdup (xfpm_bool_to_string (has_lcd_brightness)));
--
-+
- return hash;
- }
-
- /*
-- *
-+ *
- * DBus server implementation
-- *
-+ *
- */
- static gboolean xfpm_manager_dbus_quit (XfpmManager *manager,
- GError **error);
--
-+
- static gboolean xfpm_manager_dbus_restart (XfpmManager *manager,
- GError **error);
--
-+
- static gboolean xfpm_manager_dbus_get_config (XfpmManager *manager,
- GHashTable **OUT_config,
- GError **error);
--
-+
- static gboolean xfpm_manager_dbus_get_info (XfpmManager *manager,
- gchar **OUT_name,
- gchar **OUT_version,
-@@ -691,9 +691,9 @@ static gboolean
- xfpm_manager_dbus_quit (XfpmManager *manager, GError **error)
- {
- XFPM_DEBUG("Quit message received\n");
--
-+
- xfpm_manager_quit (manager);
--
-+
- return TRUE;
- }
-
-@@ -701,11 +701,11 @@ static gboolean xfpm_manager_dbus_restart (XfpmManager *manager,
- GError **error)
- {
- XFPM_DEBUG("Restart message received");
--
-+
- xfpm_manager_quit (manager);
--
-+
- g_spawn_command_line_async ("xfce4-power-manager", NULL);
--
-+
- return TRUE;
- }
-
-@@ -713,22 +713,22 @@ static gboolean xfpm_manager_dbus_get_config (XfpmManager *manager,
- GHashTable **OUT_config,
- GError **error)
- {
--
-+
- *OUT_config = xfpm_manager_get_config (manager);
- return TRUE;
- }
--
--static gboolean
-+
-+static gboolean
- xfpm_manager_dbus_get_info (XfpmManager *manager,
- gchar **OUT_name,
- gchar **OUT_version,
- gchar **OUT_vendor,
- GError **error)
- {
--
-+
- *OUT_name = g_strdup(PACKAGE);
- *OUT_version = g_strdup(VERSION);
- *OUT_vendor = g_strdup("Xfce-goodies");
--
-+
- return TRUE;
- }
---
-1.9.3
-
diff --git a/0081-Fix-typo.patch b/0081-Fix-typo.patch
deleted file mode 100644
index 97a5dae..0000000
--- a/0081-Fix-typo.patch
+++ /dev/null
@@ -1,744 +0,0 @@
-From d7252850d8070a0d8247d4af9d8930014f2a423b Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Guelfucci?= <jeromeg at xfce.org>
-Date: Sun, 11 Aug 2013 22:40:11 +0200
-Subject: [PATCH 081/219] Fix typo.
-
----
- src/xfpm-battery.c | 252 ++++++++++++++++++++++++++---------------------------
- 1 file changed, 126 insertions(+), 126 deletions(-)
-
-diff --git a/src/xfpm-battery.c b/src/xfpm-battery.c
-index 34a1da1..b3690d2 100644
---- a/src/xfpm-battery.c
-+++ b/src/xfpm-battery.c
-@@ -55,9 +55,9 @@ struct XfpmBatteryPrivate
- XfpmButton *button;
- DBusGProxy *proxy;
- DBusGProxy *proxy_prop;
--
-+
- gchar *icon_prefix;
--
-+
- XfpmBatteryCharge charge;
- XfpmDeviceState state;
- XfpmDeviceType type;
-@@ -68,10 +68,10 @@ struct XfpmBatteryPrivate
- gint64 time_to_empty;
-
- const gchar *battery_name;
--
-+
- gulong sig;
- gulong sig_bt;
--
-+
- guint notify_idle;
- };
-
-@@ -82,7 +82,7 @@ enum
- PROP_CHARGE_STATUS,
- PROP_DEVICE_TYPE
- };
--
-+
- enum
- {
- BATTERY_CHARGE_CHANGED,
-@@ -96,27 +96,27 @@ G_DEFINE_TYPE (XfpmBattery, xfpm_battery, GTK_TYPE_STATUS_ICON)
- static const gchar * G_GNUC_CONST
- xfpm_battery_get_icon_index (XfpmDeviceType type, guint percent)
- {
-- if (percent < 10)
-+ if (percent < 10)
- {
- return "000";
-- }
-- else if (percent < 30)
-+ }
-+ else if (percent < 30)
- {
- return ( (type == XFPM_DEVICE_TYPE_BATTERY || type == XFPM_DEVICE_TYPE_UPS) ? "020" : "030");
-- }
-- else if (percent < 50)
-+ }
-+ else if (percent < 50)
- {
- return ( (type == XFPM_DEVICE_TYPE_BATTERY || type == XFPM_DEVICE_TYPE_UPS ) ? "040" : "030");
-- }
-- else if (percent < 70)
-+ }
-+ else if (percent < 70)
- {
- return "060";
-- }
-- else if (percent < 90)
-+ }
-+ else if (percent < 90)
- {
- return ((type == XFPM_DEVICE_TYPE_BATTERY || type == XFPM_DEVICE_TYPE_UPS) ? "080" : "060");
- }
--
-+
- return "100";
- }
-
-@@ -125,11 +125,11 @@ xfpm_battery_refresh_visible (XfpmBattery *battery)
- {
- XfpmShowIcon show_icon;
- gboolean visible = TRUE;
--
-+
- g_object_get (G_OBJECT (battery->priv->conf),
- SHOW_TRAY_ICON_CFG, &show_icon,
- NULL);
--
-+
- if ( show_icon == SHOW_ICON_ALWAYS )
- visible = TRUE;
- else if ( show_icon == NEVER_SHOW_ICON )
-@@ -148,7 +148,7 @@ xfpm_battery_refresh_visible (XfpmBattery *battery)
- }
-
- XFPM_DEBUG_ENUM (show_icon, XFPM_TYPE_SHOW_ICON, "visible=%s", xfpm_bool_to_string (visible));
--
-+
- gtk_status_icon_set_visible (GTK_STATUS_ICON (battery), visible);
- }
-
-@@ -166,13 +166,13 @@ xfpm_battery_get_time_string (guint seconds)
- /* Add 0.5 to do rounding */
- minutes = (int) ( ( seconds / 60.0 ) + 0.5 );
-
-- if (minutes == 0)
-+ if (minutes == 0)
- {
- timestring = g_strdup (_("Unknown time"));
- return timestring;
- }
-
-- if (minutes < 60)
-+ if (minutes < 60)
- {
- timestring = g_strdup_printf (ngettext ("%i minute",
- "%i minutes",
-@@ -201,8 +201,8 @@ static gchar *
- xfpm_battery_get_message_from_battery_state (XfpmBattery *battery)
- {
- gchar *msg = NULL;
--
--
-+
-+
- if (battery->priv->type == XFPM_DEVICE_TYPE_BATTERY || battery->priv->type == XFPM_DEVICE_TYPE_UPS)
- {
- switch (battery->priv->state)
-@@ -212,16 +212,16 @@ xfpm_battery_get_message_from_battery_state (XfpmBattery *battery)
- break;
- case XFPM_DEVICE_STATE_CHARGING:
- msg = g_strdup_printf (_("Your %s is charging"), battery->priv->battery_name);
--
-+
- if ( battery->priv->time_to_full != 0 )
- {
- gchar *tmp, *est_time_str;
- tmp = g_strdup (msg);
- g_free (msg);
--
-+
- est_time_str = xfpm_battery_get_time_string (battery->priv->time_to_full);
--
-- msg = g_strdup_printf (_("%s (%i%%)\n%s until is fully charged."), tmp, battery->priv->percentage, est_time_str);
-+
-+ msg = g_strdup_printf (_("%s (%i%%)\n%s until it is fully charged."), tmp, battery->priv->percentage, est_time_str);
- g_free (est_time_str);
- g_free (tmp);
- }
-@@ -232,15 +232,15 @@ xfpm_battery_get_message_from_battery_state (XfpmBattery *battery)
- msg = g_strdup_printf (_("Your %s is discharging"), battery->priv->battery_name);
- else
- msg = g_strdup_printf (_("System is running on %s power"), battery->priv->battery_name);
--
-+
- if ( battery->priv->time_to_empty != 0 )
- {
- gchar *tmp, *est_time_str;
- tmp = g_strdup (msg);
- g_free (msg);
--
-+
- est_time_str = xfpm_battery_get_time_string (battery->priv->time_to_empty);
--
-+
- msg = g_strdup_printf (_("%s (%i%%)\nEstimated time left is %s."), tmp, battery->priv->percentage, est_time_str);
- g_free (tmp);
- g_free (est_time_str);
-@@ -252,7 +252,7 @@ xfpm_battery_get_message_from_battery_state (XfpmBattery *battery)
- default:
- break;
- }
--
-+
- }
- else if (battery->priv->type >= XFPM_DEVICE_TYPE_MONITOR)
- {
-@@ -274,7 +274,7 @@ xfpm_battery_get_message_from_battery_state (XfpmBattery *battery)
- break;
- }
- }
--
-+
- return msg;
- }
-
-@@ -282,10 +282,10 @@ static void
- xfpm_battery_refresh_icon (XfpmBattery *battery)
- {
- gchar icon_name[128];
--
-+
- XFPM_DEBUG ("Battery state %d", battery->priv->state);
--
-- if ( battery->priv->type == XFPM_DEVICE_TYPE_BATTERY ||
-+
-+ if ( battery->priv->type == XFPM_DEVICE_TYPE_BATTERY ||
- battery->priv->type == XFPM_DEVICE_TYPE_UPS )
- {
- if (!battery->priv->present)
-@@ -296,19 +296,19 @@ xfpm_battery_refresh_icon (XfpmBattery *battery)
- {
- g_snprintf (icon_name, 128, "%s%s", battery->priv->icon_prefix, battery->priv->ac_online ? "charged" : "100");
- }
-- else if ( battery->priv->state == XFPM_DEVICE_STATE_CHARGING ||
-+ else if ( battery->priv->state == XFPM_DEVICE_STATE_CHARGING ||
- battery->priv->state == XFPM_DEVICE_STATE_PENDING_CHARGING)
- {
-- g_snprintf (icon_name, 128, "%s%s-%s",
-- battery->priv->icon_prefix,
-+ g_snprintf (icon_name, 128, "%s%s-%s",
-+ battery->priv->icon_prefix,
- xfpm_battery_get_icon_index (battery->priv->type, battery->priv->percentage),
- "charging");
- }
- else if ( battery->priv->state == XFPM_DEVICE_STATE_DISCHARGING ||
- battery->priv->state == XFPM_DEVICE_STATE_PENDING_DISCHARGING)
- {
-- g_snprintf (icon_name, 128, "%s%s",
-- battery->priv->icon_prefix,
-+ g_snprintf (icon_name, 128, "%s%s",
-+ battery->priv->icon_prefix,
- xfpm_battery_get_icon_index (battery->priv->type, battery->priv->percentage));
- }
- else if ( battery->priv->state == XFPM_DEVICE_STATE_EMPTY)
-@@ -328,12 +328,12 @@ xfpm_battery_refresh_icon (XfpmBattery *battery)
- }
- else if ( battery->priv->state == XFPM_DEVICE_STATE_DISCHARGING )
- {
-- g_snprintf (icon_name, 128, "%s-%s",
-- battery->priv->icon_prefix,
-+ g_snprintf (icon_name, 128, "%s-%s",
-+ battery->priv->icon_prefix,
- xfpm_battery_get_icon_index (battery->priv->type, battery->priv->percentage));
- }
- }
--
-+
- gtk_status_icon_set_from_icon_name (GTK_STATUS_ICON (battery), icon_name);
- }
-
-@@ -341,21 +341,21 @@ static void
- xfpm_battery_notify (XfpmBattery *battery)
- {
- gchar *message = NULL;
--
-+
- message = xfpm_battery_get_message_from_battery_state (battery);
--
-+
- if ( !message )
- return;
--
-- xfpm_notify_show_notification (battery->priv->notify,
-- _("Power Manager"),
-- message,
-+
-+ xfpm_notify_show_notification (battery->priv->notify,
-+ _("Power Manager"),
-+ message,
- gtk_status_icon_get_icon_name (GTK_STATUS_ICON (battery)),
- 8000,
- FALSE,
- XFPM_NOTIFY_NORMAL,
- GTK_STATUS_ICON (battery));
--
-+
- g_free (message);
- }
-
-@@ -363,10 +363,10 @@ static gboolean
- xfpm_battery_notify_idle (gpointer data)
- {
- XfpmBattery *battery = XFPM_BATTERY (data);
--
-+
- xfpm_battery_notify (battery);
- battery->priv->notify_idle = 0;
--
-+
- return FALSE;
- }
-
-@@ -375,10 +375,10 @@ xfpm_battery_notify_state (XfpmBattery *battery)
- {
- gboolean notify;
- static gboolean starting_up = TRUE;
--
-+
- if ( !gtk_status_icon_get_visible (GTK_STATUS_ICON (battery)) )
- return;
--
-+
- if ( battery->priv->type == XFPM_DEVICE_TYPE_BATTERY ||
- battery->priv->type == XFPM_DEVICE_TYPE_UPS )
- {
-@@ -387,11 +387,11 @@ xfpm_battery_notify_state (XfpmBattery *battery)
- starting_up = FALSE;
- return;
- }
--
-+
- g_object_get (G_OBJECT (battery->priv->conf),
- GENERAL_NOTIFICATION_CFG, ¬ify,
- NULL);
--
-+
- if ( notify )
- {
- if (battery->priv->notify_idle == 0)
-@@ -409,24 +409,24 @@ xfpm_battery_set_tooltip_primary (XfpmBattery *battery, GtkTooltip *tooltip)
- gchar *tip;
- gchar *est_time_str = NULL;
- gchar *power_status = NULL;
--
-+
- power_status = g_strdup_printf (battery->priv->ac_online ? _("Adaptor is online") : _("System is running on battery power"));
--
-+
- if ( battery->priv->state == XFPM_DEVICE_STATE_FULLY_CHARGED )
- {
- if ( battery->priv->time_to_empty > 0 )
- {
- est_time_str = xfpm_battery_get_time_string (battery->priv->time_to_empty);
-- tip = g_strdup_printf (_("%s\nYour %s is fully charged (%i%%).\nProvides %s runtime"),
-+ tip = g_strdup_printf (_("%s\nYour %s is fully charged (%i%%).\nProvides %s runtime"),
- power_status,
-- battery->priv->battery_name,
-+ battery->priv->battery_name,
- battery->priv->percentage,
- est_time_str);
- g_free (est_time_str);
- }
- else
- {
-- tip = g_strdup_printf (_("%s\nYour %s is fully charged (%i%%)."),
-+ tip = g_strdup_printf (_("%s\nYour %s is fully charged (%i%%)."),
- power_status,
- battery->priv->battery_name,
- battery->priv->percentage);
-@@ -437,10 +437,10 @@ xfpm_battery_set_tooltip_primary (XfpmBattery *battery, GtkTooltip *tooltip)
- if ( battery->priv->time_to_full != 0 )
- {
- est_time_str = xfpm_battery_get_time_string (battery->priv->time_to_full);
-- tip = g_strdup_printf (_("%s\nYour %s is charging (%i%%)\n%s until is fully charged."),
-+ tip = g_strdup_printf (_("%s\nYour %s is charging (%i%%)\n%s until is fully charged."),
- power_status,
-- battery->priv->battery_name,
-- battery->priv->percentage,
-+ battery->priv->battery_name,
-+ battery->priv->percentage,
- est_time_str);
- g_free (est_time_str);
- }
-@@ -457,10 +457,10 @@ xfpm_battery_set_tooltip_primary (XfpmBattery *battery, GtkTooltip *tooltip)
- if ( battery->priv->time_to_empty != 0 )
- {
- est_time_str = xfpm_battery_get_time_string (battery->priv->time_to_empty);
-- tip = g_strdup_printf (_("%s\nYour %s is discharging (%i%%)\nEstimated time left is %s."),
-+ tip = g_strdup_printf (_("%s\nYour %s is discharging (%i%%)\nEstimated time left is %s."),
- power_status,
-- battery->priv->battery_name,
-- battery->priv->percentage,
-+ battery->priv->battery_name,
-+ battery->priv->percentage,
- est_time_str);
- g_free (est_time_str);
- }
-@@ -471,7 +471,7 @@ xfpm_battery_set_tooltip_primary (XfpmBattery *battery, GtkTooltip *tooltip)
- battery->priv->battery_name,
- battery->priv->percentage);
- }
--
-+
- }
- else if ( battery->priv->state == XFPM_DEVICE_STATE_PENDING_CHARGING )
- {
-@@ -485,7 +485,7 @@ xfpm_battery_set_tooltip_primary (XfpmBattery *battery, GtkTooltip *tooltip)
- {
- tip = g_strdup_printf (_("%s\nYour %s is empty"), power_status, battery->priv->battery_name);
- }
--
-+
- gtk_tooltip_set_text (tooltip, tip);
- g_free (power_status);
- g_free (tip);
-@@ -496,20 +496,20 @@ xfpm_battery_check_charge (XfpmBattery *battery)
- {
- XfpmBatteryCharge charge;
- guint critical_level, low_level;
--
-+
- g_object_get (G_OBJECT (battery->priv->conf),
- CRITICAL_POWER_LEVEL, &critical_level,
- NULL);
--
-+
- low_level = critical_level + 10;
--
-+
- if ( battery->priv->percentage > low_level )
- charge = XFPM_BATTERY_CHARGE_OK;
- else if ( battery->priv->percentage <= low_level && battery->priv->percentage > critical_level )
- charge = XFPM_BATTERY_CHARGE_LOW;
- else if ( battery->priv->percentage <= critical_level )
- charge = XFPM_BATTERY_CHARGE_CRITICAL;
--
-+
- if ( charge != battery->priv->charge)
- {
- battery->priv->charge = charge;
-@@ -527,24 +527,24 @@ xfpm_battery_refresh (XfpmBattery *battery, GHashTable *props)
- {
- GValue *value;
- guint state;
--
-+
- value = g_hash_table_lookup (props, "IsPresent");
--
-+
- if ( value == NULL )
- {
- g_warning ("No 'IsPresent' property found");
- goto out;
- }
--
-+
- battery->priv->present = g_value_get_boolean (value);
--
-+
- value = g_hash_table_lookup (props, "State");
--
-+
- if ( value == NULL )
- {
- g_warning ("No 'State' property found");
- }
--
-+
- state = g_value_get_uint (value);
- if ( state != battery->priv->state )
- {
-@@ -552,45 +552,45 @@ xfpm_battery_refresh (XfpmBattery *battery, GHashTable *props)
- xfpm_battery_refresh_visible (battery);
- xfpm_battery_notify_state (battery);
- }
--
-+
- value = g_hash_table_lookup (props, "Percentage");
--
-+
- if ( value == NULL )
- {
- g_warning ("No 'Percentage' property found on battery device");
- goto out;
- }
--
-+
- battery->priv->percentage = (guint) g_value_get_double (value);
--
-+
- xfpm_battery_check_charge (battery);
--
-+
- xfpm_battery_refresh_icon (battery);
--
-+
- if ( battery->priv->type == XFPM_DEVICE_TYPE_BATTERY ||
- battery->priv->type == XFPM_DEVICE_TYPE_UPS )
- {
- value = g_hash_table_lookup (props, "TimeToEmpty");
--
-+
- if ( value == NULL )
- {
- g_warning ("No 'TimeToEmpty' property found on battery device");
- goto out;
- }
--
-+
- battery->priv->time_to_empty = g_value_get_int64 (value);
--
-+
- value = g_hash_table_lookup (props, "TimeToFull");
--
-+
- if ( value == NULL )
- {
- g_warning ("No 'TimeToFull' property found on battery device");
- goto out;
- }
--
-+
- battery->priv->time_to_full = g_value_get_int64 (value);
- }
--
-+
- out:
- g_hash_table_destroy (props);
- }
-@@ -606,23 +606,23 @@ static void
- xfpm_battery_changed_cb (DBusGProxy *proxy, XfpmBattery *battery)
- {
- GHashTable *props;
--
-- props = xfpm_power_get_interface_properties (battery->priv->proxy_prop,
-+
-+ props = xfpm_power_get_interface_properties (battery->priv->proxy_prop,
- UPOWER_IFACE_DEVICE);
--
-+
- if ( props )
- xfpm_battery_refresh (battery, props);
- }
-
- static gboolean
--xfpm_battery_query_tooltip (GtkStatusIcon *icon,
-+xfpm_battery_query_tooltip (GtkStatusIcon *icon,
- gint x,
- gint y,
- gboolean keyboard_mode,
- GtkTooltip *tooltip)
- {
- XfpmBattery *battery;
--
-+
- battery = XFPM_BATTERY (icon);
-
- if ( battery->priv->type == XFPM_DEVICE_TYPE_BATTERY ||
-@@ -631,7 +631,7 @@ xfpm_battery_query_tooltip (GtkStatusIcon *icon,
- xfpm_battery_set_tooltip_primary (battery, tooltip);
- return TRUE;
- }
--
-+
- return FALSE;
- }
-
-@@ -647,9 +647,9 @@ static void xfpm_battery_get_property (GObject *object,
- GParamSpec *pspec)
- {
- XfpmBattery *battery;
--
-+
- battery = XFPM_BATTERY (object);
--
-+
- switch (prop_id)
- {
- case PROP_AC_ONLINE:
-@@ -673,9 +673,9 @@ static void xfpm_battery_set_property (GObject *object,
- GParamSpec *pspec)
- {
- XfpmBattery *battery;
--
-+
- battery = XFPM_BATTERY (object);
--
-+
- switch (prop_id)
- {
- case PROP_AC_ONLINE:
-@@ -700,8 +700,8 @@ xfpm_battery_class_init (XfpmBatteryClass *klass)
- object_class->set_property = xfpm_battery_set_property;
-
- status_icon_class->query_tooltip = xfpm_battery_query_tooltip;
--
-- signals [BATTERY_CHARGE_CHANGED] =
-+
-+ signals [BATTERY_CHARGE_CHANGED] =
- g_signal_new ("battery-charge-changed",
- XFPM_TYPE_BATTERY,
- G_SIGNAL_RUN_LAST,
-@@ -709,7 +709,7 @@ xfpm_battery_class_init (XfpmBatteryClass *klass)
- NULL, NULL,
- g_cclosure_marshal_VOID__VOID,
- G_TYPE_NONE, 0, G_TYPE_NONE);
--
-+
- g_object_class_install_property (object_class,
- PROP_AC_ONLINE,
- g_param_spec_boolean("ac-online",
-@@ -740,7 +740,7 @@ static void
- xfpm_battery_init (XfpmBattery *battery)
- {
- battery->priv = XFPM_BATTERY_GET_PRIVATE (battery);
--
-+
- battery->priv->conf = xfpm_xfconf_new ();
- battery->priv->notify = xfpm_notify_new ();
- battery->priv->proxy_prop = NULL;
-@@ -752,11 +752,11 @@ xfpm_battery_init (XfpmBattery *battery)
- battery->priv->time_to_empty = 0;
- battery->priv->button = xfpm_button_new ();
- battery->priv->ac_online = TRUE;
--
-+
- battery->priv->sig = g_signal_connect (G_OBJECT (battery->priv->conf), "notify::" SHOW_TRAY_ICON_CFG,
- G_CALLBACK (xfpm_battery_tray_icon_settings_changed), battery);
--
--
-+
-+
- battery->priv->sig_bt = g_signal_connect (G_OBJECT (battery->priv->button), "button-pressed",
- G_CALLBACK (xfpm_battery_button_pressed_cb), battery);
- }
-@@ -767,7 +767,7 @@ xfpm_battery_finalize (GObject *object)
- XfpmBattery *battery;
-
- battery = XFPM_BATTERY (object);
--
-+
- g_free (battery->priv->icon_prefix);
-
- if (battery->priv->notify_idle != 0)
-@@ -775,13 +775,13 @@ xfpm_battery_finalize (GObject *object)
-
- dbus_g_proxy_disconnect_signal (battery->priv->proxy, "Changed",
- G_CALLBACK (xfpm_battery_changed_cb), battery);
--
-+
- if ( g_signal_handler_is_connected (battery->priv->conf, battery->priv->sig ) )
- g_signal_handler_disconnect (G_OBJECT (battery->priv->conf), battery->priv->sig);
--
-+
- if ( g_signal_handler_is_connected (battery->priv->button, battery->priv->sig_bt ) )
- g_signal_handler_disconnect (G_OBJECT (battery->priv->button), battery->priv->sig_bt);
--
-+
- g_object_unref (battery->priv->proxy);
- g_object_unref (battery->priv->proxy_prop);
- g_object_unref (battery->priv->conf);
-@@ -798,23 +798,23 @@ xfpm_battery_get_icon_prefix_device_enum_type (XfpmDeviceType type)
- {
- return g_strdup (XFPM_PRIMARY_ICON_PREFIX);
- }
-- else if ( type == XFPM_DEVICE_TYPE_UPS )
-+ else if ( type == XFPM_DEVICE_TYPE_UPS )
- {
- return g_strdup (XFPM_UPS_ICON_PREFIX);
- }
-- else if ( type == XFPM_DEVICE_TYPE_MOUSE )
-+ else if ( type == XFPM_DEVICE_TYPE_MOUSE )
- {
- return g_strdup (XFPM_MOUSE_ICON_PREFIX);
- }
-- else if ( type == XFPM_DEVICE_TYPE_KBD )
-+ else if ( type == XFPM_DEVICE_TYPE_KBD )
- {
- return g_strdup (XFPM_KBD_ICON_PREFIX);
- }
-- else if ( type == XFPM_DEVICE_TYPE_PHONE )
-+ else if ( type == XFPM_DEVICE_TYPE_PHONE )
- {
- return g_strdup (XFPM_PHONE_ICON_PREFIX);
- }
--
-+
- return g_strdup (XFPM_PRIMARY_ICON_PREFIX);
- }
-
-@@ -822,7 +822,7 @@ static const gchar *
- xfpm_battery_get_name (XfpmDeviceType type)
- {
- const gchar *name = NULL;
--
-+
- switch (type)
- {
- case XFPM_DEVICE_TYPE_BATTERY:
-@@ -850,7 +850,7 @@ xfpm_battery_get_name (XfpmDeviceType type)
- name = _("Unknown");
- break;
- }
--
-+
- return name;
- }
-
-@@ -858,9 +858,9 @@ GtkStatusIcon *
- xfpm_battery_new (void)
- {
- XfpmBattery *battery = NULL;
--
-+
- battery = g_object_new (XFPM_TYPE_BATTERY, NULL);
--
-+
- return GTK_STATUS_ICON (battery);
- }
-
-@@ -874,8 +874,8 @@ void xfpm_battery_monitor_device (XfpmBattery *battery,
- battery->priv->proxy = proxy;
- battery->priv->icon_prefix = xfpm_battery_get_icon_prefix_device_enum_type (device_type);
- battery->priv->battery_name = xfpm_battery_get_name (device_type);
--
--
-+
-+
- dbus_g_proxy_add_signal (proxy, "Changed", G_TYPE_INVALID);
- dbus_g_proxy_connect_signal (proxy, "Changed",
- G_CALLBACK (xfpm_battery_changed_cb), battery, NULL);
-@@ -890,27 +890,27 @@ void xfpm_battery_monitor_device (XfpmBattery *battery,
- XfpmDeviceType xfpm_battery_get_device_type (XfpmBattery *battery)
- {
- g_return_val_if_fail (XFPM_IS_BATTERY (battery), XFPM_DEVICE_TYPE_UNKNOWN );
--
-+
- return battery->priv->type;
- }
-
- XfpmBatteryCharge xfpm_battery_get_charge (XfpmBattery *battery)
- {
- g_return_val_if_fail (XFPM_IS_BATTERY (battery), XFPM_BATTERY_CHARGE_UNKNOWN);
--
-+
- return battery->priv->charge;
- }
-
- const gchar *xfpm_battery_get_battery_name (XfpmBattery *battery)
- {
- g_return_val_if_fail (XFPM_IS_BATTERY (battery), NULL);
--
-+
- return battery->priv->battery_name;
- }
-
- gchar *xfpm_battery_get_time_left (XfpmBattery *battery)
- {
- g_return_val_if_fail (XFPM_IS_BATTERY (battery), NULL);
--
-+
- return xfpm_battery_get_time_string (battery->priv->time_to_empty);
- }
---
-1.9.3
-
diff --git a/0082-Fix-incorrect-check-for-suspend-permissions-bug-8438.patch b/0082-Fix-incorrect-check-for-suspend-permissions-bug-8438.patch
deleted file mode 100644
index 8ef09d2..0000000
--- a/0082-Fix-incorrect-check-for-suspend-permissions-bug-8438.patch
+++ /dev/null
@@ -1,1418 +0,0 @@
-From 83b20fd2335a2cc54577019ea9af1a664a93ac28 Mon Sep 17 00:00:00 2001
-From: Lionel Le Folgoc <lionel at lefolgoc.net>
-Date: Sun, 11 Aug 2013 22:47:24 +0200
-Subject: [PATCH 082/219] Fix incorrect check for suspend permissions (bug
- #8438).
-
----
- src/xfpm-power.c | 508 +++++++++++++++++++++++++++----------------------------
- 1 file changed, 254 insertions(+), 254 deletions(-)
-
-diff --git a/src/xfpm-power.c b/src/xfpm-power.c
-index bcf2fbd..d703f8e 100644
---- a/src/xfpm-power.c
-+++ b/src/xfpm-power.c
-@@ -69,25 +69,25 @@ static void xfpm_power_refresh_adaptor_visible (XfpmPower *power);
- struct XfpmPowerPrivate
- {
- DBusGConnection *bus;
--
-+
- DBusGProxy *proxy;
- DBusGProxy *proxy_prop;
--
-+
- GHashTable *hash;
--
-+
- XfpmConsoleKit *console;
- XfpmInhibit *inhibit;
- XfpmXfconf *conf;
- GtkStatusIcon *adapter_icon;
--
-+
- XfpmBatteryCharge overall_state;
- gboolean critical_action_done;
--
-+
- XfpmPowerMode power_mode;
- EggIdletime *idletime;
--
-+
- gboolean inhibited;
--
-+
- XfpmNotify *notify;
- #ifdef ENABLE_POLKIT
- XfpmPolkit *polkit;
-@@ -103,9 +103,9 @@ struct XfpmPowerPrivate
- gchar *daemon_version;
- gboolean can_suspend;
- gboolean can_hibernate;
--
-+
- /**
-- * Warning dialog to use when notification daemon
-+ * Warning dialog to use when notification daemon
- * doesn't support actions.
- **/
- GtkWidget *dialog;
-@@ -144,10 +144,10 @@ G_DEFINE_TYPE (XfpmPower, xfpm_power, G_TYPE_OBJECT)
- static void
- xfpm_power_check_polkit_auth (XfpmPower *power)
- {
-- power->priv->auth_suspend = xfpm_polkit_check_auth (power->priv->polkit,
-+ power->priv->auth_suspend = xfpm_polkit_check_auth (power->priv->polkit,
- POLKIT_AUTH_SUSPEND);
-
-- power->priv->auth_hibernate = xfpm_polkit_check_auth (power->priv->polkit,
-+ power->priv->auth_hibernate = xfpm_polkit_check_auth (power->priv->polkit,
- POLKIT_AUTH_HIBERNATE);
-
- }
-@@ -158,30 +158,30 @@ xfpm_power_check_pm (XfpmPower *power, GHashTable *props)
- {
- GValue *value;
- gboolean ret;
--
-+
- value = g_hash_table_lookup (props, "CanSuspend");
--
-- if (value == NULL)
-+
-+ if (value == NULL)
- {
- g_warning ("No 'CanSuspend' property");
- }
- ret = g_value_get_boolean (value);
--
-- if (ret != power->priv->can_suspend)
-+
-+ if (ret != power->priv->can_suspend)
- {
- power->priv->can_suspend = ret;
- }
-
- value = g_hash_table_lookup (props, "CanHibernate");
--
-- if (value == NULL)
-+
-+ if (value == NULL)
- {
- g_warning ("No 'CanHibernate' property");
- }
--
-+
- ret = g_value_get_boolean (value);
--
-- if (ret != power->priv->can_hibernate)
-+
-+ if (ret != power->priv->can_hibernate)
- {
- power->priv->can_hibernate = ret;
- }
-@@ -192,14 +192,14 @@ xfpm_power_check_power (XfpmPower *power, GHashTable *props)
- {
- GValue *value;
- gboolean on_battery;
--
-+
- value = g_hash_table_lookup (props, "OnBattery");
--
-- if (G_LIKELY (value))
-+
-+ if (G_LIKELY (value))
- {
- on_battery = g_value_get_boolean (value);
--
-- if (on_battery != power->priv->on_battery )
-+
-+ if (on_battery != power->priv->on_battery )
- {
- GList *list;
- guint len, i;
-@@ -209,7 +209,7 @@ xfpm_power_check_power (XfpmPower *power, GHashTable *props)
- len = g_list_length (list);
- for ( i = 0; i < len; i++)
- {
-- g_object_set (G_OBJECT (g_list_nth_data (list, i)),
-+ g_object_set (G_OBJECT (g_list_nth_data (list, i)),
- "ac-online", !on_battery,
- NULL);
- }
-@@ -225,10 +225,10 @@ static void
- xfpm_power_check_lid (XfpmPower *power, GHashTable *props)
- {
- GValue *value;
--
-+
- value = g_hash_table_lookup (props, "LidIsPresent");
--
-- if (value == NULL)
-+
-+ if (value == NULL)
- {
- g_warning ("No 'LidIsPresent' property");
- return;
-@@ -236,21 +236,21 @@ xfpm_power_check_lid (XfpmPower *power, GHashTable *props)
-
- power->priv->lid_is_present = g_value_get_boolean (value);
-
-- if (power->priv->lid_is_present)
-+ if (power->priv->lid_is_present)
- {
- gboolean closed;
--
-+
- value = g_hash_table_lookup (props, "LidIsClosed");
--
-- if (value == NULL)
-+
-+ if (value == NULL)
- {
- g_warning ("No 'LidIsClosed' property");
- return;
- }
--
-+
- closed = g_value_get_boolean (value);
--
-- if (closed != power->priv->lid_is_closed )
-+
-+ if (closed != power->priv->lid_is_closed )
- {
- power->priv->lid_is_closed = closed;
- g_signal_emit (G_OBJECT (power), signals [LID_CHANGED], 0, power->priv->lid_is_closed);
-@@ -260,7 +260,7 @@ xfpm_power_check_lid (XfpmPower *power, GHashTable *props)
-
- /*
- * Get the properties on org.freedesktop.DeviceKit.Power
-- *
-+ *
- * DaemonVersion 's'
- * CanSuspend' 'b'
- * CanHibernate' 'b'
-@@ -273,9 +273,9 @@ static void
- xfpm_power_get_properties (XfpmPower *power)
- {
- GHashTable *props;
--
-+
- props = xfpm_power_get_interface_properties (power->priv->proxy_prop, UPOWER_IFACE);
--
-+
- xfpm_power_check_pm (power, props);
- xfpm_power_check_lid (power, props);
- xfpm_power_check_power (power, props);
-@@ -289,10 +289,10 @@ xfpm_power_report_error (XfpmPower *power, const gchar *error, const gchar *icon
- GtkStatusIcon *battery = NULL;
- guint i, len;
- GList *list;
--
-+
- list = g_hash_table_get_values (power->priv->hash);
- len = g_list_length (list);
--
-+
- for ( i = 0; i < len; i++)
- {
- XfpmDeviceType type;
-@@ -302,16 +302,16 @@ xfpm_power_report_error (XfpmPower *power, const gchar *error, const gchar *icon
- type == XFPM_DEVICE_TYPE_UPS )
- break;
- }
--
-- xfpm_notify_show_notification (power->priv->notify,
-- _("Power Manager"),
-- error,
-+
-+ xfpm_notify_show_notification (power->priv->notify,
-+ _("Power Manager"),
-+ error,
- icon_name,
- 10000,
- FALSE,
- XFPM_NOTIFY_CRITICAL,
- battery);
--
-+
- }
-
- static void
-@@ -319,7 +319,7 @@ xfpm_power_sleep (XfpmPower *power, const gchar *sleep_time, gboolean force)
- {
- GError *error = NULL;
- gboolean lock_screen;
--
-+
- if ( power->priv->inhibited && force == FALSE)
- {
- gboolean ret;
-@@ -333,24 +333,24 @@ xfpm_power_sleep (XfpmPower *power, const gchar *sleep_time, gboolean force)
- if ( !ret )
- return;
- }
--
-+
- g_signal_emit (G_OBJECT (power), signals [SLEEPING], 0);
- xfpm_network_manager_sleep (TRUE);
--
-+
- g_object_get (G_OBJECT (power->priv->conf),
- LOCK_SCREEN_ON_SLEEP, &lock_screen,
- NULL);
--
-+
- if ( lock_screen )
- {
- g_usleep (2000000); /* 2 seconds */
- xfpm_lock_screen ();
- }
--
-+
- dbus_g_proxy_call (power->priv->proxy, sleep_time, &error,
- G_TYPE_INVALID,
- G_TYPE_INVALID);
--
-+
- if ( error )
- {
- if ( g_error_matches (error, DBUS_GERROR, DBUS_GERROR_NO_REPLY) )
-@@ -364,12 +364,12 @@ xfpm_power_sleep (XfpmPower *power, const gchar *sleep_time, gboolean force)
- icon_name = XFPM_HIBERNATE_ICON;
- else
- icon_name = XFPM_SUSPEND_ICON;
--
-+
- xfpm_power_report_error (power, error->message, icon_name);
- g_error_free (error);
- }
- }
--
-+
- g_signal_emit (G_OBJECT (power), signals [WAKING_UP], 0);
- xfpm_network_manager_sleep (FALSE);
- }
-@@ -420,9 +420,9 @@ static void
- xfpm_power_tray_exit_activated_cb (gpointer data)
- {
- gboolean ret;
--
-- ret = xfce_dialog_confirm (NULL,
-- GTK_STOCK_YES,
-+
-+ ret = xfce_dialog_confirm (NULL,
-+ GTK_STOCK_YES,
- _("Quit"),
- _("All running instances of the power manager will exit"),
- "%s",
-@@ -439,19 +439,19 @@ xfpm_power_change_mode (XfpmPower *power, XfpmPowerMode mode)
- {
- #ifdef HAVE_DPMS
- XfpmDpms *dpms;
--
-+
- power->priv->power_mode = mode;
--
-+
- dpms = xfpm_dpms_new ();
- xfpm_dpms_refresh (dpms);
- g_object_unref (dpms);
--
-+
- if (mode == XFPM_POWER_MODE_NORMAL)
- {
- EggIdletime *idletime;
- idletime = egg_idletime_new ();
- egg_idletime_alarm_reset_all (idletime);
--
-+
- g_object_unref (idletime);
- }
- #endif
-@@ -470,9 +470,9 @@ xfpm_power_presentation_mode_cb (XfpmPower *power)
- }
-
- static void
--xfpm_power_show_tray_menu (XfpmPower *power,
-- GtkStatusIcon *icon,
-- guint button,
-+xfpm_power_show_tray_menu (XfpmPower *power,
-+ GtkStatusIcon *icon,
-+ guint button,
- guint activate_time,
- gboolean show_info_item)
- {
-@@ -485,7 +485,7 @@ xfpm_power_show_tray_menu (XfpmPower *power,
- img = gtk_image_new_from_icon_name (XFPM_HIBERNATE_ICON, GTK_ICON_SIZE_MENU);
- gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (mi), img);
- gtk_widget_set_sensitive (mi, FALSE);
--
-+
- if ( power->priv->can_hibernate && power->priv->auth_hibernate)
- {
- gtk_widget_set_sensitive (mi, TRUE);
-@@ -494,21 +494,21 @@ xfpm_power_show_tray_menu (XfpmPower *power,
- }
- gtk_widget_show (mi);
- gtk_menu_shell_append (GTK_MENU_SHELL (menu), mi);
--
-+
- // Suspend menu option
- mi = gtk_image_menu_item_new_with_label (_("Suspend"));
- img = gtk_image_new_from_icon_name (XFPM_SUSPEND_ICON, GTK_ICON_SIZE_MENU);
- gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (mi), img);
--
-+
- gtk_widget_set_sensitive (mi, FALSE);
--
-- if ( power->priv->can_suspend && power->priv->auth_hibernate)
-+
-+ if ( power->priv->can_suspend && power->priv->auth_suspend)
- {
- gtk_widget_set_sensitive (mi, TRUE);
- g_signal_connect_swapped (mi, "activate",
- G_CALLBACK (xfpm_power_suspend_cb), power);
- }
--
-+
- gtk_widget_show (mi);
- gtk_menu_shell_append (GTK_MENU_SHELL (menu), mi);
- /*
-@@ -518,14 +518,14 @@ xfpm_power_show_tray_menu (XfpmPower *power,
- gtk_widget_set_tooltip_text (mi, _("Disable or enable monitor power control, "\
- "for example you could disable the screen power "\
- "control to avoid screen blanking when watching a movie."));
--
-+
- g_signal_connect (G_OBJECT (mi), "activate",
- G_CALLBACK (xfpm_tray_icon_inhibit_active_cb), tray);
- gtk_widget_set_sensitive (mi, TRUE);
- gtk_widget_show(mi);
- gtk_menu_shell_append(GTK_MENU_SHELL(menu),mi);
- */
--
-+
- mi = gtk_separator_menu_item_new ();
- gtk_widget_show (mi);
- gtk_menu_shell_append (GTK_MENU_SHELL (menu), mi);
-@@ -536,14 +536,14 @@ xfpm_power_show_tray_menu (XfpmPower *power,
- gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (mi), img);
-
- gtk_widget_set_sensitive (mi,TRUE);
--
-+
- g_signal_connect_swapped (mi, "activate",
- G_CALLBACK (xfpm_power_power_info_cb), icon);
--
-+
- gtk_widget_show (mi);
- gtk_menu_shell_append (GTK_MENU_SHELL (menu), mi);
--
-- /**
-+
-+ /**
- * Power Mode
- **/
- /* TRANSLATOR: Mode here is the power profile (presentation, power save, normal) */
-@@ -552,55 +552,55 @@ xfpm_power_show_tray_menu (XfpmPower *power,
- gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (mi), img);
- gtk_widget_set_sensitive (mi,TRUE);
- gtk_widget_show (mi);
--
-+
- subm = gtk_menu_new ();
- gtk_menu_item_set_submenu (GTK_MENU_ITEM (mi), subm);
- gtk_menu_shell_append (GTK_MENU_SHELL (menu), mi);
--
-+
- /* Normal*/
- mi = gtk_check_menu_item_new_with_label (_("Normal"));
- gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (mi), power->priv->power_mode == XFPM_POWER_MODE_NORMAL);
- gtk_widget_set_sensitive (mi,TRUE);
--
-+
- g_signal_connect_swapped (mi, "activate",
- G_CALLBACK (xfpm_power_normal_mode_cb), power);
- gtk_widget_show (mi);
- gtk_menu_shell_append (GTK_MENU_SHELL (subm), mi);
--
-+
- /* Normal*/
- mi = gtk_check_menu_item_new_with_label (_("Presentation"));
- gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (mi), power->priv->power_mode == XFPM_POWER_MODE_PRESENTATION);
- gtk_widget_set_sensitive (mi, TRUE);
--
-+
- g_signal_connect_swapped (mi, "activate",
- G_CALLBACK (xfpm_power_presentation_mode_cb), power);
- gtk_widget_show (mi);
- gtk_menu_shell_append (GTK_MENU_SHELL (subm), mi);
--
--
-+
-+
- mi = gtk_separator_menu_item_new ();
- gtk_widget_show (mi);
- gtk_menu_shell_append (GTK_MENU_SHELL (menu), mi);
--
-+
- mi = gtk_image_menu_item_new_from_stock (GTK_STOCK_HELP, NULL);
- gtk_widget_set_sensitive (mi, TRUE);
- gtk_widget_show (mi);
- g_signal_connect (mi, "activate", G_CALLBACK (xfpm_help), NULL);
--
-+
- gtk_menu_shell_append (GTK_MENU_SHELL (menu), mi);
--
-+
- mi = gtk_image_menu_item_new_from_stock (GTK_STOCK_ABOUT, NULL);
- gtk_widget_set_sensitive (mi, TRUE);
- gtk_widget_show (mi);
- g_signal_connect (mi, "activate", G_CALLBACK (xfpm_about), _("Power Manager"));
--
-+
- gtk_menu_shell_append (GTK_MENU_SHELL(menu), mi);
--
-+
- mi = gtk_image_menu_item_new_from_stock (GTK_STOCK_PREFERENCES, NULL);
- gtk_widget_set_sensitive (mi, TRUE);
- gtk_widget_show (mi);
- g_signal_connect (mi, "activate",G_CALLBACK (xfpm_preferences), NULL);
--
-+
- gtk_menu_shell_append (GTK_MENU_SHELL (menu), mi);
-
- mi = gtk_separator_menu_item_new ();
-@@ -618,20 +618,20 @@ xfpm_power_show_tray_menu (XfpmPower *power,
-
- // Popup the menu
- gtk_menu_popup(GTK_MENU(menu), NULL, NULL,
-- gtk_status_icon_position_menu,
-+ gtk_status_icon_position_menu,
- icon, button, activate_time);
--
-+
- }
-
--static void
--xfpm_power_show_tray_menu_battery (GtkStatusIcon *icon, guint button,
-+static void
-+xfpm_power_show_tray_menu_battery (GtkStatusIcon *icon, guint button,
- guint activate_time, XfpmPower *power)
- {
- xfpm_power_show_tray_menu (power, icon, button, activate_time, TRUE);
- }
-
--static void
--xfpm_power_show_tray_menu_adaptor (GtkStatusIcon *icon, guint button,
-+static void
-+xfpm_power_show_tray_menu_adaptor (GtkStatusIcon *icon, guint button,
- guint activate_time, XfpmPower *power)
- {
- xfpm_power_show_tray_menu (power, icon, button, activate_time, FALSE);
-@@ -643,26 +643,26 @@ xfpm_power_get_current_charge_state (XfpmPower *power)
- GList *list;
- guint len, i;
- XfpmBatteryCharge max_charge_status = XFPM_BATTERY_CHARGE_UNKNOWN;
--
-+
- list = g_hash_table_get_values (power->priv->hash);
- len = g_list_length (list);
--
-+
- for ( i = 0; i < len; i++)
- {
- XfpmBatteryCharge battery_charge;
- XfpmDeviceType type;
--
-+
- g_object_get (G_OBJECT (g_list_nth_data (list, i)),
- "charge-status", &battery_charge,
- "device-type", &type,
- NULL);
-- if ( type != XFPM_DEVICE_TYPE_BATTERY &&
-+ if ( type != XFPM_DEVICE_TYPE_BATTERY &&
- type != XFPM_DEVICE_TYPE_UPS )
- continue;
--
-+
- max_charge_status = MAX (max_charge_status, battery_charge);
- }
--
-+
- return max_charge_status;
- }
<Skipped 7626 lines>
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/xfce4-power-manager.git/commitdiff/b40c9133749b6053378f6625611d26919bcd6cab
More information about the pld-cvs-commit
mailing list