up to 1.5.6

diff --git a/mate-panel.spec b/mate-panel.spec
index f9dc71dc7321cf99315d0187e23e65a0969ee884..363e1bb729b32ed9ea064eeaeacb627e8ba00c31 100644 (file)
--- a/mate-panel.spec
+++ b/mate-panel.spec
@@ -10,13 +10,13 @@
 
 Summary:       MATE Desktop panel applets
 Name:          mate-panel
-Version:       1.5.5
-Release:       2
+Version:       1.5.6
+Release:       1
 # libs are LGPLv2+ applications GPLv2+
 License:       GPL v2+
 Group:         X11/Applications
 Source0:       http://pub.mate-desktop.org/releases/1.5/%{name}-%{version}.tar.xz
-# Source0-md5: e97f13354caebb39c2b84f4bd1f2c3a5
+# Source0-md5: 68dd3cc9e47cabc99c96665b1cdb65b6
 Patch0:                no-xdg-menu-prefix.patch
 Patch1:                use-libwnck.patch
 URL:           http://wiki.mate-desktop.org/mate-panel

diff --git a/use-libwnck.patch b/use-libwnck.patch
index df9bef62332fe41b826235e34fb7e90883a33238..bf2fb01dd0fb768de20ae7c7f5d1fee1893e58ef 100644 (file)
--- a/use-libwnck.patch
+++ b/use-libwnck.patch
@@ -390,23 +390,6 @@
  
        if (!wm_name)
                pager->wm = PAGER_WM_UNKNOWN;
-@@ -195,13 +196,13 @@ static void applet_change_background(Mat
-       switch (type)
-       {
-               case PANEL_NO_BACKGROUND:
--                      matewnck_pager_set_shadow_type(MATEWNCK_PAGER(pager->pager), GTK_SHADOW_IN);
-+                      wnck_pager_set_shadow_type(WNCK_PAGER(pager->pager), GTK_SHADOW_IN);
-                       break;
-               case PANEL_COLOR_BACKGROUND:
--                      matewnck_pager_set_shadow_type(MATEWNCK_PAGER(pager->pager), GTK_SHADOW_NONE);
-+                      wnck_pager_set_shadow_type(WNCK_PAGER(pager->pager), GTK_SHADOW_NONE);
-                       break;
-               case PANEL_PIXMAP_BACKGROUND:
--                      matewnck_pager_set_shadow_type(MATEWNCK_PAGER(pager->pager), GTK_SHADOW_NONE);
-+                      wnck_pager_set_shadow_type(WNCK_PAGER(pager->pager), GTK_SHADOW_NONE);
-                       break;
-       }
- }
 @@ -217,8 +218,8 @@ static gboolean applet_scroll(MatePanelA
        if (event->type != GDK_SCROLL)
                return FALSE;