Further minor improvements to cross-compilation

Mostly just so that the two options don't look the same.

CMakeLists.txt

@@ -1,8 +1,9 @@
 project (logdiag C)
-cmake_minimum_required (VERSION 2.8)
+# The last version with Windows XP support is 3.13, we want to keep that
+cmake_minimum_required (VERSION 2.8.12)
 
-# Default to 2.8 behaviour
-cmake_policy (VERSION 2.8)
+# Default to 2.8.12 behaviour
+cmake_policy (VERSION 2.8.12)
 
 # Options
 option (OPTION_USE_VERA "Use vera++ for source code style checks" OFF)
@@ -28,7 +29,7 @@ if (WIN32)
 	set (WIN32_DEPENDS_PATH ${PROJECT_SOURCE_DIR}/win32-depends)
 	list (APPEND CMAKE_PREFIX_PATH ${WIN32_DEPENDS_PATH})
 	list (APPEND CMAKE_INCLUDE_PATH ${WIN32_DEPENDS_PATH}/lib)
-	list (APPEND CMAKE_C_FLAGS "-mms-bitfields")
+	set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mms-bitfields")
 
 	if (CMAKE_CROSSCOMPILING)
 		list (APPEND CMAKE_FIND_ROOT_PATH ${WIN32_DEPENDS_PATH})
@@ -347,12 +348,16 @@ if (WIN32)
 		DESTINATION etc)
 	install (DIRECTORY
 		${WIN32_DEPENDS_PATH}/lib/gdk-pixbuf-2.0
-		DESTINATION lib)
+		DESTINATION lib
+		FILES_MATCHING PATTERN "*" PATTERN "*.a" EXCLUDE)
 	install (DIRECTORY
 		${WIN32_DEPENDS_PATH}/share/glib-2.0/schemas
 		DESTINATION share/glib-2.0
 		FILES_MATCHING PATTERN "org.gtk.Settings.*")
 
+	install (DIRECTORY
+		${WIN32_DEPENDS_PATH}/share/icons/Adwaita
+		DESTINATION share/icons OPTIONAL)
 	install (FILES
 		${WIN32_DEPENDS_PATH}/share/icons/hicolor/index.theme
 		DESTINATION share/icons/hicolor)
@@ -393,8 +398,8 @@ install (DIRECTORY share/gui share/library
 
 # CPack
 set (CPACK_PACKAGE_DESCRIPTION_SUMMARY "Schematic editor")
-set (CPACK_PACKAGE_VENDOR "Premysl Janouch")
-set (CPACK_PACKAGE_CONTACT "Přemysl Janouch <p@janouch.name>")
+set (CPACK_PACKAGE_VENDOR "Premysl Eric Janouch")
+set (CPACK_PACKAGE_CONTACT "Přemysl Eric Janouch <p@janouch.name>")
 set (CPACK_RESOURCE_FILE_LICENSE "${PROJECT_SOURCE_DIR}/LICENSE")
 set (CPACK_PACKAGE_VERSION_MAJOR ${project_VERSION_MAJOR})
 set (CPACK_PACKAGE_VERSION_MINOR ${project_VERSION_MINOR})

LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2010 - 2018, Přemysl Janouch <p@janouch.name>
+Copyright (c) 2010 - 2018, Přemysl Eric Janouch <p@janouch.name>
 
 Permission to use, copy, modify, and/or distribute this software for any
 purpose with or without fee is hereby granted.

NEWS

@@ -15,7 +15,7 @@ Version 0.2.0
  - This is the last version supporting Windows XP (we use an outdated GTK+
    bundle, support for this operating system has been dropped in version 3.18).
  - Various unimportant fixes and changes.
- - Known issues: Windows XP looks ugly now and there's little we can do.
+ - Known issues: Windows XP looks ugly with the classic theme, little we can do.
 
 Version 0.1.2
  - Updated symbol library.

README.adoc

@@ -3,8 +3,7 @@ logdiag
 
 'logdiag' is a simple multiplatform schematic editor written in GTK+.
 
-This software is considered to be of alpha quality and isn't recommended for
-regular usage.
+This software has never really been finished, and is no longer being worked on.
 
 image::docs/user-guide/logdiag-en.png[align="center"]
 
@@ -16,7 +15,7 @@ a package with the latest development version from Archlinux's AUR.
 Requirements
 ------------
 Runtime dependencies: GTK+ >= 3.8, json-glib >= 0.10.4, lua >= 5.2 +
-Build dependencies: CMake >= 2.8
+Build dependencies: CMake >= 2.8.12
 
 Build from source on Unix-like systems
 --------------------------------------
@@ -47,14 +46,12 @@ CMake offers DEB and RPM.
 
 After _cpack_ finishes making the package, install this file.
 
- $ fakeroot cpack -G DEB
+ $ cpack -G DEB
  # dpkg -i logdiag-version-system-arch.deb
 
-Leave out the fakeroot for CMake >= 2.8.9, it's been fixed since.
-
 Build from source on Windows
 ----------------------------
-_Note that with the current method we're stuck with GTK+ 3.10.4 at best._
+_Note that with the current method we're stuck with GTK+ 3.8.2._
 
 First install CMake >= 3.1 and MinGW. Add both to your system path. If you want
 to build an installation package, also install NSIS.
@@ -78,18 +75,17 @@ Let CMake prepare the build:
 Now you can generate a package with CPack. You may choose between:
 
 1. An NSIS-based installation package:
-
++
  > cpack -G NSIS
 
 2. A portable ZIP package:
-
++
  > cpack -G ZIP
 
 By default, that is if you specify no generator, both packages are built.
 
 Cross-compilation for Windows
 -----------------------------
-
 The procedure is almost exactly the same as before, including the requirements.
 Just install MinGW-w64 and let automation take care of the rest.
 
@@ -97,10 +93,17 @@ Just install MinGW-w64 and let automation take care of the rest.
  $ mkdir build
  $ cd build
  $ cmake .. \
-   -DCMAKE_TOOLCHAIN_FILE=../ToolchainDebianMinGWW64.cmake \
+   -DCMAKE_TOOLCHAIN_FILE=../ToolchainCrossMinGWW64.cmake \
    -DCMAKE_BUILD_TYPE=Release
  $ cpack
 
+Alternatively, for an unnecessarily bloated MSYS2-based 64-bit build:
+
+ $ sh Win64Depends.cmake
+ $ cmake -DCMAKE_TOOLCHAIN_FILE=ToolchainCrossWin64.cmake \
+   -DCMAKE_BUILD_TYPE=Release -B build
+ $ cmake --build build -- package
+
 Contributing and Support
 ------------------------
 Use https://git.janouch.name/p/logdiag to report any bugs, request features,

ToolchainCrossWin64.cmake

@@ -0,0 +1,16 @@
+set (CMAKE_SYSTEM_NAME "Windows")
+set (CMAKE_SYSTEM_PROCESSOR "x86_64")
+
+set (CMAKE_C_COMPILER "x86_64-w64-mingw32-gcc")
+set (CMAKE_CXX_COMPILER "x86_64-w64-mingw32-g++")
+set (CMAKE_RC_COMPILER "x86_64-w64-mingw32-windres")
+
+# Not needed to crosscompile an installation package
+#set (CMAKE_CROSSCOMPILING_EMULATOR "wine64")
+
+set (CMAKE_FIND_ROOT_PATH "/usr/x86_64-w64-mingw32")
+
+set (CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
+set (CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
+set (CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
+

Win32Depends.cmake

@@ -31,17 +31,15 @@ set (pkg_gtk_root "http://ftp.gnome.org/pub/gnome/binaries/win32")
 set (pkg_gtk_urls "${pkg_gtk_root}/dependencies/gettext-tools-0.17.zip")
 set (pkg_gtk_md5 "09baff956ebd1c391c7f71e9bd768edd")
 
-set (pkg_gtkalt_root "http://win32builder.gnome.org")
+# https://sourceforge.net/projects/urlget/files
+# /GTK%2B%203%20binary%20for%20Windows/GTK%2B%203.16.6/
+# contains a binary bundle that may be more or less simply transplanted over,
+# due to ABI compatibility, however something is wrong with icons,
+# and it looks alien on Windows XP (use themes) for close to no improvement.
+set (pkg_gtkalt_root "https://download.geany.org/contrib/gtk")
 set (pkg_gtkalt_urls "${pkg_gtkalt_root}/gtk+-bundle_3.8.2-20131001_win32.zip")
 set (pkg_gtkalt_md5 "3f9b159207edf44937f209b4a5e6bb63")
 
-# Doesn't work, no gtk+-3.0.pc file present
-#set (pkg_gtkalt_urls "${pkg_gtkalt_root}/gtk+-bundle_3.10.4-20131202_win32.zip")
-#set (pkg_gtkalt_md5 "520bed70943974efdaeea2a1dbe48f84")
-# Too old
-#set (pkg_gtkalt_urls "${pkg_gtkalt_root}/gtk+-bundle_3.6.4-20130921_win32.zip")
-#set (pkg_gtkalt_md5 "9bcb87d917982a6e52a69141ade8bd56")
-
 set (pkg_winlibs_root "http://sourceforge.net/projects/winlibs/files")
 set (pkg_winlibs_urls "${pkg_winlibs_root}/GTK+/libjson-glib-1.0-1-mingw32.7z")
 set (pkg_winlibs_md5 "f06e42c5998dae5fb6245fecc96a403e")

Win64Depends.sh

@@ -0,0 +1,74 @@
+#!/bin/sh -e
+# Win64Depends.sh: download dependencies from MSYS2 for cross-compilation
+# Dependencies: AWK, sed, sha256sum, cURL, bsdtar, wine64
+repository=https://repo.msys2.org/mingw/mingw64/
+
+status() {
+	echo "$(tput bold)-- $*$(tput sgr0)"
+}
+
+dbsync() {
+	status Fetching repository DB
+	[ -f db.tsv ] || curl -# "$repository/mingw64.db" | bsdtar -xOf- | awk '
+		function flush() { print f["%NAME%"] f["%FILENAME%"] f["%DEPENDS%"] }
+		NR > 1 && $0 == "%FILENAME%" { flush(); for (i in f) delete f[i] }
+		!/^[^%]/ { field = $0; next } { f[field] = f[field] $0 "\t" }
+		field == "%SHA256SUM%" { path = "*packages/" f["%FILENAME%"]
+			sub(/\t$/, "", path); print $0, path > "db.sums" } END { flush() }
+	' > db.tsv
+}
+
+fetch() {
+	status Resolving "$@"
+	mkdir -p packages
+	awk -F'\t' 'function get(name,    i, a) {
+		if (visited[name]++ || !(name in filenames)) return
+		print filenames[name]; split(deps[name], a); for (i in a) get(a[i])
+	} BEGIN { while ((getline < "db.tsv") > 0) {
+		filenames[$1] = $2; deps[$1] = ""; for (i = 3; i <= NF; i++) {
+			gsub(/[<=>].*/, "", $i); deps[$1] = deps[$1] $i FS }
+	} for (i = 0; i < ARGC; i++) get(ARGV[i]) }' "$@" | while IFS= read -r name
+	do
+		status Fetching "$name"
+		[ -f "packages/$name" ] || curl -#o "packages/$name" "$repository/$name"
+	done
+}
+
+verify() {
+	status Verifying checksums
+	sha256sum --ignore-missing --quiet -c db.sums
+}
+
+extract() {
+	status Extracting packages
+	for subdir in *
+	do [ -d "$subdir" -a "$subdir" != packages ] && rm -rf -- "$subdir"
+	done
+	for i in packages/*
+	do bsdtar -xf "$i" --strip-components 1 mingw64
+	done
+}
+
+configure() {
+	status Configuring packages
+	glib-compile-schemas share/glib-2.0/schemas
+	wine64 bin/gdk-pixbuf-query-loaders.exe \
+		> lib/gdk-pixbuf-2.0/2.10.0/loaders.cache
+
+	# pkgconf has a command line option for this, but CMake can't pass it
+	sed -i "s|^prefix=/mingw64|prefix=$(pwd)|" {share,lib}/pkgconfig/*.pc
+}
+
+mkdir -p win32-depends
+cd win32-depends
+dbsync
+fetch mingw-w64-x86_64-gtk3 mingw-w64-x86_64-lua \
+	mingw-w64-x86_64-libwinpthread-git # because we don't do "provides"?
+verify
+extract
+configure
+
+status Success
+
+# XXX: Why is this override needed to run some GLib-based things under wine64?
+export XDG_DATA_DIRS=$(pwd)/share

cmake/FindCppCheck.cmake

@@ -44,7 +44,7 @@
 
 #=============================================================================
 # Copyright 2011 Johannes Wienke <jwienke at techfak dot uni-bielefeld dot de>
-# Copyright 2012 Přemysl Janouch <p at janouch dot name>
+# Copyright 2012 Přemysl Eric Janouch <p at janouch dot name>
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without

cmake/FindGettext.cmake

@@ -14,7 +14,7 @@
 
 #=============================================================================
 # Copyright 2007-2009 Kitware, Inc.
-# Copyright 2010-2011 Přemysl Janouch
+# Copyright 2010-2011 Přemysl Eric Janouch
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:

cmake/FindLibIntl.cmake

@@ -5,7 +5,7 @@
 #    LIBINTL_LIBRARIES
 
 #=============================================================================
-# Copyright Přemysl Janouch 2011
+# Copyright 2011 Přemysl Eric Janouch
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without

cmake/ProcessArguments.cmake

@@ -22,7 +22,7 @@
 #
 
 #=============================================================================
-# Copyright Přemysl Janouch 2010
+# Copyright 2010 Přemysl Eric Janouch
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without

docs/user-guide/user-guide-cs.asciidoc

@@ -4,7 +4,7 @@
 
 logdiag: Průvodce uživatele
 ===========================
-Přemysl Janouch <p@janouch.name>
+Přemysl Eric Janouch <p@janouch.name>
 v0.2.0, 2018-06-27
 :toc: left
 :toc-title: Obsah

docs/user-guide/user-guide-en.asciidoc

@@ -4,7 +4,7 @@
 
 logdiag: User Guide
 ===================
-Přemysl Janouch <p@janouch.name>
+Přemysl Eric Janouch <p@janouch.name>
 v0.2.0, 2018-06-27
 :toc: left
 :sectnums:

liblogdiag/ld-category-symbol-view.c

@@ -2,7 +2,7 @@
  * ld-category-symbol-view.c
  *
  * This file is a part of logdiag.
- * Copyright Přemysl Janouch 2012
+ * Copyright 2012, 2015 Přemysl Eric Janouch
  *
  * See the file LICENSE for licensing information.
  *
@@ -47,6 +47,7 @@ SymbolData;
  * @path: path to the category within the library.
  * @layout: (element-type SymbolData *): current layout of symbols.
  * @preselected: currently preselected symbol.
+ * @dragged: currently dragged symbol.
  */
 struct _LdCategorySymbolViewPrivate
 {
@@ -54,6 +55,7 @@ struct _LdCategorySymbolViewPrivate
 	gchar *path;
 	GSList *layout;
 	SymbolData *preselected;
+	SymbolData *dragged;
 };
 
 enum
@@ -180,6 +182,7 @@ layout_destroy (LdCategorySymbolView *self)
 	g_slist_free (self->priv->layout);
 	self->priv->layout = NULL;
 	self->priv->preselected = NULL;
+	self->priv->dragged = NULL;
 }
 
 static GSList *
@@ -350,7 +353,10 @@ on_draw (GtkWidget *widget, cairo_t *cr)
 		return FALSE;
 
 	context = gtk_widget_get_style_context (widget);
-	// FIXME: there have to be better means (though I can't find them)
+
+	// XXX: alternatively, we could use gtk_style_context_lookup_color()
+	//   with hardcoded colour names ("theme_*_color")--this is cleaner,
+	//   and unlike GtkStyle doesn't cause deprecation warnings
 	gtk_style_context_add_class (context, "gtkstyle-fallback");
 
 	gtk_style_context_get_background_color (context,
@@ -457,12 +463,12 @@ on_drag_data_get
 	LdCategorySymbolView *self;
 
 	self = LD_CATEGORY_SYMBOL_VIEW (widget);
-	g_return_if_fail (self->priv->preselected != NULL);
+	g_return_if_fail (self->priv->dragged != NULL);
 
 	gtk_selection_data_set (selection_data,
 		gtk_selection_data_get_target (selection_data),
-		8, (guchar *) self->priv->preselected->path,
-		strlen (self->priv->preselected->path));
+		8, (guchar *) self->priv->dragged->path,
+		strlen (self->priv->dragged->path));
 }
 
 static void
@@ -474,6 +480,9 @@ on_drag_begin (GtkWidget *widget, GdkDragContext *ctx, gpointer user_data)
 	self = LD_CATEGORY_SYMBOL_VIEW (widget);
 	g_return_if_fail (self->priv->preselected != NULL);
 
+	/* Working around a mysterious bug where we /sometimes/ get deselected. */
+	self->priv->dragged = self->priv->preselected;
+
 	/* Some of the larger previews didn't work, and we have to get rid of
 	 * the icon later when we're hovering above LdDiagramView anyway. */
 	pbuf = gdk_pixbuf_new (GDK_COLORSPACE_RGB, TRUE, 8, 1, 1);
@@ -485,7 +494,11 @@ on_drag_begin (GtkWidget *widget, GdkDragContext *ctx, gpointer user_data)
 static void
 on_drag_end (GtkWidget *widget, GdkDragContext *ctx, gpointer user_data)
 {
-	symbol_deselect (LD_CATEGORY_SYMBOL_VIEW (widget));
+	LdCategorySymbolView *self;
+
+	self = LD_CATEGORY_SYMBOL_VIEW (widget);
+	symbol_deselect (self);
+	self->priv->dragged = NULL;
 }
 
 static void

liblogdiag/ld-category-symbol-view.h

@@ -2,7 +2,7 @@
  * ld-category-symbol-view.h
  *
  * This file is a part of logdiag.
- * Copyright Přemysl Janouch 2012
+ * Copyright 2012 Přemysl Eric Janouch
  *
  * See the file LICENSE for licensing information.
  *

liblogdiag/ld-category-tree-view.c

@@ -2,7 +2,7 @@
  * ld-category-tree-view.c
  *
  * This file is a part of logdiag.
- * Copyright Přemysl Janouch 2011, 2012
+ * Copyright 2011, 2012 Přemysl Eric Janouch
  *
  * See the file LICENSE for licensing information.
  *

liblogdiag/ld-category-tree-view.h

@@ -2,7 +2,7 @@
  * ld-category-tree-view.h
  *
  * This file is a part of logdiag.
- * Copyright Přemysl Janouch 2011, 2012
+ * Copyright 2011, 2012 Přemysl Eric Janouch
  *
  * See the file LICENSE for licensing information.
  *

liblogdiag/ld-category-view.c

@@ -2,7 +2,7 @@
  * ld-category-view.c
  *
  * This file is a part of logdiag.
- * Copyright Přemysl Janouch 2012
+ * Copyright 2012 Přemysl Eric Janouch
  *
  * See the file LICENSE for licensing information.
  *

liblogdiag/ld-category-view.h

@@ -2,7 +2,7 @@
  * ld-category-view.h
  *
  * This file is a part of logdiag.
- * Copyright Přemysl Janouch 2012
+ * Copyright 2012 Přemysl Eric Janouch
  *
  * See the file LICENSE for licensing information.
  *

liblogdiag/ld-category.c

@@ -2,7 +2,7 @@
  * ld-category.c
  *
  * This file is a part of logdiag.
- * Copyright Přemysl Janouch 2010, 2011, 2012
+ * Copyright 2010, 2011, 2012 Přemysl Eric Janouch
  *
  * See the file LICENSE for licensing information.
  *

liblogdiag/ld-category.h

@@ -2,7 +2,7 @@
  * ld-category.h
  *
  * This file is a part of logdiag.
- * Copyright Přemysl Janouch 2010, 2012
+ * Copyright 2010, 2012 Přemysl Eric Janouch
  *
  * See the file LICENSE for licensing information.
  *

liblogdiag/ld-diagram-connection.c

@@ -2,7 +2,7 @@
  * ld-diagram-connection.c
  *
  * This file is a part of logdiag.
- * Copyright Přemysl Janouch 2011
+ * Copyright 2011 Přemysl Eric Janouch
  *
  * See the file LICENSE for licensing information.
  *

liblogdiag/ld-diagram-connection.h

@@ -2,7 +2,7 @@
  * ld-diagram-connection.h
  *
  * This file is a part of logdiag.
- * Copyright Přemysl Janouch 2011
+ * Copyright 2011 Přemysl Eric Janouch
  *
  * See the file LICENSE for licensing information.
  *

liblogdiag/ld-diagram-object.c

@@ -2,7 +2,7 @@
  * ld-diagram-object.c
  *
  * This file is a part of logdiag.
- * Copyright Přemysl Janouch 2010, 2011
+ * Copyright 2010, 2011 Přemysl Eric Janouch
  *
  * See the file LICENSE for licensing information.
  *

liblogdiag/ld-diagram-object.h

@@ -2,7 +2,7 @@
  * ld-diagram-object.h
  *
  * This file is a part of logdiag.
- * Copyright Přemysl Janouch 2010, 2011
+ * Copyright 2010, 2011 Přemysl Eric Janouch
  *
  * See the file LICENSE for licensing information.
  *

liblogdiag/ld-diagram-symbol.c

@@ -2,7 +2,7 @@
  * ld-diagram-symbol.c
  *
  * This file is a part of logdiag.
- * Copyright Přemysl Janouch 2010, 2011
+ * Copyright 2010, 2011 Přemysl Eric Janouch
  *
  * See the file LICENSE for licensing information.
  *

liblogdiag/ld-diagram-symbol.h

@@ -2,7 +2,7 @@
  * ld-diagram-symbol.h
  *
  * This file is a part of logdiag.
- * Copyright Přemysl Janouch 2010, 2011
+ * Copyright 2010, 2011 Přemysl Eric Janouch
  *
  * See the file LICENSE for licensing information.
  *

liblogdiag/ld-diagram-view.c

@@ -2,7 +2,7 @@
  * ld-diagram-view.c
  *
  * This file is a part of logdiag.
- * Copyright Přemysl Janouch 2010, 2011, 2012
+ * Copyright 2010, 2011, 2012, 2015 Přemysl Eric Janouch
  *
  * See the file LICENSE for licensing information.
  *

liblogdiag/ld-diagram-view.h

@@ -2,7 +2,7 @@
  * ld-diagram-view.h
  *
  * This file is a part of logdiag.
- * Copyright Přemysl Janouch 2010, 2011
+ * Copyright 2010, 2011 Přemysl Eric Janouch
  *
  * See the file LICENSE for licensing information.
  *

liblogdiag/ld-diagram.c

@@ -2,7 +2,7 @@
  * ld-diagram.c
  *
  * This file is a part of logdiag.
- * Copyright Přemysl Janouch 2010, 2011, 2012
+ * Copyright 2010, 2011, 2012 Přemysl Eric Janouch
  *
  * See the file LICENSE for licensing information.
  *

liblogdiag/ld-diagram.h

@@ -2,7 +2,7 @@
  * ld-diagram.h
  *
  * This file is a part of logdiag.
- * Copyright Přemysl Janouch 2010, 2011
+ * Copyright 2010, 2011 Přemysl Eric Janouch
  *
  * See the file LICENSE for licensing information.
  *

liblogdiag/ld-library.c

@@ -2,7 +2,7 @@
  * ld-library.c
  *
  * This file is a part of logdiag.
- * Copyright Přemysl Janouch 2010, 2011, 2012
+ * Copyright 2010, 2011, 2012 Přemysl Eric Janouch
  *
  * See the file LICENSE for licensing information.
  *

liblogdiag/ld-library.h

@@ -2,7 +2,7 @@
  * ld-library.h
  *
  * This file is a part of logdiag.
- * Copyright Přemysl Janouch 2010, 2012
+ * Copyright 2010, 2012 Přemysl Eric Janouch
  *
  * See the file LICENSE for licensing information.
  *

liblogdiag/ld-lua-private.h

@@ -2,7 +2,7 @@
  * ld-lua-private.h
  *
  * This file is a part of logdiag.
- * Copyright Přemysl Janouch 2010
+ * Copyright 2010 Přemysl Eric Janouch
  *
  * See the file LICENSE for licensing information.
  *

liblogdiag/ld-lua-symbol-private.h

@@ -2,7 +2,7 @@
  * ld-lua-symbol-private.h
  *
  * This file is a part of logdiag.
- * Copyright Přemysl Janouch 2010, 2011
+ * Copyright 2010, 2011 Přemysl Eric Janouch
  *
  * See the file LICENSE for licensing information.
  *

liblogdiag/ld-lua-symbol.c

@@ -2,7 +2,7 @@
  * ld-lua-symbol.c
  *
  * This file is a part of logdiag.
- * Copyright Přemysl Janouch 2010, 2011
+ * Copyright 2010, 2011 Přemysl Eric Janouch
  *
  * See the file LICENSE for licensing information.
  *

liblogdiag/ld-lua-symbol.h

@@ -2,7 +2,7 @@
  * ld-lua-symbol.h
  *
  * This file is a part of logdiag.
- * Copyright Přemysl Janouch 2010
+ * Copyright 2010 Přemysl Eric Janouch
  *
  * See the file LICENSE for licensing information.
  *

liblogdiag/ld-lua.c

@@ -2,7 +2,7 @@
  * ld-lua.c
  *
  * This file is a part of logdiag.
- * Copyright Přemysl Janouch 2010, 2011, 2012
+ * Copyright 2010, 2011, 2012 Přemysl Eric Janouch
  *
  * See the file LICENSE for licensing information.
  *

liblogdiag/ld-lua.h

@@ -2,7 +2,7 @@
  * ld-lua.h
  *
  * This file is a part of logdiag.
- * Copyright Přemysl Janouch 2010
+ * Copyright 2010 Přemysl Eric Janouch
  *
  * See the file LICENSE for licensing information.
  *

liblogdiag/ld-symbol.c

@@ -2,7 +2,7 @@
  * ld-symbol.c
  *
  * This file is a part of logdiag.
- * Copyright Přemysl Janouch 2010, 2011
+ * Copyright 2010, 2011 Přemysl Eric Janouch
  *
  * See the file LICENSE for licensing information.
  *

liblogdiag/ld-symbol.h

@@ -2,7 +2,7 @@
  * ld-symbol.h
  *
  * This file is a part of logdiag.
- * Copyright Přemysl Janouch 2010, 2011
+ * Copyright 2010, 2011 Přemysl Eric Janouch
  *
  * See the file LICENSE for licensing information.
  *

liblogdiag/ld-types.c

@@ -2,7 +2,7 @@
  * ld-types.c
  *
  * This file is a part of logdiag.
- * Copyright Přemysl Janouch 2010, 2011
+ * Copyright 2010, 2011 Přemysl Eric Janouch
  *
  * See the file LICENSE for licensing information.
  *

liblogdiag/ld-types.h

@@ -2,7 +2,7 @@
  * ld-types.h
  *
  * This file is a part of logdiag.
- * Copyright Přemysl Janouch 2010, 2011
+ * Copyright 2010, 2011 Přemysl Eric Janouch
  *
  * See the file LICENSE for licensing information.
  *

liblogdiag/ld-undo-action.c

@@ -2,7 +2,7 @@
  * ld-undo-action.c
  *
  * This file is a part of logdiag.
- * Copyright Přemysl Janouch 2011
+ * Copyright 2011 Přemysl Eric Janouch
  *
  * See the file LICENSE for licensing information.
  *

liblogdiag/ld-undo-action.h

@@ -2,7 +2,7 @@
  * ld-undo-action.h
  *
  * This file is a part of logdiag.
- * Copyright Přemysl Janouch 2011
+ * Copyright 2011 Přemysl Eric Janouch
  *
  * See the file LICENSE for licensing information.
  *

liblogdiag/liblogdiag.h

@@ -2,7 +2,7 @@
  * liblogdiag.h
  *
  * This file is a part of logdiag.
- * Copyright Přemysl Janouch 2011, 2012
+ * Copyright 2011, 2012 Přemysl Eric Janouch
  *
  * See the file LICENSE for licensing information.
  *

po/cs.po

@@ -1,7 +1,7 @@
 # Czech translation for logdiag.
-# Copyright (C) 2011 Přemysl Janouch
+# Copyright (C) 2011 Přemysl Eric Janouch
 # This file is distributed under the same license as the logdiag package.
-# Přemysl Janouch <p@janouch.name>, 2011.
+# Přemysl Eric Janouch <p@janouch.name>, 2011.
 #
 msgid ""
 msgstr ""
@@ -9,7 +9,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-06-27 04:52+0200\n"
 "PO-Revision-Date: 2018-06-25 04:02+0200\n"
-"Last-Translator: Přemysl Janouch <p@janouch.name>\n"
+"Last-Translator: Přemysl Eric Janouch <p@janouch.name>\n"
 "Language-Team: Czech <cs@li.org>\n"
 "Language: cs\n"
 "MIME-Version: 1.0\n"
@@ -242,7 +242,7 @@ msgstr "_Přiblížit"
 
 #: ../src/ld-window-main.c:977
 msgid "translator-credits"
-msgstr "Přemysl Janouch <p@janouch.name>"
+msgstr "Přemysl Eric Janouch <p@janouch.name>"
 
 #~ msgid "The file is probably corrupted."
 #~ msgstr "Soubor je pravděpodobně poškozen."

po/de.po

@@ -1,5 +1,5 @@
 # German translation for logdiag.
-# Copyright (C) 2011 Přemysl Janouch
+# Copyright (C) 2011 Přemysl Eric Janouch
 # This file is distributed under the same license as the logdiag package.
 # Andy J., 2011.
 #
@@ -9,7 +9,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-06-27 04:52+0200\n"
 "PO-Revision-Date: 2018-06-25 04:11+0200\n"
-"Last-Translator: Přemysl Janouch <p@janouch.name>\n"
+"Last-Translator: Přemysl Eric Janouch <p@janouch.name>\n"
 "Language-Team: German <de@li.org>\n"
 "Language: de\n"
 "MIME-Version: 1.0\n"

po/logdiag.pot

@@ -1,5 +1,5 @@
 # SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR Přemysl Janouch
+# Copyright (C) YEAR Přemysl Eric Janouch
 # This file is distributed under the same license as the logdiag package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #

po/make-template.sh

@@ -32,5 +32,5 @@ fi
 # Finally make the template
 xgettext -LC -k_ -kN_ $SOURCES -o "$PACKAGE".pot \
 	--package-name="$PACKAGE" --package-version="$VERSION" \
-	--copyright-holder="Přemysl Janouch"
+	--copyright-holder="Přemysl Eric Janouch"
 

po/pl.po

@@ -1,5 +1,5 @@
 # Polish translation for logdiag.
-# Copyright (C) 2011 Přemysl Janouch
+# Copyright (C) 2011 Přemysl Eric Janouch
 # This file is distributed under the same license as the logdiag package.
 # Robert Svoboda <ravath@gmail.com>, 2011.
 #
@@ -9,7 +9,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-06-27 04:52+0200\n"
 "PO-Revision-Date: 2018-06-25 04:09+0200\n"
-"Last-Translator: Přemysl Janouch <p@janouch.name>\n"
+"Last-Translator: Přemysl Eric Janouch <p@janouch.name>\n"
 "Language-Team: Polish <pl@li.org>\n"
 "Language: pl\n"
 "MIME-Version: 1.0\n"

po/sk.po

@@ -1,5 +1,5 @@
 # Slovak translation for logdiag.
-# Copyright (C) 2011 Přemysl Janouch
+# Copyright (C) 2011 Přemysl Eric Janouch
 # This file is distributed under the same license as the logdiag package.
 # Miroslav Rigler <itsgoingd@luzer.sk>, 2011.
 #
@@ -9,7 +9,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-06-27 04:52+0200\n"
 "PO-Revision-Date: 2018-06-25 04:05+0200\n"
-"Last-Translator: Přemysl Janouch <p@janouch.name>\n"
+"Last-Translator: Přemysl Eric Janouch <p@janouch.name>\n"
 "Language-Team: Slovak <sk@li.org>\n"
 "Language: sk\n"
 "MIME-Version: 1.0\n"

src/ld-window-main.c

@@ -2,7 +2,7 @@
  * ld-window-main.c
  *
  * This file is a part of logdiag.
- * Copyright Přemysl Janouch 2010, 2011, 2012
+ * Copyright 2010, 2011, 2012, 2015 Přemysl Eric Janouch
  *
  * See the file LICENSE for licensing information.
  *
@@ -975,7 +975,7 @@ on_action_about (GtkAction *action, LdWindowMain *self)
 		"logo-icon-name", PROJECT_NAME,
 		"version", PROJECT_VERSION,
 		"translator-credits", _("translator-credits"),
-		"copyright", "Copyright Přemysl Janouch 2010 - 2018",
+		"copyright", "Copyright 2010 - 2018 Přemysl Eric Janouch",
 		"website", PROJECT_URL,
 		NULL);
 }

src/ld-window-main.h

@@ -2,7 +2,7 @@
  * ld-window-main.h
  *
  * This file is a part of logdiag.
- * Copyright Přemysl Janouch 2010
+ * Copyright 2010 Přemysl Eric Janouch
  *
  * See the file LICENSE for licensing information.
  *

src/logdiag.c

@@ -2,7 +2,7 @@
  * logdiag.c -- logdiag main source file.
  *
  * This file is a part of logdiag.
- * Copyright Přemysl Janouch 2010, 2011
+ * Copyright 2010, 2011 Přemysl Eric Janouch
  *
  * See the file LICENSE for licensing information.
  *
@@ -137,6 +137,7 @@ main (int argc, char *argv[])
 
 #ifdef _WIN32
 	/* Don't be unneccessarily limited by the system ANSI codepage. */
+	/* g_win32_get_command_line() should replace this code for GLib >= 2.40. */
 	argv_overriden = get_utf8_args (&argc, &argv);
 	if (argv_overriden)
 		_putenv ("CHARSET=UTF-8");

tests/diagram.c

@@ -2,7 +2,7 @@
  * diagram.c
  *
  * This file is a part of logdiag.
- * Copyright Přemysl Janouch 2011
+ * Copyright 2011 Přemysl Eric Janouch
  *
  * See the file LICENSE for licensing information.
  *

tests/point-array.c

@@ -2,7 +2,7 @@
  * point-array.c
  *
  * This file is a part of logdiag.
- * Copyright Přemysl Janouch 2011
+ * Copyright 2011 Přemysl Eric Janouch
  *
  * See the file LICENSE for licensing information.
  *