summaryrefslogtreecommitdiff
path: root/community/cinnamon-control-center
diff options
context:
space:
mode:
authorroot <root@rshg054.dnsready.net>2013-05-18 02:14:12 -0700
committerroot <root@rshg054.dnsready.net>2013-05-18 02:14:12 -0700
commit4e1091baf58d4d28f6bf3cc4fee8ea0bfd10a7a8 (patch)
tree84f66b46f238f46928efc905cad1b88a2d96c668 /community/cinnamon-control-center
parentb5f4c940227b9a7051c381688636d59f67864f93 (diff)
Sat May 18 02:12:59 PDT 2013
Diffstat (limited to 'community/cinnamon-control-center')
-rw-r--r--community/cinnamon-control-center/PKGBUILD6
-rw-r--r--community/cinnamon-control-center/gnomerrlabeler.patch29
2 files changed, 23 insertions, 12 deletions
diff --git a/community/cinnamon-control-center/PKGBUILD b/community/cinnamon-control-center/PKGBUILD
index 5ec28c926..3769e32f9 100644
--- a/community/cinnamon-control-center/PKGBUILD
+++ b/community/cinnamon-control-center/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 90134 2013-05-06 22:58:48Z faidoc $
+# $Id: PKGBUILD 90971 2013-05-16 22:26:24Z bgyorgy $
# Maintainer: Alexandre Filgueira <alexfilgueira@cinnarch.com
# Based on gnome-control-center:
# Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
@@ -6,7 +6,7 @@
pkgname=cinnamon-control-center
pkgver=1.8.0
-pkgrel=1
+pkgrel=2
pkgdesc="The Control Center for Cinnamon"
arch=('i686' 'x86_64')
depends=('cinnamon' 'cheese' 'libgnomekbd' 'network-manager-applet')
@@ -20,7 +20,7 @@ source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/cinnamon-control-
"gnomerrlabeler.patch"
"idle-delay.patch")
sha256sums=('7230d509f5837906b5497279cfbd96180e5c8dad89777fb31a81fd0c73354fa9'
- '604f0a30369d0380a0c5634f1fd50f3f44a89c0b3caec66b60d9e2648b569b90'
+ 'a01db243251c3da59c969d4538a35a63020d1e20866ff700ef273debd05456db'
'42ea92628dc234d65e582592a66c0011d5bb2c2eac14854a06f7a9dc923c8d67')
build() {
diff --git a/community/cinnamon-control-center/gnomerrlabeler.patch b/community/cinnamon-control-center/gnomerrlabeler.patch
index b263613c4..7160bc788 100644
--- a/community/cinnamon-control-center/gnomerrlabeler.patch
+++ b/community/cinnamon-control-center/gnomerrlabeler.patch
@@ -1,5 +1,6 @@
---- cinnamon-control-center-1.8.0.orig/panels/display/cc-display-panel.c 2013-05-05 13:12:28.000000000 +0200
-+++ cinnamon-control-center-1.8.0/panels/display/cc-display-panel.c 2013-05-07 00:27:44.901035877 +0200
+diff -Naur cinnamon-control-center-1.7.3.orig/panels/display/cc-display-panel.c cinnamon-control-center-1.7.3/panels/display/cc-display-panel.c
+--- cinnamon-control-center-1.7.3.orig/panels/display/cc-display-panel.c 2013-04-15 16:04:38.000000000 +0200
++++ cinnamon-control-center-1.7.3/panels/display/cc-display-panel.c 2013-04-22 03:46:53.499944701 +0200
@@ -31,12 +31,13 @@
#define GNOME_DESKTOP_USE_UNSTABLE_API
#include <libgnome-desktop/gnome-rr.h>
@@ -33,7 +34,7 @@
g_object_unref (self->priv->labeler);
G_OBJECT_CLASS (cc_display_panel_parent_class)->finalize (object);
-@@ -293,14 +294,14 @@
+@@ -293,16 +294,16 @@
self->priv->current_output = NULL;
if (self->priv->labeler) {
@@ -42,26 +43,36 @@
g_object_unref (self->priv->labeler);
}
- self->priv->labeler = gnome_rr_labeler_new (self->priv->current_configuration);
+- self->priv->labeler = gnome_rr_labeler_new (self->priv->current_configuration);
++ self->priv->labeler = cc_rr_labeler_new (self->priv->current_configuration);
if (cc_panel_get_shell (CC_PANEL (self)) == NULL)
- gnome_rr_labeler_hide (self->priv->labeler);
+ cc_rr_labeler_hide (self->priv->labeler);
else
- gnome_rr_labeler_show (self->priv->labeler);
+- gnome_rr_labeler_show (self->priv->labeler);
++ cc_rr_labeler_show (self->priv->labeler);
-@@ -2596,7 +2597,7 @@
+ select_current_output_from_dialog_position (self);
+
+@@ -2594,9 +2595,9 @@
+ if (self->priv->labeler == NULL)
+ return;
if (gtk_window_has_toplevel_focus (window))
- gnome_rr_labeler_show (self->priv->labeler);
+- gnome_rr_labeler_show (self->priv->labeler);
++ cc_rr_labeler_show (self->priv->labeler);
else
- gnome_rr_labeler_hide (self->priv->labeler);
+ cc_rr_labeler_hide (self->priv->labeler);
}
static void
-@@ -2608,7 +2609,7 @@
+@@ -2606,9 +2607,9 @@
+ if (CC_DISPLAY_PANEL(widget)->priv->labeler == NULL)
+ return;
if (gtk_widget_get_visible (widget)) {
- gnome_rr_labeler_show (CC_DISPLAY_PANEL (widget)->priv->labeler);
+- gnome_rr_labeler_show (CC_DISPLAY_PANEL (widget)->priv->labeler);
++ cc_rr_labeler_show (CC_DISPLAY_PANEL (widget)->priv->labeler);
} else {
- gnome_rr_labeler_hide (CC_DISPLAY_PANEL (widget)->priv->labeler);
+ cc_rr_labeler_hide (CC_DISPLAY_PANEL (widget)->priv->labeler);