[packages/xfce4-mount-plugin] - up to 0.6.7

[baggins]

commit 161b5cac81bb4d487995a27ef4258f111888541e
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Sat Aug 16 09:53:38 2014 +0200

    - up to 0.6.7

 xfce4-mount-plugin-label-uuid.patch |  9 -----
 xfce4-mount-plugin-position.patch   | 67 -------------------------------------
 xfce4-mount-plugin.spec             |  9 ++---
 3 files changed, 3 insertions(+), 82 deletions(-)
---
diff --git a/xfce4-mount-plugin.spec b/xfce4-mount-plugin.spec
index cd071c2..633d846 100644
--- a/xfce4-mount-plugin.spec
+++ b/xfce4-mount-plugin.spec
@@ -1,14 +1,13 @@
 Summary:	mount/umount utility for Xfce panel
 Summary(pl.UTF-8):	Narzędzie do montowania/odmontowywania dla panelu Xfce
 Name:		xfce4-mount-plugin
-Version:	0.6.4
-Release:	2
+Version:	0.6.7
+Release:	0.1
 License:	GPL v2+
 Group:		X11/Applications
 Source0:	http://archive.xfce.org/src/panel-plugins/xfce4-mount-plugin/0.6/%{name}-%{version}.tar.bz2
-# Source0-md5:	f5917e9aa2a06bc6a872cc10d2ee4f6f
+# Source0-md5:	d477220bb43ab4952be857a12a74745d
 Patch0:		%{name}-label-uuid.patch
-Patch2:		%{name}-position.patch
 URL:		http://goodies.xfce.org/projects/panel-plugins/xfce4-mount-plugin
 BuildRequires:	autoconf >= 2.63
 BuildRequires:	automake
@@ -37,8 +36,6 @@ miejsca dostępnego na urządzeniu.
 %prep
 %setup -q
 %patch0 -p1
-# verify if needed
-#%patch2 -p1
 
 %build
 %{__intltoolize}
diff --git a/xfce4-mount-plugin-label-uuid.patch b/xfce4-mount-plugin-label-uuid.patch
index 9127cf9..6a6ac47 100644
--- a/xfce4-mount-plugin-label-uuid.patch
+++ b/xfce4-mount-plugin-label-uuid.patch
@@ -9,12 +9,3 @@
              xfce_dialog_show_error (NULL, NULL, _("An error occurred. The device \"%s\" should not be removed!"), pdisk->device);
      }
  }
-@@ -400,7 +400,7 @@
-     for (pfstab = getfsent(); pfstab!=NULL; pfstab = getfsent())
-     {
-         has_valid_mount_device =
--                        g_str_has_prefix(pfstab->fs_spec, "/dev/") ||  g_str_has_prefix(pfstab->fs_spec, "UUID=");
-+                        g_str_has_prefix(pfstab->fs_spec, "/dev/") || g_str_has_prefix(pfstab->fs_spec, "UUID=") || g_str_has_prefix(pfstab->fs_spec, "LABEL=");
- 
-         if (include_NFSs)
-             has_valid_mount_device = has_valid_mount_device |
diff --git a/xfce4-mount-plugin-position.patch b/xfce4-mount-plugin-position.patch
deleted file mode 100644
index d70cedf..0000000
--- a/xfce4-mount-plugin-position.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-diff -ur xfce4-mount-plugin-0.5.5/panel-plugin/mount-plugin.c xfce4-mount-plugin-0.5.5-position/panel-plugin/mount-plugin.c
---- xfce4-mount-plugin-0.5.5/panel-plugin/mount-plugin.c	2011-03-03 20:42:54.618752071 +0100
-+++ xfce4-mount-plugin-0.5.5-position/panel-plugin/mount-plugin.c	2011-03-03 20:41:59.402752071 +0100
-@@ -357,6 +357,54 @@
- 
- }
- 
-+static void
-+mounter_position_menu (GtkMenu *menu,
-+                     gint *x,
-+                     gint *y,
-+                     gboolean *push_in,
-+                     t_mounter *mounter)
-+{
-+  GtkWidget *button;
-+  GtkRequisition requisition;
-+  GtkOrientation orientation;
-+
-+  button = mounter->button;
-+  orientation = xfce_panel_plugin_get_orientation (mounter->plugin);
-+  gtk_widget_size_request (GTK_WIDGET (menu), &requisition);
-+  gdk_window_get_origin (GTK_WIDGET (mounter->plugin)->window, x, y);
-+
-+  switch (orientation)
-+    {
-+    case GTK_ORIENTATION_HORIZONTAL:
-+      if (*y + button->allocation.height + requisition.height > gdk_screen_height ())
-+        /* Show menu above */
-+        *y -= requisition.height;
-+      else
-+        /* Show menu below */
-+        *y += button->allocation.height;
-+
-+      if (*x + requisition.width > gdk_screen_width ())
-+        /* Adjust horizontal position */
-+        *x = gdk_screen_width () - requisition.width;
-+      break;
-+
-+    case GTK_ORIENTATION_VERTICAL:
-+      if (*x + button->allocation.width + requisition.width > gdk_screen_width ())
-+        /* Show menu on the right */
-+        *x -= requisition.width;
-+      else
-+        /* Show menu on the left */
-+        *x += button->allocation.width;
-+
-+      if (*y + requisition.height > gdk_screen_height ())
-+        /* Adjust vertical position */
-+        *y = gdk_screen_height () - requisition.height;
-+      break;
-+
-+    default:
-+      break;
-+    }
-+}
- 
- static gboolean
- on_button_press (GtkWidget *widget, GdkEventButton *event, t_mounter *mounter)
-@@ -366,7 +414,7 @@
-     {
- 
-         mounter_refresh (mounter); /* refreshs infos regarding mounts data */
--        gtk_menu_popup (GTK_MENU(mounter->menu), NULL, NULL, NULL, NULL, 0,
-+        gtk_menu_popup (GTK_MENU(mounter->menu), NULL, NULL, (GtkMenuPositionFunc)mounter_position_menu, mounter, 0,
-                         event->time);
-         return TRUE;
-     }
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/xfce4-mount-plugin.git/commitdiff/161b5cac81bb4d487995a27ef4258f111888541e