[arch-commits] Commit in cinnamon-control-center/trunk (PKGBUILD gnomerrlabeler.patch)

[Alexandre Filgueira]

    Date: Tuesday, May 7, 2013 @ 00:58:19
  Author: faidoc
Revision: 90133

upgpkg: cinnamon-control-center 1.8.0-1

Modified:
  cinnamon-control-center/trunk/PKGBUILD
  cinnamon-control-center/trunk/gnomerrlabeler.patch

----------------------+
 PKGBUILD             |    6 +++---
 gnomerrlabeler.patch |   31 ++++++++++---------------------
 2 files changed, 13 insertions(+), 24 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-05-06 22:22:04 UTC (rev 90132)
+++ PKGBUILD	2013-05-06 22:58:19 UTC (rev 90133)
@@ -5,7 +5,7 @@
 # Jan de Groot <jgc at archlinux.org>
 
 pkgname=cinnamon-control-center
-pkgver=1.7.5
+pkgver=1.8.0
 pkgrel=1
 pkgdesc="The Control Center for Cinnamon"
 arch=('i686' 'x86_64')
@@ -19,8 +19,8 @@
 source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/cinnamon-control-center/archive/$pkgver.tar.gz"
         "gnomerrlabeler.patch"
         "idle-delay.patch")
-sha256sums=('50192b279bd2d6c9a0cb686144d5cf8195e33fbe1e107baeca6da03a638e1f8d'
-            '826de61fa60349a99c6895f2ffb0ea1c7f71031b17dd80bb245e3834b30b6ff6'
+sha256sums=('7230d509f5837906b5497279cfbd96180e5c8dad89777fb31a81fd0c73354fa9'
+            '604f0a30369d0380a0c5634f1fd50f3f44a89c0b3caec66b60d9e2648b569b90'
             '42ea92628dc234d65e582592a66c0011d5bb2c2eac14854a06f7a9dc923c8d67')
 
 build() {

Modified: gnomerrlabeler.patch
===================================================================
--- gnomerrlabeler.patch	2013-05-06 22:22:04 UTC (rev 90132)
+++ gnomerrlabeler.patch	2013-05-06 22:58:19 UTC (rev 90133)
@@ -1,6 +1,5 @@
-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
+--- 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
 @@ -31,12 +31,13 @@
  #define GNOME_DESKTOP_USE_UNSTABLE_API
  #include <libgnome-desktop/gnome-rr.h>
@@ -8,7 +7,7 @@
 -#include <libgnome-desktop/gnome-rr-labeler.h>
  #include <gdk/gdkx.h>
  #include <X11/Xlib.h>
- #include <glib/gi18n.h>
+ #include <glib/gi18n-lib.h>
  #include <gdesktop-enums.h>
  
 +#include "cc-rr-labeler.h"
@@ -34,7 +33,7 @@
    g_object_unref (self->priv->labeler);
  
    G_OBJECT_CLASS (cc_display_panel_parent_class)->finalize (object);
-@@ -293,16 +294,16 @@
+@@ -293,14 +294,14 @@
    self->priv->current_output = NULL;
  
    if (self->priv->labeler) {
@@ -43,36 +42,26 @@
      g_object_unref (self->priv->labeler);
    }
  
--  self->priv->labeler = gnome_rr_labeler_new (self->priv->current_configuration);
-+  self->priv->labeler = cc_rr_labeler_new (self->priv->current_configuration);
+   self->priv->labeler = gnome_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);
-+    cc_rr_labeler_show (self->priv->labeler);
+     gnome_rr_labeler_show (self->priv->labeler);
  
-   select_current_output_from_dialog_position (self);
- 
-@@ -2594,9 +2595,9 @@
-   if (self->priv->labeler == NULL)
-     return;
+@@ -2596,7 +2597,7 @@
    if (gtk_window_has_toplevel_focus (window))
--    gnome_rr_labeler_show (self->priv->labeler);
-+    cc_rr_labeler_show (self->priv->labeler);
+     gnome_rr_labeler_show (self->priv->labeler);
    else
 -    gnome_rr_labeler_hide (self->priv->labeler);
 +    cc_rr_labeler_hide (self->priv->labeler);
  }
  
  static void
-@@ -2606,9 +2607,9 @@
-     if (CC_DISPLAY_PANEL(widget)->priv->labeler == NULL)
-         return;
+@@ -2608,7 +2609,7 @@
      if (gtk_widget_get_visible (widget)) {
--        gnome_rr_labeler_show (CC_DISPLAY_PANEL (widget)->priv->labeler);
-+        cc_rr_labeler_show (CC_DISPLAY_PANEL (widget)->priv->labeler);
+         gnome_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);