From 0a52de76acd47411a0a04627fdd5f4ad933423ef Mon Sep 17 00:00:00 2001 From: leigh123linux Date: May 24 2016 06:22:14 +0000 Subject: update to 3.0.3 release --- diff --git a/.gitignore b/.gitignore index 5e6b278..1a7d15c 100644 --- a/.gitignore +++ b/.gitignore @@ -56,3 +56,4 @@ /nemo-3.0.0.tar.gz /nemo-3.0.1.tar.gz /nemo-3.0.2.tar.gz +/nemo-3.0.3.tar.gz diff --git a/0001-nemo-places-sidebar.c-When-gtk-overlay-scrolling-is-.patch b/0001-nemo-places-sidebar.c-When-gtk-overlay-scrolling-is-.patch deleted file mode 100644 index 076dc5a..0000000 --- a/0001-nemo-places-sidebar.c-When-gtk-overlay-scrolling-is-.patch +++ /dev/null @@ -1,76 +0,0 @@ -From b6fab99fc05be5948bc1497cf286e7ef1eb9f10e Mon Sep 17 00:00:00 2001 -From: Michael Webster -Date: Fri, 20 May 2016 10:27:30 -0400 -Subject: [PATCH] nemo-places-sidebar.c: When gtk overlay scrolling is in - effect, add some padding right of the sidebar eject icons, otherwise they are - covered by the scrollbar when it pops up. - ---- - src/nemo-places-sidebar.c | 37 +++++++++++++++++++++++++++++++++++++ - 1 file changed, 37 insertions(+) - -diff --git a/src/nemo-places-sidebar.c b/src/nemo-places-sidebar.c -index a5ceb27..da79480 100644 ---- a/src/nemo-places-sidebar.c -+++ b/src/nemo-places-sidebar.c -@@ -68,6 +68,7 @@ - #define EXPANDER_PAD_COLUMN_WIDTH 4 - #define EJECT_COLUMN_WIDTH 22 - #define DRAG_EXPAND_CATEGORY_DELAY 500 -+#define EJECT_PAD_COLUMN_WIDTH 14 - - typedef struct { - GtkScrolledWindow parent; -@@ -273,6 +274,27 @@ static GtkTreeStore *nemo_shortcuts_model_new (NemoPlacesSidebar *sidebar); - - G_DEFINE_TYPE (NemoPlacesSidebar, nemo_places_sidebar, GTK_TYPE_SCROLLED_WINDOW); - -+static gint overlay_scrolling_enabled = -1; -+ -+static gboolean get_overlay_scrolling_enabled (void) -+{ -+ if (overlay_scrolling_enabled > -1) { -+ return overlay_scrolling_enabled == 1; -+ } -+ -+ gchar *val = NULL; -+ -+ val = g_getenv ("GTK_OVERLAY_SCROLLING"); -+ -+ if (val == NULL || g_strcmp0 (val, "0") == 0) { -+ overlay_scrolling_enabled = 0; -+ } else { -+ overlay_scrolling_enabled = 1; -+ } -+ -+ return overlay_scrolling_enabled == 1; -+} -+ - static void - breakpoint_changed_cb (NemoPlacesSidebar *sidebar) - { -@@ -4124,6 +4146,21 @@ nemo_places_sidebar_init (NemoPlacesSidebar *sidebar) - gtk_tree_view_append_column (tree_view, col); - gtk_tree_view_append_column (tree_view, eject_col); - -+ if (gtk_get_major_version () == 3 && gtk_get_minor_version () >= 16) { -+ if (get_overlay_scrolling_enabled ()) { -+ GtkTreeViewColumn *eject_pad_col; -+ -+ eject_pad_col = GTK_TREE_VIEW_COLUMN (gtk_tree_view_column_new()); -+ cell = gtk_cell_renderer_text_new (); -+ -+ gtk_tree_view_column_pack_start (eject_pad_col, cell, FALSE); -+ gtk_tree_view_column_set_sizing (eject_pad_col, GTK_TREE_VIEW_COLUMN_FIXED); -+ gtk_tree_view_column_set_fixed_width (eject_pad_col, EJECT_PAD_COLUMN_WIDTH); -+ -+ gtk_tree_view_append_column (tree_view, eject_pad_col); -+ } -+ } -+ - gtk_tree_view_set_expander_column (tree_view, expander_col); - - sidebar->store = nemo_shortcuts_model_new (sidebar); --- -2.7.4 - diff --git a/nemo.spec b/nemo.spec index febdbfc..4d06eff 100644 --- a/nemo.spec +++ b/nemo.spec @@ -2,7 +2,7 @@ Name: nemo Summary: File manager for Cinnamon -Version: 3.0.2 +Version: 3.0.3 Release: 1%{?dist} License: GPLv2+ and LGPLv2+ Group: User Interface/Desktops @@ -13,8 +13,6 @@ URL: https://github.com/linuxmint/nemo Source0: http://leigh123linux.fedorapeople.org/pub/nemo/source/nemo-%{version}.tar.gz Source1: nemo-fedora.gschema.override -Patch0: 0001-nemo-places-sidebar.c-When-gtk-overlay-scrolling-is-.patch - Requires: redhat-menus Requires: gvfs Requires: gnome-icon-theme @@ -165,6 +163,9 @@ fi %{_datadir}/gir-1.0/*.gir %changelog +* Tue May 24 2016 Leigh Scott - 3.0.3-1 +- update to 3.0.3 release + * Fri May 20 2016 Leigh Scott - 3.0.2-1 - update to 3.0.2 release diff --git a/sources b/sources index c0f3ae0..7563491 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b7315b046991bc00922d0c8ce673445c nemo-3.0.2.tar.gz +62b74a345f18f98e01640b41a413c9cf nemo-3.0.3.tar.gz