commit nwg-launchers for openSUSE:Factory

2020-11-09 Thread root 
Hello community,

here is the log from the commit of package nwg-launchers for openSUSE:Factory 
checked in at 2020-11-09 13:57:41

Comparing /work/SRC/openSUSE:Factory/nwg-launchers (Old)
 and  /work/SRC/openSUSE:Factory/.nwg-launchers.new.11331 (New)


Package is "nwg-launchers"

Mon Nov  9 13:57:41 2020 rev:6 rq:847057 version:0.4.2

Changes:

--- /work/SRC/openSUSE:Factory/nwg-launchers/nwg-launchers.changes  
2020-11-05 21:55:58.596041633 +0100
+++ /work/SRC/openSUSE:Factory/.nwg-launchers.new.11331/nwg-launchers.changes   
2020-11-09 13:58:59.227757912 +0100
@@ -1,0 +2,6 @@
+Mon Nov  9 07:41:31 UTC 2020 - Michael Vetter 
+
+- Update to 0.4.2:
+  * [nwggrid] forgotten field initialization added #132
+
+---

Old:

  v0.4.1.tar.gz

New:

  v0.4.2.tar.gz



Other differences:
--
++ nwg-launchers.spec ++
--- /var/tmp/diff_new_pack.fbo330/_old  2020-11-09 13:58:59.727756822 +0100
+++ /var/tmp/diff_new_pack.fbo330/_new  2020-11-09 13:58:59.731756813 +0100
@@ -17,7 +17,7 @@
 
 
 Name:   nwg-launchers
-Version:0.4.1
+Version:0.4.2
 Release:0
 Summary:GTK launchers and menu for sway and i3
 License:GPL-3.0-or-later

++ v0.4.1.tar.gz -> v0.4.2.tar.gz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/nwg-launchers-0.4.1/grid/grid_tools.cc 
new/nwg-launchers-0.4.2/grid/grid_tools.cc
--- old/nwg-launchers-0.4.1/grid/grid_tools.cc  2020-11-05 00:51:26.0 
+0100
+++ new/nwg-launchers-0.4.2/grid/grid_tools.cc  2020-11-07 00:18:18.0 
+0100
@@ -101,6 +101,7 @@
 using namespace std::literals::string_view_literals;
 
 DesktopEntry entry;
+entry.terminal = false;
 
 std::ifstream file(path);
 std::string str;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/nwg-launchers-0.4.1/meson.build 
new/nwg-launchers-0.4.2/meson.build
--- old/nwg-launchers-0.4.1/meson.build 2020-11-05 00:51:26.0 +0100
+++ new/nwg-launchers-0.4.2/meson.build 2020-11-07 00:18:18.0 +0100
@@ -4,7 +4,7 @@
'warning_level=3'
],
license: 'GPL-3.0-or-later',
-   version: '0.4.1'
+   version: '0.4.2'
 )
 
 compiler = meson.get_compiler('cpp')

commit nwg-launchers for openSUSE:Factory

2020-11-05 Thread root 
Hello community,

here is the log from the commit of package nwg-launchers for openSUSE:Factory 
checked in at 2020-11-05 21:54:59

Comparing /work/SRC/openSUSE:Factory/nwg-launchers (Old)
 and  /work/SRC/openSUSE:Factory/.nwg-launchers.new.11331 (New)


Package is "nwg-launchers"

Thu Nov  5 21:54:59 2020 rev:5 rq:846134 version:0.4.1

Changes:

--- /work/SRC/openSUSE:Factory/nwg-launchers/nwg-launchers.changes  
2020-09-23 18:46:26.997655234 +0200
+++ /work/SRC/openSUSE:Factory/.nwg-launchers.new.11331/nwg-launchers.changes   
2020-11-05 21:55:58.596041633 +0100
@@ -1,0 +2,13 @@
+Thu Nov  5 07:29:03 UTC 2020 - Michael Vetter 
+
+- Update to 0.4.1:
+  * bug breaking compilation with libstdc++ fixed #118
+  * [nwgbar] added support for mnemonics #120
+  * [nwggrid] added -d argument to force custom .desktop files
+path(s) #122
+  * [nwggrid] support for running apps in the terminal emulator
+(Terminal=true) added; see README for details on detection
+changing the terminal #127
+  * [nwggrid] sorting names longer than 25 characters fixed #128
+
+---

Old:

  v0.4.0.tar.gz

New:

  v0.4.1.tar.gz



Other differences:
--
++ nwg-launchers.spec ++
--- /var/tmp/diff_new_pack.W6K5Wh/_old  2020-11-05 21:55:59.268040122 +0100
+++ /var/tmp/diff_new_pack.W6K5Wh/_new  2020-11-05 21:55:59.276040104 +0100
@@ -17,7 +17,7 @@
 
 
 Name:   nwg-launchers
-Version:0.4.0
+Version:0.4.1
 Release:0
 Summary:GTK launchers and menu for sway and i3
 License:GPL-3.0-or-later

++ v0.4.0.tar.gz -> v0.4.1.tar.gz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/nwg-launchers-0.4.0/README.md 
new/nwg-launchers-0.4.1/README.md
--- old/nwg-launchers-0.4.0/README.md   2020-09-22 02:41:14.0 +0200
+++ new/nwg-launchers-0.4.1/README.md   2020-11-05 00:51:26.0 +0100
@@ -82,12 +82,13 @@
 
 ```
 $ nwggrid -h
-GTK application grid: nwggrid 0.3.1 (c) Piotr Miller 2020 & Contributors
+GTK application grid: nwggrid 0.4.1 (c) 2020 Piotr Miller, Sergey Smirnykh & 
Contributors
 
 Options:
 -h   show this help message and exit
--f   display favourites (most used entries)
--p   display pinned entries
+-f   display favourites (most used entries); does not work with -d
+-p   display pinned entries; does not work with -d
+-d   look for .desktop files in custom paths (-d 
'/my/path1:/my/another path:/third/path')
 -o  default (black) background opacity (0.0 - 1.0, default 0.9)
 -b   background colour in RRGGBB or RRGGBBAA format (RRGGBBAA 
alpha overrides )
 -n  number of grid columns (default: 6)
@@ -97,6 +98,15 @@
 -wm  window manager name (if can not be detected)
 ```
 
+### Terminal applications
+
+`.desktop` files with the `Terminal=true` line should be started in a terminal 
emulator. There's no common method
+to determine which terminal to use. The `nwggrid` command since v0.4.1 at the 
first run will look for installed
+terminals in the following order: alacritty, kitty, urxvt, lxterminal, sakura, 
st, termite, terminator, xfce4-terminal,
+gnome-terminal. The name of the first one found will be saved to the 
`~/.config/nwg-launchers/nwggrid/term` file.
+If none of above is found, the fallback `xterm` value will be saved, 
regardless of whether xterm is installed or not.
+You may edit the `term` file to use another terminal.
+
 ### Custom background
 
 Use -b  |  argument (w/o #) to define custom background 
colour. If alpha value given, it overrides
@@ -139,8 +149,8 @@
 
 ### Customization
 
-On first run the program creates the `nwg-launchers/nwgbar` folder in your 
.config directory. You'll find a sample template `bar.json`
-and the `style.css` files inside.
+On first run the program creates the `nwg-launchers/nwgbar` folder in your 
.config directory. You'll find a sample
+template `bar.json` and the `style.css` files inside.
 
 Templates use json format. The default one defines an example Exit menu for 
sway window manager on Arch Linux:
 
@@ -169,6 +179,25 @@
 ]
 ```
 
+To set a keyboard shortcut (using Alt+KEY) for an entry, you can add an 
underscore before the letter you want to use.
+Example to set `s` as the shortcut:
+
+```
+[
+...
+  {
+"name": "Lock _screen",
+"exec": "swaylock -f -c 00",
+"icon": "system-lock-screen"
+  }
+...
+]
+```
+
+**Note for underscore ("_")**
+
+If you want to use an underscore in the name, you have to double it ("__").
+
 **Wayfire note**
 
 For the Logout button, as in the bar above, you may use 
[wayland-logout](https://github.com/soreau/wayland-logout)

commit nwg-launchers for openSUSE:Factory

2020-09-23 Thread root 
Hello community,

here is the log from the commit of package nwg-launchers for openSUSE:Factory 
checked in at 2020-09-23 18:45:07

Comparing /work/SRC/openSUSE:Factory/nwg-launchers (Old)
 and  /work/SRC/openSUSE:Factory/.nwg-launchers.new.4249 (New)


Package is "nwg-launchers"

Wed Sep 23 18:45:07 2020 rev:4 rq:836228 version:0.4.0

Changes:

--- /work/SRC/openSUSE:Factory/nwg-launchers/nwg-launchers.changes  
2020-09-17 15:00:24.252457162 +0200
+++ /work/SRC/openSUSE:Factory/.nwg-launchers.new.4249/nwg-launchers.changes
2020-09-23 18:46:26.997655234 +0200
@@ -1,0 +2,11 @@
+Wed Sep 23 07:31:57 UTC 2020 - Michael Vetter 
+
+- Update to 0.4.0:
+  * Respect NoDisplay=true setting in saner way
+  * Separate widgets from data
+  Breaking changes:
+  * Use desktop-id instead of exec to distinguish entries from each other.
+  This breaks existing pins/favs cache. Old caches will be overwritten after 
+  the first launch.
+
+---

Old:

  v0.3.4.tar.gz

New:

  v0.4.0.tar.gz



Other differences:
--
++ nwg-launchers.spec ++
--- /var/tmp/diff_new_pack.hiaQju/_old  2020-09-23 18:46:29.945657946 +0200
+++ /var/tmp/diff_new_pack.hiaQju/_new  2020-09-23 18:46:29.953657954 +0200
@@ -17,7 +17,7 @@
 
 
 Name:   nwg-launchers
-Version:0.3.4
+Version:0.4.0
 Release:0
 Summary:GTK launchers and menu for sway and i3
 License:GPL-3.0-or-later

++ v0.3.4.tar.gz -> v0.4.0.tar.gz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/nwg-launchers-0.3.4/bar/bar.cc 
new/nwg-launchers-0.4.0/bar/bar.cc
--- old/nwg-launchers-0.3.4/bar/bar.cc  2020-09-16 23:58:07.0 +0200
+++ new/nwg-launchers-0.4.0/bar/bar.cc  2020-09-22 02:41:14.0 +0200
@@ -200,6 +200,7 @@
 return EXIT_FAILURE;
 }
 auto& icon_theme_ref = *icon_theme.get();
+auto icon_missing = Gdk::Pixbuf::create_from_file(DATA_DIR_STR 
"/nwgbar/icon-missing.svg");
 
 if (std::filesystem::is_regular_file(css_file)) {
 provider->load_from_path(css_file);
@@ -234,7 +235,7 @@
 
 /* Create buttons */
 for (auto& entry : bar_entries) {
-Gtk::Image* image = app_image(icon_theme_ref, entry.icon);
+Gtk::Image* image = app_image(icon_theme_ref, entry.icon, 
icon_missing);
 auto& ab = window.boxes.emplace_back(std::move(entry.name),
  std::move(entry.exec),
  std::move(entry.icon));
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/nwg-launchers-0.3.4/common/nwg_classes.h 
new/nwg-launchers-0.4.0/common/nwg_classes.h
--- old/nwg-launchers-0.3.4/common/nwg_classes.h2020-09-16 
23:58:07.0 +0200
+++ new/nwg-launchers-0.4.0/common/nwg_classes.h2020-09-22 
02:41:14.0 +0200
@@ -76,10 +76,6 @@
 std::string icon;
 std::string comment;
 std::string mime_type;
-// We need this field to mask unwanted .desktop entries by their copies in 
./local/share/applications
-// with the `NoDisplay=true` line added.
-// See 
https://wiki.archlinux.org/index.php/desktop_entries#Hide_desktop_entries
-bool no_display {false};
 };
 
 struct RGBA {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/nwg-launchers-0.3.4/common/nwg_tools.cc 
new/nwg-launchers-0.4.0/common/nwg_tools.cc
--- old/nwg-launchers-0.3.4/common/nwg_tools.cc 2020-09-16 23:58:07.0 
+0200
+++ new/nwg-launchers-0.4.0/common/nwg_tools.cc 2020-09-22 02:41:14.0 
+0200
@@ -151,7 +151,11 @@
 /*
  * Returns Gtk::Image out of the icon name of file path
  * */
-Gtk::Image* app_image(const Gtk::IconTheme& icon_theme, const std::string& 
icon) {
+Gtk::Image* app_image(
+const Gtk::IconTheme& icon_theme,
+const std::string& icon,
+const Glib::RefPtr& fallback
+) {
 Glib::RefPtr pixbuf;
 
 try {
@@ -164,7 +168,7 @@
 try {
 pixbuf = Gdk::Pixbuf::create_from_file("/usr/share/pixmaps/" + 
icon, image_size, image_size, true);
 } catch (...) {
-pixbuf = Gdk::Pixbuf::create_from_file(DATA_DIR_STR 
"/nwgbar/icon-missing.svg", image_size, image_size, true);
+pixbuf = fallback;
 }
 }
 auto image = Gtk::manage(new Gtk::Image(pixbuf));
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/nwg-launchers-0.3.4/common/nwg_tools.h 
new/nwg-launchers-0.4.0/common/nwg_tools.h
--- old/nwg-launchers-0.3.4/common/nwg_tools.h  2020-09-16 23:58:07.0 
+0200
+++ new/nwg-launchers-0.4.0/common/nwg_tools.h

commit nwg-launchers for openSUSE:Factory

2020-09-17 Thread root 
Hello community,

here is the log from the commit of package nwg-launchers for openSUSE:Factory 
checked in at 2020-09-17 14:51:29

Comparing /work/SRC/openSUSE:Factory/nwg-launchers (Old)
 and  /work/SRC/openSUSE:Factory/.nwg-launchers.new.4249 (New)


Package is "nwg-launchers"

Thu Sep 17 14:51:29 2020 rev:3 rq:835109 version:0.3.4

Changes:

--- /work/SRC/openSUSE:Factory/nwg-launchers/nwg-launchers.changes  
2020-09-14 12:35:09.121359737 +0200
+++ /work/SRC/openSUSE:Factory/.nwg-launchers.new.4249/nwg-launchers.changes
2020-09-17 15:00:24.252457162 +0200
@@ -1,0 +2,8 @@
+Thu Sep 17 07:01:43 UTC 2020 - Michael Vetter 
+
+- Update to 0.3.4:
+  * fixed Clang build broken in v0.3.3 #109
+  * [nwggrid] added /usr/share/pixmaps/ path to look for icons #111
+  * fixed crash on $LANG unset (regression in v0.3.3) #114
+
+---

Old:

  v0.3.3.tar.gz

New:

  v0.3.4.tar.gz



Other differences:
--
++ nwg-launchers.spec ++
--- /var/tmp/diff_new_pack.xmgxEA/_old  2020-09-17 15:00:33.532465975 +0200
+++ /var/tmp/diff_new_pack.xmgxEA/_new  2020-09-17 15:00:33.536465979 +0200
@@ -17,7 +17,7 @@
 
 
 Name:   nwg-launchers
-Version:0.3.3
+Version:0.3.4
 Release:0
 Summary:GTK launchers and menu for sway and i3
 License:GPL-3.0-or-later

++ v0.3.3.tar.gz -> v0.3.4.tar.gz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/nwg-launchers-0.3.3/.travis.yml 
new/nwg-launchers-0.3.4/.travis.yml
--- old/nwg-launchers-0.3.3/.travis.yml 1970-01-01 01:00:00.0 +0100
+++ new/nwg-launchers-0.3.4/.travis.yml 2020-09-16 23:58:07.0 +0200
@@ -0,0 +1,11 @@
+language: cpp
+
+os:
+  - freebsd # clang/libc++
+
+before_install:
+  - sudo pkg install -y meson pkgconf gtkmm30 nlohmann-json
+
+script:
+  - meson _build
+  - meson compile -C _build
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/nwg-launchers-0.3.3/README.md 
new/nwg-launchers-0.3.4/README.md
--- old/nwg-launchers-0.3.3/README.md   2020-09-08 10:28:55.0 +0200
+++ new/nwg-launchers-0.3.4/README.md   2020-09-16 23:58:07.0 +0200
@@ -9,7 +9,7 @@
 It's damned difficult to make all the stuff behave properly on all window 
managers. My priorities are:
 
 1. it **must work well** on sway;
-2. it **should work as well as possible** on i3, dwm and Openbox.
+2. it **should work as well as possible** on Wayfire, i3, dwm and Openbox.
 
 Feel free to report issues you encounter on other window managers / desktop 
environments, but they may or may not be resolved.
 
@@ -169,6 +169,10 @@
 ]
 ```
 
+**Wayfire note**
+
+For the Logout button, as in the bar above, you may use 
[wayland-logout](https://github.com/soreau/wayland-logout) by @soreau.
+
 You may use as many templates as you need, with the `-t` argument. All of them 
must be placed in the config directory.
 You may use own icon files instead of icon names, like 
`/path/to/the/file/my_icon.svg`.
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/nwg-launchers-0.3.3/common/nwg_tools.cc 
new/nwg-launchers-0.3.4/common/nwg_tools.cc
--- old/nwg-launchers-0.3.3/common/nwg_tools.cc 2020-09-08 10:28:55.0 
+0200
+++ new/nwg-launchers-0.3.4/common/nwg_tools.cc 2020-09-16 23:58:07.0 
+0200
@@ -161,7 +161,11 @@
 pixbuf = Gdk::Pixbuf::create_from_file(icon, image_size, 
image_size, true);
 }
 } catch (...) {
-pixbuf = Gdk::Pixbuf::create_from_file(DATA_DIR_STR 
"/nwgbar/icon-missing.svg", image_size, image_size, true);
+try {
+pixbuf = Gdk::Pixbuf::create_from_file("/usr/share/pixmaps/" + 
icon, image_size, image_size, true);
+} catch (...) {
+pixbuf = Gdk::Pixbuf::create_from_file(DATA_DIR_STR 
"/nwgbar/icon-missing.svg", image_size, image_size, true);
+}
 }
 auto image = Gtk::manage(new Gtk::Image(pixbuf));
 
@@ -172,13 +176,16 @@
  * Returns current locale
  * */
 std::string get_locale() {
-std::string loc = getenv("LANG");
-if (!loc.empty()) {
-auto idx = loc.find_first_of("_");
-if (idx != std::string::npos) {
-loc.resize(idx);
+// avoid crash when LANG unset at all (regressed by #83 in v0.3.3) #114
+if (getenv("LANG") != NULL) {
+std::string loc = getenv("LANG");
+if (!loc.empty()) {
+auto idx = loc.find_first_of("_");
+if (idx != std::string::npos) {
+loc.resize(idx);
+}
+return loc;
 }
-return loc;
 }
 return "en";
 }
diff -urN '--exclude=CVS'

commit nwg-launchers for openSUSE:Factory

2020-09-14 Thread root 
Hello community,

here is the log from the commit of package nwg-launchers for openSUSE:Factory 
checked in at 2020-09-14 12:33:08

Comparing /work/SRC/openSUSE:Factory/nwg-launchers (Old)
 and  /work/SRC/openSUSE:Factory/.nwg-launchers.new.4249 (New)


Package is "nwg-launchers"

Mon Sep 14 12:33:08 2020 rev:2 rq:834219 version:0.3.3

Changes:

--- /work/SRC/openSUSE:Factory/nwg-launchers/nwg-launchers.changes  
2020-08-31 16:53:27.256447627 +0200
+++ /work/SRC/openSUSE:Factory/.nwg-launchers.new.4249/nwg-launchers.changes
2020-09-14 12:35:09.121359737 +0200
@@ -1,0 +2,9 @@
+Mon Sep 14 07:29:34 UTC 2020 - Michael Vetter 
+
+- Update to 0.3.3:
+  * [nwggrid] support for applications installed with flatpak
+  * fixes to improper displays geometry detection on X11
+  * [nwggrid] new pin/unpin implementation
+  * code optimization
+
+---

Old:

  v0.3.2.tar.gz

New:

  v0.3.3.tar.gz



Other differences:
--
++ nwg-launchers.spec ++
--- /var/tmp/diff_new_pack.kweArE/_old  2020-09-14 12:35:13.929362803 +0200
+++ /var/tmp/diff_new_pack.kweArE/_new  2020-09-14 12:35:13.933362805 +0200
@@ -1,5 +1,5 @@
 #
-# spec file for package new-launchers
+# spec file for package nwg-launchers
 #
 # Copyright (c) 2020 SUSE LLC
 #
@@ -17,7 +17,7 @@
 
 
 Name:   nwg-launchers
-Version:0.3.2
+Version:0.3.3
 Release:0
 Summary:GTK launchers and menu for sway and i3
 License:GPL-3.0-or-later

++ v0.3.2.tar.gz -> v0.3.3.tar.gz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/nwg-launchers-0.3.2/CONTRIBUTING.md 
new/nwg-launchers-0.3.3/CONTRIBUTING.md
--- old/nwg-launchers-0.3.2/CONTRIBUTING.md 2020-08-26 00:36:02.0 
+0200
+++ new/nwg-launchers-0.3.3/CONTRIBUTING.md 2020-09-08 10:28:55.0 
+0200
@@ -9,6 +9,8 @@
 2. new features
 3. optimization, refactoring, e.t.c.
 
+Please test your changes not in sway only, but also in i3 and Openbox.
+
 Before submitting a major PR, it makes sense to open an issue, and discuss the 
changes you're planning on.
 
 ### Code formatting
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/nwg-launchers-0.3.2/README.md 
new/nwg-launchers-0.3.3/README.md
--- old/nwg-launchers-0.3.2/README.md   2020-08-26 00:36:02.0 +0200
+++ new/nwg-launchers-0.3.3/README.md   2020-09-08 10:28:55.0 +0200
@@ -241,6 +241,18 @@
 for_window [title="~nwg"] border none
 ```
 
+## Openbox Note
+
+To start nwgdmenu from a key binding, use the `-run` argument, e.g.:
+
+```xml
+
+  
+nwgdmenu -run
+  
+
+```
+
 ## Tips & tricks
 
 ### Hide unwanted icons in nwggrid
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/nwg-launchers-0.3.2/bar/bar.cc 
new/nwg-launchers-0.3.3/bar/bar.cc
--- old/nwg-launchers-0.3.2/bar/bar.cc  2020-08-26 00:36:02.0 +0200
+++ new/nwg-launchers-0.3.3/bar/bar.cc  2020-09-08 10:28:55.0 +0200
@@ -16,7 +16,6 @@
 #include "on_event.h"
 #include "bar.h"
 
-int image_size {72};// button image size in pixels
 RGBA background = {0.0, 0.0, 0.0, 0.9};
 std::string wm {""};// detected or forced window manager name
 const char* const HELP_MESSAGE =
@@ -44,27 +43,7 @@
 gettimeofday(, NULL);
 long int start_ms = tp.tv_sec * 1000 + tp.tv_usec / 1000;
 
-pid_t pid = getpid();
-std::string mypid = std::to_string(pid);
-
-std::string pid_file = "/var/run/user/" + std::to_string(getuid()) + 
"/nwgbar.pid";
-
-int saved_pid {};
-if (std::ifstream(pid_file)) {
-try {
-saved_pid = std::stoi(read_file_to_string(pid_file));
-if (kill(saved_pid, 0) != -1) {  // found running instance!
-kill(saved_pid, 9);
-save_string_to_file(mypid, pid_file);
-std::exit(0);
-}
-} catch (...) {
-std::cerr << "\nError reading pid file\n\n";
-}
-}
-save_string_to_file(mypid, pid_file);
-
-std::string lang ("");
+create_pid_file_or_kill_pid("nwgbar");
 
 InputParser input(argc, argv);
 if(input.cmdOptionExists("-h")){
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/nwg-launchers-0.3.2/common/nwg_classes.cc 
new/nwg-launchers-0.3.3/common/nwg_classes.cc
--- old/nwg-launchers-0.3.2/common/nwg_classes.cc   2020-08-26 
00:36:02.0 +0200
+++ new/nwg-launchers-0.3.3/common/nwg_classes.cc   2020-09-08 
10:28:55.0 +0200
@@ -72,15 +72,7 @@
 std::cerr << "Your screen does not support alpha channels!\n";
 }