[mate-screensaver] 01/02: debian/patches: Drop 0000_fix_idle_slider_display.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 mate-screensaver.

commit f4f4aae2e9b58f0471f5bd8270962552e9acc3d4
Author: Martin Wimpress <martin.wimpress at ubuntu.com>
Date:   Mon Nov 13 22:45:47 2017 +0000

    debian/patches: Drop 0000_fix_idle_slider_display.patch. Applied upstream.
---
 debian/patches/0000_fix_idle_slider_display.patch | 97 -----------------------
 debian/patches/series                             |  1 -
 2 files changed, 98 deletions(-)

diff --git a/debian/patches/0000_fix_idle_slider_display.patch b/debian/patches/0000_fix_idle_slider_display.patch
deleted file mode 100644
index e74dcda..0000000
--- a/debian/patches/0000_fix_idle_slider_display.patch
+++ /dev/null
@@ -1,97 +0,0 @@
-Author: ZenWalker <scow at riseup.net>
-Description: Fix idle slider display in all languages
-
-diff --git a/src/mate-screensaver-preferences.c b/src/mate-screensaver-preferences.c
-index ad38b36..0a9f9a6 100644
---- a/src/mate-screensaver-preferences.c
-+++ b/src/mate-screensaver-preferences.c
-@@ -935,6 +935,8 @@ time_to_string_text (long time)
- 	char *secs, *mins, *hours, *string;
- 	int   sec, min, hour;
- 
-+	int   inc_len, len_minutes;
-+
- 	sec = time % 60;
- 	time = time - sec;
- 	min = (time % (60 * 60)) / 60;
-@@ -950,6 +952,43 @@ time_to_string_text (long time)
- 	secs = g_strdup_printf (ngettext ("%d second",
- 	                                  "%d seconds", sec), sec);
- 
-+	inc_len = strlen (g_strdup_printf (_("%s %s"), 
-+	                  g_strdup_printf (ngettext ("%d hour",
-+	                                             "%d hours", 1), 1),
-+	                  g_strdup_printf (ngettext ("%d minute",
-+	                                             "%d minutes", 59), 59))) - 1;
-+
-+	len_minutes = 0;
-+
-+	for (int n = 2; n < 60; n++)
-+	{
-+		if (n < 10)
-+		{
-+			if ((strlen (g_str_to_ascii (g_strdup_printf (ngettext ("%d minute",
-+	                                                                        "%d minutes", n), n), NULL)) - 2) > len_minutes)
-+
-+				len_minutes = strlen (g_str_to_ascii (g_strdup_printf (ngettext ("%d minute",
-+	                                                                                         "%d minutes", n), n), NULL)) - 2;
-+		}
-+		else
-+		{
-+			if ((strlen (g_str_to_ascii (g_strdup_printf (ngettext ("%d minute",
-+	                                                                        "%d minutes", n), n), NULL)) - 3) > len_minutes)
-+
-+				len_minutes = strlen (g_str_to_ascii (g_strdup_printf (ngettext ("%d minute",
-+	                                                                                         "%d minutes", n), n), NULL)) - 3;
-+		}
-+	}
-+
-+	if ((strlen (g_str_to_ascii (g_strdup_printf (ngettext ("%d minute",
-+	                                                        "%d minutes", 1), 1), NULL)) - 2) > len_minutes)
-+
-+		len_minutes = strlen (g_str_to_ascii (g_strdup_printf (ngettext ("%d minute",
-+	                                                                         "%d minutes", 1), 1), NULL)) - 2;
-+
-+	if (len_minutes < 1)
-+		len_minutes = 1;
-+
- 	if (hour > 0)
- 	{
- 		if (sec > 0)
-@@ -979,6 +1018,36 @@ time_to_string_text (long time)
- 		{
- 			/* minutes */
- 			string = g_strdup_printf (_("%s"), mins);
-+
-+			if (min < 10)
-+			{
-+				if (min == 1)
-+					while (strlen (string) != (len_minutes + inc_len + 3))
-+					{
-+						if (strlen (string) % 2 == 0)
-+							string = g_strconcat (string, " ", NULL);
-+						else
-+							string = g_strconcat (" " , string, NULL);
-+					}
-+				else
-+					while (strlen (string) != (len_minutes + inc_len))
-+					{
-+						if (strlen (string) % 2 == 0)
-+							string = g_strconcat (string, " ", NULL);
-+						else
-+							string = g_strconcat (" " , string, NULL);
-+					}
-+			}
-+			else
-+			{
-+				while (strlen (string) != (len_minutes + inc_len - 1))
-+				{
-+					if (strlen (string) % 2 == 0)
-+						string = g_strconcat (string, " ", NULL);
-+					else
-+						string = g_strconcat (" " , string, NULL);
-+				}
-+			}
- 		}
- 	}
- 	else
diff --git a/debian/patches/series b/debian/patches/series
index a32a00a..bc1e32e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-0000_fix_idle_slider_display.patch
 1001_add-keywords-to-desktop-files.patch

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