diff options
| author | Stefano Karapetsas <[email protected]> | 2013-12-23 11:21:21 -0800 |
|---|---|---|
| committer | Stefano Karapetsas <[email protected]> | 2013-12-23 11:21:21 -0800 |
| commit | eecaa6cf912640153afee8356aabc39c918101c0 (patch) | |
| tree | b0d850afc3ba4865b761764fda84206e6d239f2a /capplets/display | |
| parent | 7c719d6bebe37bfff23e6c0b8241ebb94a086e0e (diff) | |
| parent | 52ae123edd9b132d04db6199541a797ecc414015 (diff) | |
| download | mate-control-center-eecaa6cf912640153afee8356aabc39c918101c0.tar.bz2 mate-control-center-eecaa6cf912640153afee8356aabc39c918101c0.tar.xz | |
Merge pull request #79 from infirit/1.6
Cherrypick usefull commits from master
Diffstat (limited to 'capplets/display')
| -rw-r--r-- | capplets/display/Makefile.am | 2 | ||||
| -rw-r--r-- | capplets/display/mate-display-properties.desktop.in.in (renamed from capplets/display/display-properties.desktop.in.in) | 0 | ||||
| -rw-r--r-- | capplets/display/xrandr-capplet.c | 6 |
3 files changed, 1 insertions, 7 deletions
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/mate-display-properties.desktop.in.in index 607e354e..607e354e 100644 --- a/capplets/display/display-properties.desktop.in.in +++ b/capplets/display/mate-display-properties.desktop.in.in 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; } } |