From bca9f94f20475cce6b0c6090226679fa89eaf31f Mon Sep 17 00:00:00 2001
From: infirit <infirit@gmail.com>
Date: Mon, 26 Aug 2013 17:10:47 +0200
Subject: Rename .desktop files to avoid file collision with Gnome2

---
 capplets/display/Makefile.am                           |  2 +-
 capplets/display/display-properties.desktop.in.in      | 10 ----------
 capplets/display/mate-display-properties.desktop.in.in | 10 ++++++++++
 3 files changed, 11 insertions(+), 11 deletions(-)
 delete mode 100644 capplets/display/display-properties.desktop.in.in
 create mode 100644 capplets/display/mate-display-properties.desktop.in.in

(limited to 'capplets/display')

diff --git a/capplets/display/Makefile.am b/capplets/display/Makefile.am
index 972f271d..4a304a97 100644
--- a/capplets/display/Makefile.am
+++ b/capplets/display/Makefile.am
@@ -48,7 +48,7 @@ iconssvgdir = $(datadir)/icons/hicolor/scalable/apps
 dist_iconssvg_DATA = icons/scalable/mate-preferences-desktop-display.svg
 
 desktopdir = $(datadir)/applications
-Desktop_in_files = display-properties.desktop.in
+Desktop_in_files = mate-display-properties.desktop.in
 desktop_DATA = $(Desktop_in_files:.desktop.in=.desktop)
 
 AM_CPPFLAGS   = $(DISPLAY_CAPPLET_CFLAGS) \
diff --git a/capplets/display/display-properties.desktop.in.in b/capplets/display/display-properties.desktop.in.in
deleted file mode 100644
index 607e354e..00000000
--- a/capplets/display/display-properties.desktop.in.in
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-_Name=Monitors
-_Comment=Change resolution and position of monitors
-Exec=mate-display-properties
-Icon=mate-preferences-desktop-display
-Terminal=false
-Type=Application
-StartupNotify=true
-Categories=GTK;Settings;HardwareSettings;
-OnlyShowIn=MATE;
diff --git a/capplets/display/mate-display-properties.desktop.in.in b/capplets/display/mate-display-properties.desktop.in.in
new file mode 100644
index 00000000..607e354e
--- /dev/null
+++ b/capplets/display/mate-display-properties.desktop.in.in
@@ -0,0 +1,10 @@
+[Desktop Entry]
+_Name=Monitors
+_Comment=Change resolution and position of monitors
+Exec=mate-display-properties
+Icon=mate-preferences-desktop-display
+Terminal=false
+Type=Application
+StartupNotify=true
+Categories=GTK;Settings;HardwareSettings;
+OnlyShowIn=MATE;
-- 
cgit v1.2.1


From 8aaf030b5a40af8520cef1d11097948c563cef11 Mon Sep 17 00:00:00 2001
From: Stefano Karapetsas <stefano@karapetsas.com>
Date: Sat, 5 Oct 2013 22:59:01 +0200
Subject: Fix some deprecations and remove some unused vars

---
 capplets/display/xrandr-capplet.c | 6 ------
 1 file changed, 6 deletions(-)

(limited to 'capplets/display')

diff --git a/capplets/display/xrandr-capplet.c b/capplets/display/xrandr-capplet.c
index 433b25db..7b3d2057 100644
--- a/capplets/display/xrandr-capplet.c
+++ b/capplets/display/xrandr-capplet.c
@@ -229,7 +229,6 @@ add_key (GtkWidget *widget,
     GtkComboBox *box = GTK_COMBO_BOX (widget);
     GtkTreeModel *model = gtk_combo_box_get_model (box);
     GtkListStore *store = GTK_LIST_STORE (model);
-    gboolean retval;
 
     info.text = text;
     info.found = FALSE;
@@ -248,11 +247,6 @@ add_key (GtkWidget *widget,
                                            5, rotation,
                                            -1);
 
-	retval = TRUE;
-    }
-    else
-    {
-	retval = FALSE;
     }
 }
 
-- 
cgit v1.2.1