Release 0.13.3

Fix regression (bad merge in commit 61a80b9)
tint2conf: Do not search for icons in all icon themes (issue #563 )
2017-03-25 12:00:25 +01:00 · 2017-03-22 17:58:06 +01:00 · 2017-03-20 18:06:49 +01:00 · 2017-03-20 16:57:02 +00:00 · 2017-03-20 14:57:37 +00:00 · 2017-03-20 14:51:23 +00:00
13 changed files with 1643 additions and 1510 deletions
--- a/5
+++ b/5
@@ -1,3 +1,8 @@
+2017-03-25 0.13.3
+- Fixes:
+  - Fixed autohide for non-bottom panels (issue #632)
+  - Translations updated (contributed by Vladimir)
+
 2017-03-19 0.13.2
 - Fixes:
  - Fixed compilation under FreeBSD
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
-# Latest stable release: 0.13.2
-Changes: https://gitlab.com/o9000/tint2/blob/0.13.2/ChangeLog
+# Latest stable release: 0.13.3
+Changes: https://gitlab.com/o9000/tint2/blob/0.13.3/ChangeLog

 Documentation: [doc/tint2.md](doc/tint2.md)

@@ -8,7 +8,7 @@ Compile it with (after you install the [dependencies](https://gitlab.com/o9000/t
 ```
 git clone https://gitlab.com/o9000/tint2.git
 cd tint2
-git checkout 0.13.2
+git checkout 0.13.3
 mkdir build
 cd build
 cmake ..
--- a/doc/readme.html
+++ b/doc/readme.html
@@ -199,9 +199,9 @@ pre {
 </style>
 </head>
 <body>
-<h1 id="latest-stable-release-0-13-2"><span class="md2man-title">Latest</span> <span class="md2man-section">stable</span> <span class="md2man-date">release:</span> <span class="md2man-source">0.13.2</span><a name="latest-stable-release-0-13-2" href="#latest-stable-release-0-13-2" class="md2man-permalink" title="permalink"></a></h1><p>Changes: <a href="https://gitlab.com/o9000/tint2/blob/0.13.2/ChangeLog">https://gitlab.com/o9000/tint2/blob/0.13.2/ChangeLog</a></p><p>Documentation: <a href="manual.html">manual.html</a></p><p>Compile it with (after you install the <a href="https://gitlab.com/o9000/tint2/wikis/Install#dependencies">dependencies</a>):</p><pre class="highlight plaintext"><code>git clone https://gitlab.com/o9000/tint2.git
+<h1 id="latest-stable-release-0-13-3"><span class="md2man-title">Latest</span> <span class="md2man-section">stable</span> <span class="md2man-date">release:</span> <span class="md2man-source">0.13.3</span><a name="latest-stable-release-0-13-3" href="#latest-stable-release-0-13-3" class="md2man-permalink" title="permalink"></a></h1><p>Changes: <a href="https://gitlab.com/o9000/tint2/blob/0.13.3/ChangeLog">https://gitlab.com/o9000/tint2/blob/0.13.3/ChangeLog</a></p><p>Documentation: <a href="manual.html">manual.html</a></p><p>Compile it with (after you install the <a href="https://gitlab.com/o9000/tint2/wikis/Install#dependencies">dependencies</a>):</p><pre class="highlight plaintext"><code>git clone https://gitlab.com/o9000/tint2.git
 cd tint2
-git checkout 0.13.2
+git checkout 0.13.3
 mkdir build
 cd build
 cmake ..
--- a/doc/tint2.1
+++ b/doc/tint2.1
@@ -1,4 +1,4 @@
-.TH TINT2 1 "2017\-03\-12" 0.13.2
+.TH TINT2 1 "2017\-03\-12" 0.13.3
 .SH NAME
 .PP
 tint2 \- lightweight panel/taskbar
--- a/doc/tint2.md
+++ b/doc/tint2.md
@@ -1,4 +1,4 @@
-# TINT2 1 "2017-03-12" 0.13.2
+# TINT2 1 "2017-03-12" 0.13.3

 ## NAME
 tint2 - lightweight panel/taskbar
--- a/get_version.sh
+++ b/get_version.sh
@@ -1,46 +1,6 @@
 #!/bin/sh

-MAJOR=0.13
-DIRTY=""
-
-if git status 1>/dev/null 2>/dev/null
-then
-    git update-index -q --ignore-submodules --refresh
-    # Disallow unstaged changes in the working tree
-    if ! git diff-files --quiet --ignore-submodules --
-    then
-        if [ "$1" = "--strict" ]
-        then
-            echo >&2 "Error: there are unstaged changes."
-            git diff-files --name-status -r --ignore-submodules -- >&2
-            exit 1
-        else
-            DIRTY="-dirty"
-        fi
-    fi
-
-    # Disallow uncommitted changes in the index
-    if ! git diff-index --cached --quiet HEAD --ignore-submodules --
-    then
-        if [ "$1" = "--strict" ]
-        then
-            echo >&2 "Error: there are uncommitted changes."
-            git diff-index --cached --name-status -r --ignore-submodules HEAD -- >&2
-            exit 1
-        else
-            DIRTY="-dirty"
-        fi
-    fi
-    VERSION=$(git describe --exact-match 2>/dev/null || echo "$MAJOR-git$(git show -s --pretty=format:%ci | cut -d ' ' -f 1 | tr -d '-').$(git show -s --pretty=format:%h)")$DIRTY
-else
-    VERSION=$(head -n 1 ChangeLog | cut -d ' ' -f 2)
-    if [ $VERSION = "master" ]
-    then
-        VERSION=$VERSION-$(head -n 1 ChangeLog | cut -d ' ' -f 1)
-    fi
-fi
-
-VERSION=$(echo "$VERSION" | sed 's/^v//')
+VERSION=0.13.3

 echo '#define VERSION_STRING "'$VERSION'"' > version.h
 echo $VERSION
--- a/make_release.sh
+++ b/make_release.sh
@@ -2,24 +2,6 @@

 # Usage: ./make_release.sh
 # Creates a tar.gz archive of the current tree.
-#
-# To bump the version number for the current commit (make sure you are in HEAD!), run manually:
-#
-# git tag -a v0.12 -m 'Version 0.12'
-#
-# To generate a release for an older tagged commit, first list the tags with:
-#
-# git tag
-#
-# then checkout the tagged commit with:
-#
-# git checkout tags/v0.1
-#
-# Finally, to revert to HEAD:
-#
-# git checkout master
-#
-# See more at https://gitlab.com/o9000/tint2/wikis/Development

 VERSION=$(./get_version.sh --strict)
 if [ ! $? -eq 0 ]
@@ -28,21 +10,10 @@ then
    exit 1
 fi

-DIR=tint2-$VERSION
-ARCHIVE=$DIR.tar.gz
-echo "Making release $DIR"
-rm -rf $DIR $ARCHIVE
+ARCHIVE=tint2-$VERSION.tar.gz

-git checkout-index --prefix=$DIR/ -a
-
-# Delete unneeded files
-rm -f $DIR/make_release.sh
-
-echo "echo \"#define VERSION_STRING \\\"$VERSION\\\"\" > version.h" > $DIR/get_version.sh
-
-# Create tarball and remove the exported directory
-tar -czf $ARCHIVE $DIR
-rm -rf $DIR
+echo "Making release tint2-$VERSION"
+git archive --format=tar.gz --prefix=tint2-$VERSION/ v$VERSION >$ARCHIVE

 sha1sum -b $ARCHIVE
 sha256sum -b $ARCHIVE
--- a/src/launcher/icon-theme-common.c
+++ b/src/launcher/icon-theme-common.c
@@ -740,7 +740,7 @@ void add_icon_path_to_cache(IconThemeWrapper *wrapper, const char *icon_name, in
 	g_free(key);
 }

-char *get_icon_path(IconThemeWrapper *wrapper, const char *icon_name, int size)
+char *get_icon_path(IconThemeWrapper *wrapper, const char *icon_name, int size, gboolean use_fallbacks)
 {
 	if (!wrapper)
 		return NULL;
@@ -761,6 +761,8 @@ char *get_icon_path(IconThemeWrapper *wrapper, const char *icon_name, int size)
 		return path;
 	}

+	if (!use_fallbacks)
+		goto notfound;
 	fprintf(stderr, YELLOW "Icon not found in default theme: %s" RESET "\n", icon_name);
 	load_fallbacks(wrapper);

--- a/src/launcher/icon-theme-common.h
+++ b/src/launcher/icon-theme-common.h
@@ -51,7 +51,7 @@ void free_icon_theme(IconTheme *theme);

 // Returns the full path to an icon file (or NULL) given the list of icon themes to search and the icon name
 // Note: needs to be released with free().
-char *get_icon_path(IconThemeWrapper *wrapper, const char *icon_name, int size);
+char *get_icon_path(IconThemeWrapper *wrapper, const char *icon_name, int size, gboolean use_fallbacks);

 // Returns a list of the directories used to store icons.
 // Do not free the result, it is cached.
--- a/src/launcher/launcher.c
+++ b/src/launcher/launcher.c
@@ -565,13 +565,13 @@ void launcher_reload_icon_image(Launcher *launcher, LauncherIcon *launcherIcon)
 	free_icon(launcherIcon->image_pressed);
 	launcherIcon->image = NULL;

-	char *new_icon_path = get_icon_path(launcher->icon_theme_wrapper, launcherIcon->icon_name, launcherIcon->icon_size);
+	char *new_icon_path = get_icon_path(launcher->icon_theme_wrapper, launcherIcon->icon_name, launcherIcon->icon_size, TRUE);
 	if (new_icon_path)
 		launcherIcon->image = load_image(new_icon_path, 1);
 	// On loading error, fallback to default
 	if (!launcherIcon->image) {
 		free(new_icon_path);
-		new_icon_path = get_icon_path(launcher->icon_theme_wrapper, DEFAULT_ICON, launcherIcon->icon_size);
+		new_icon_path = get_icon_path(launcher->icon_theme_wrapper, DEFAULT_ICON, launcherIcon->icon_size, TRUE);
 		if (new_icon_path)
 			launcherIcon->image = imlib_load_image_immediately(new_icon_path);
 	}
--- a/src/panel.c
+++ b/src/panel.c
@@ -708,36 +708,68 @@ void set_panel_window_geometry(Panel *panel)

 	if (!panel->is_hidden) {
 		if (panel_horizontal) {
-			XMoveResizeWindow(server.display,
-			                  panel->main_win,
-			                  panel->posx,
-			                  panel->posy,
-			                  panel->area.width,
-			                  panel->area.height);
+			if (panel_position & TOP)
+				XMoveResizeWindow(server.display,
+				                  panel->main_win,
+				                  panel->posx,
+				                  panel->posy,
+				                  panel->area.width,
+				                  panel->area.height);
+			else
+				XMoveResizeWindow(server.display,
+				                  panel->main_win,
+				                  panel->posx,
+				                  panel->posy,
+				                  panel->area.width,
+				                  panel->area.height);
 		} else {
-			XMoveResizeWindow(server.display,
-			                  panel->main_win,
-			                  panel->posx,
-			                  panel->posy,
-			                  panel->area.width,
-			                  panel->area.height);
+			if (panel_position & LEFT)
+				XMoveResizeWindow(server.display,
+				                  panel->main_win,
+				                  panel->posx,
+				                  panel->posy,
+				                  panel->area.width,
+				                  panel->area.height);
+			else
+				XMoveResizeWindow(server.display,
+				                  panel->main_win,
+				                  panel->posx,
+				                  panel->posy,
+				                  panel->area.width,
+				                  panel->area.height);
 		}
 	} else {
 		int diff = (panel_horizontal ? panel->area.height : panel->area.width) - panel_autohide_height;
 		if (panel_horizontal) {
-			XMoveResizeWindow(server.display,
-			                  panel->main_win,
-			                  panel->posx,
-			                  panel->posy + diff,
-			                  panel->hidden_width,
-			                  panel->hidden_height);
+			if (panel_position & TOP)
+				XMoveResizeWindow(server.display,
+								  panel->main_win,
+				                  panel->posx,
+				                  panel->posy,
+				                  panel->hidden_width,
+				                  panel->hidden_height);
+			else
+				XMoveResizeWindow(server.display,
+				                  panel->main_win,
+				                  panel->posx,
+				                  panel->posy + diff,
+				                  panel->hidden_width,
+				                  panel->hidden_height);
 		} else {
-			XMoveResizeWindow(server.display,
-			                  panel->main_win,
-			                  panel->posx + diff,
-			                  panel->posy,
-			                  panel->hidden_width,
-			                  panel->hidden_height);
+			if (panel_position & LEFT)
+				XMoveResizeWindow(server.display,
+				                  panel->main_win,
+								  panel->posx,
+								  panel->posy,
+				                  panel->hidden_width,
+				                  panel->hidden_height);
+			else
+				XMoveResizeWindow(server.display,
+				                  panel->main_win,
+				                  panel->posx + diff,
+				                  panel->posy,
+				                  panel->hidden_width,
+				                  panel->hidden_height);
 		}
 	}
 }
--- a/src/tint2conf/po/ru.po
+++ b/src/tint2conf/po/ru.po
--- a/src/tint2conf/properties.c
+++ b/src/tint2conf/properties.c
@@ -1640,7 +1640,7 @@ GdkPixbuf *load_icon(const gchar *name)
 	process_events();

 	int size = 22;
-	char *path = get_icon_path(icon_theme, name, size);
+	char *path = get_icon_path(icon_theme, name, size, FALSE);
 	GdkPixbuf *pixbuf = path ? gdk_pixbuf_new_from_file_at_size(path, size, size, NULL) : NULL;
 	free(path);
 	return pixbuf;
Author	SHA1	Message	Date
o9000	46371fe816	Release 0.13.3	2017-03-25 12:00:25 +01:00
o9000	bfe4873204	Fix regression (bad merge in commit `61a80b9`)	2017-03-22 17:58:06 +01:00
o9000	acd1ed5768	tint2conf: Do not search for icons in all icon themes (issue #563 )	2017-03-20 18:06:49 +01:00
o9000	b6a4fe03df	Merge branch 'patch-4' into 'master' Update ru.po See merge request !25	2017-03-20 16:57:02 +00:00
Vladimir	b25ad07c30	wording tweak	2017-03-20 14:57:37 +00:00
Vladimir	ffcd53e989	Update ru.po	2017-03-20 14:51:23 +00:00