diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-11-15 11:37:21 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-11-15 11:37:21 -0300 |
| commit | a1ae9076f18ec51553e17dfe867f95b6b4931362 (patch) | |
| tree | c0ca52078abd65c9f3d4c40cf871bbae7d17d5c2 /extra/gnome-settings-daemon | |
| parent | 7caeeae33fd491dbea5044168bbc50197963118c (diff) | |
| parent | 28b13b7e8e6e1e4fa1593f0dfb1c37569f2f90a8 (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/asunder/PKGBUILD
community/gshare/PKGBUILD
community/kim4/PKGBUILD
community/listen/PKGBUILD
community/mercury/PKGBUILD
core/eglibc/nscd
Diffstat (limited to 'extra/gnome-settings-daemon')
| -rw-r--r-- | extra/gnome-settings-daemon/upower.patch | 28 |
1 files changed, 0 insertions, 28 deletions
diff --git a/extra/gnome-settings-daemon/upower.patch b/extra/gnome-settings-daemon/upower.patch deleted file mode 100644 index 36dad59e3..000000000 --- a/extra/gnome-settings-daemon/upower.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff -u -r gnome-settings-daemon-3.2.1-orig/plugins/media-keys/gsd-media-keys-manager.c gnome-settings-daemon-3.2.1/plugins/media-keys/gsd-media-keys-manager.c ---- gnome-settings-daemon-3.2.1-orig/plugins/media-keys/gsd-media-keys-manager.c 2011-10-20 08:19:31.818642262 +0200 -+++ gnome-settings-daemon-3.2.1/plugins/media-keys/gsd-media-keys-manager.c 2011-10-20 08:23:55.127492221 +0200 -@@ -2066,15 +2066,15 @@ - (GAsyncReadyCallback) power_keyboard_ready_cb, - manager); - -- g_dbus_proxy_new (manager->priv->connection, -- G_DBUS_PROXY_FLAGS_NONE, -- NULL, -- "org.freedesktop.UPower", -- "/org/freedesktop/UPower", -- "org.freedesktop.UPower", -- NULL, -- (GAsyncReadyCallback) upower_ready_cb, -- manager); -+ g_dbus_proxy_new_for_bus (G_BUS_TYPE_SYSTEM, -+ G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES, -+ NULL, -+ "org.freedesktop.UPower", -+ "/org/freedesktop/UPower", -+ "org.freedesktop.UPower", -+ NULL, -+ (GAsyncReadyCallback) upower_ready_cb, -+ manager); - } - - static void |