[marco] 01/03: debian/patches: Drop 0002_scale_cursor_size.patch. Applied upstream.

[Martin Wimpress]

This is an automated email from the git hooks/post-receive script.

flexiondotorg-guest pushed a commit to branch master
in repository marco.

commit 7ba8e4c3c9bf621a76f4b38cd77a126d5f4f5184
Author: Martin Wimpress <martin.wimpress at ubuntu.com>
Date:   Mon Mar 26 21:39:24 2018 +0100

    debian/patches: Drop 0002_scale_cursor_size.patch. Applied upstream.
---
 debian/patches/0002_scale_cursor_size.patch | 27 ---------------------------
 debian/patches/series                       |  1 -
 2 files changed, 28 deletions(-)

diff --git a/debian/patches/0002_scale_cursor_size.patch b/debian/patches/0002_scale_cursor_size.patch
deleted file mode 100644
index cef04cb..0000000
--- a/debian/patches/0002_scale_cursor_size.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Author: Victor Kareh <vkareh at vkareh.net>
-Description: Scale cursor size for HiDPI
-
-diff --git a/src/core/prefs.c b/src/core/prefs.c
-index 021ad87..e376089 100644
---- a/src/core/prefs.c
-+++ b/src/core/prefs.c
-@@ -27,6 +27,7 @@
- #include "prefs.h"
- #include "ui.h"
- #include "util.h"
-+#include <gdk/gdk.h>
- #include <gio/gio.h>
- #include <string.h>
- #include <stdlib.h>
-@@ -1097,7 +1098,10 @@ meta_prefs_get_cursor_theme (void)
- int
- meta_prefs_get_cursor_size (void)
- {
--  return cursor_size;
-+  GdkWindow *window = gdk_get_default_root_window ();
-+  gint scale = gdk_window_get_scale_factor (window);
-+
-+  return cursor_size * scale;
- }
- 
- gboolean
diff --git a/debian/patches/series b/debian/patches/series
index d31f65f..80373bb 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 0001_hidpi_window_decorations.patch
-0002_scale_cursor_size.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mate/marco.git