[marco] 05/10: Drop 0007_correct-name-for-missing-icon-in-preview-widget.patch. Applied upstream.

[Martin Wimpress]

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

flexiondotorg-guest pushed a commit to branch debian/experimental
in repository marco.

commit 8455ff363ba27dfeaa8e26490131e9f0b05bdcab
Author: Martin Wimpress <code at flexion.org>
Date:   Thu Jun 11 17:27:28 2015 +0100

    Drop 0007_correct-name-for-missing-icon-in-preview-widget.patch. Applied upstream.
---
 ...workspace-when-switching-to-sticky-window.patch | 40 ----------------------
 ...t-name-for-missing-icon-in-preview-widget.patch | 39 ---------------------
 debian/patches/series                              |  1 -
 3 files changed, 80 deletions(-)

diff --git a/debian/patches/0004_dont-switch-workspace-when-switching-to-sticky-window.patch b/debian/patches/0004_dont-switch-workspace-when-switching-to-sticky-window.patch
deleted file mode 100644
index 7d9f53b..0000000
--- a/debian/patches/0004_dont-switch-workspace-when-switching-to-sticky-window.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 0ee6f6db3f405c13c88f75760f88296560cf9fd6 Mon Sep 17 00:00:00 2001
-From: Denis Gorodnichev <denis.gorodnichev at gmail.com>
-Date: Sat, 28 Jun 2014 16:58:28 +0000
-Subject: don't switch workspace when switching to sticky window
-
-Closes https://github.com/mate-desktop/marco/pull/121
-Closes https://github.com/mate-desktop/marco/issues/18
----
---- a/src/core/keybindings.c
-+++ b/src/core/keybindings.c
-@@ -2031,7 +2031,8 @@
-                       target_window->desc);
-           display->mouse_mode = FALSE;
-           meta_window_activate (target_window, event->xkey.time);
--          meta_workspace_activate (target_window->workspace, event->xkey.time);
-+          if (!target_window->on_all_workspaces)
-+            meta_workspace_activate (target_window->workspace, event->xkey.time);
- 
-           meta_topic (META_DEBUG_KEYBINDINGS,
-                       "Ending grab early so we can focus the target window\n");
-@@ -2897,7 +2898,8 @@
-                       initial_selection->desc);
-           display->mouse_mode = FALSE;
-           meta_window_activate (initial_selection, event->xkey.time);
--          meta_workspace_activate (initial_selection->workspace, event->xkey.time);
-+          if (!initial_selection->on_all_workspaces)
-+            meta_workspace_activate (initial_selection->workspace, event->xkey.time);
-         }
-       else if (meta_display_begin_grab_op (display,
-                                            screen,
-@@ -2927,7 +2929,8 @@
-               meta_display_end_grab_op (display, event->xkey.time);
-               display->mouse_mode = FALSE;
-               meta_window_activate (initial_selection, event->xkey.time);
--              meta_workspace_activate (initial_selection->workspace, event->xkey.time);
-+              if (!initial_selection->on_all_workspaces)
-+                meta_workspace_activate (initial_selection->workspace, event->xkey.time);
-             }
-           else
-             {
diff --git a/debian/patches/0007_correct-name-for-missing-icon-in-preview-widget.patch b/debian/patches/0007_correct-name-for-missing-icon-in-preview-widget.patch
deleted file mode 100644
index c758793..0000000
--- a/debian/patches/0007_correct-name-for-missing-icon-in-preview-widget.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 1debc211c6f77541967c0157158eb12d3f5d8ab6 Mon Sep 17 00:00:00 2001
-From: monsta <monsta at inbox.ru>
-Date: Thu, 26 Feb 2015 15:58:14 +0300
-Subject: [PATCH]  preview-widget: use correct name for missing icon
-
-from https://git.gnome.org/browse/metacity/commit/?id=5f8df557b8dbe962f19e8b641c007073665ff878
----
- src/ui/preview-widget.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/src/ui/preview-widget.c b/src/ui/preview-widget.c
-index cb05c2f..3726d55 100644
---- a/src/ui/preview-widget.c
-+++ b/src/ui/preview-widget.c
-@@ -550,7 +550,7 @@ meta_preview_get_icon (void)
-                                                    NULL);
-       else
-           default_icon = gtk_icon_theme_load_icon (theme,
--                                                   "gtk-missing-image",
-+                                                   "image-missing",
-                                                    META_ICON_WIDTH,
-                                                    0,
-                                                    NULL);
-@@ -583,7 +583,7 @@ meta_preview_get_mini_icon (void)
-                                                    NULL);
-       else
-           default_icon = gtk_icon_theme_load_icon (theme,
--                                                   "gtk-missing-image",
-+                                                   "image-missing",
-                                                    META_MINI_ICON_WIDTH,
-                                                    0,
-                                                    NULL);
-@@ -704,4 +704,4 @@ meta_preview_get_clip_region (MetaPreview *preview, gint new_window_width, gint
-   gdk_region_destroy (corners_xregion);
- 
-   return window_xregion;
--}
-\ No newline at end of file
-+}
diff --git a/debian/patches/series b/debian/patches/series
index e31f187..76a12c4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
-0007_correct-name-for-missing-icon-in-preview-widget.patch
 0008_glib243-keybindings-notifications-fix.patch
 0009_fix-notifications-of-workspace-name-changes.patch
 2001_omit-gfdl-licensed-theme-documentation.patch

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