[SCM] marco Debian package branch, master, updated. debian/1.8.1+dfsg1-1-7-g2479f4f

[Mike Gabriel]

Gitweb-URL: http://git.debian.org/?p=pkg-mate/marco.git;a=commitdiff;h=3476004

The following commit has been merged in the master branch:
commit 34760047688bcaed3841d3d7c6633f4ccfd807ee
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Mon Oct 6 23:45:17 2014 +0200

    debian/patches: Drop 0002_gtk3-frame-extents-with-marco.patch. It was picked from upstream and is included in latest release.
---
 .../0002_gtk3-frame-extents-with-marco.patch       | 60 ----------------------
 debian/patches/series                              |  1 -
 2 files changed, 61 deletions(-)

diff --git a/debian/patches/0002_gtk3-frame-extents-with-marco.patch b/debian/patches/0002_gtk3-frame-extents-with-marco.patch
deleted file mode 100644
index 5a69eaa..0000000
--- a/debian/patches/0002_gtk3-frame-extents-with-marco.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-Description: Tell GTK3 that marco supports _GTK_FRAME_EXTENTS hints
-Author: Stefano Karapetsas <stefano at karapetsas.com>
-Origin: http://git.mate-desktop.org/marco/patch/?id=42c63250abf2b4c7b1c704c907301bb5a5920b6e
-Abstract:
- Even if marco doesn't support it, this currently fixes ugly dialog windows
- with GTK 3.12.
----
-diff --git a/src/core/atomnames.h b/src/core/atomnames.h
-index 756626c..4893f27 100644
---- a/src/core/atomnames.h
-+++ b/src/core/atomnames.h
-@@ -70,6 +70,7 @@ item(MULTIPLE)
- item(TIMESTAMP)
- item(VERSION)
- item(ATOM_PAIR)
-+item(_GTK_FRAME_EXTENTS)
- 
- /* Oddities: These are used, and we need atoms for them,
-  * but when we need all _NET_WM hints (i.e. when we're making
-diff --git a/src/core/screen.c b/src/core/screen.c
-index f52f382..1804df9 100644
---- a/src/core/screen.c
-+++ b/src/core/screen.c
-@@ -102,6 +102,7 @@ set_supported_hint (MetaScreen *screen)
- #include "atomnames.h"
- #undef item
- #undef EWMH_ATOMS_ONLY
-+    screen->display->atom__GTK_FRAME_EXTENTS,
-   };
- 
-   XChangeProperty (screen->display->xdisplay, screen->xroot,
-diff --git a/src/core/window-props.c b/src/core/window-props.c
-index 08cc663..0b51d4b 100644
---- a/src/core/window-props.c
-+++ b/src/core/window-props.c
-@@ -216,6 +216,14 @@ reload_kwm_win_icon (MetaWindow    *window,
- }
- 
- static void
-+reload_gtk_frame_extents (MetaWindow    *window,
-+                          MetaPropValue *value,
-+                          gboolean       initial)
-+{
-+  return;
-+}
-+
-+static void
- reload_struts (MetaWindow    *window,
-                MetaPropValue *value,
-                gboolean       initial)
-@@ -1507,6 +1515,7 @@ meta_display_init_window_prop_hooks (MetaDisplay *display)
-     { XA_WM_HINTS,                     META_PROP_VALUE_WM_HINTS,  reload_wm_hints },
-     { XA_WM_TRANSIENT_FOR,             META_PROP_VALUE_WINDOW,    reload_transient_for },
-     { display->atom__NET_WM_USER_TIME_WINDOW, META_PROP_VALUE_WINDOW, reload_net_wm_user_time_window },
-+    { display->atom__GTK_FRAME_EXTENTS, META_PROP_VALUE_CARDINAL_LIST, reload_gtk_frame_extents },
-     { 0 },
-   };
- 
---
-cgit 
diff --git a/debian/patches/series b/debian/patches/series
index d81c002..d3bb327 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
 0001_use-zenity-instead-of-mate-dialogs.patch
-0002_gtk3-frame-extents-with-marco.patch
 2001_omit-gfdl-licensed-theme-documentation.patch

-- 
marco Debian package