Updated for 0.12.2

Fix copy&paste mistake, battery should be enabled
for obsolete "battery" option instead of obsolete
"systray" option.

AUTHORS

@@ -6,6 +6,7 @@ tint2 is developped by :
 - Christian Ruppert <Spooky85@gmail.com> (autotools build system)
 - Ovidiu M <mrovi9000 at gmail.com> : launcher, bug fixes
 - Mishael A Sibiryakov (death@junki.org) : freespace
+- Sebastian Reichel <sre@ring0.de> : battery, various fixes
 
 tint2 is based on ttm source code (http://code.google.com/p/ttm/)
 - 2007-2008 Pål Staurland <staura@gmail.com>
@@ -23,4 +24,3 @@ Contributors:
   Xico Atelo : startup notifications
   Craig Oakes : WM flags, issue tracker organization
   Jeff Blake (https://gitlab.com/u/berkley4) : more mouse event handlers
-

ChangeLog

@@ -1,3 +1,9 @@
+2015-08-11 0.12.2
+- Fixes:
+  - Systray: do not move empty icons to the side, as it breaks GTK2 StatusIcon blinking (issue #515)
+  - tint2conf: Fix read of panel_monitor (issue #520)
+  - Fix command line argument processing (issue #516)
+  - Fix battery option parsing
 2015-08-01 0.12.1
 - Fixes:
   - Config:

README.md

@@ -1,5 +1,5 @@
-### New stable release: 0.12.1
+### New stable release: 0.12.2
-Changes: https://gitlab.com/o9000/tint2/blob/master/ChangeLog
+Changes: https://gitlab.com/o9000/tint2/blob/0.12.2/ChangeLog
 
 Documentation: https://gitlab.com/o9000/tint2/wikis/home
 
@@ -7,7 +7,7 @@ Try it out with (see also [dependencies](https://gitlab.com/o9000/tint2/wikis/In
 ```
 git clone https://gitlab.com/o9000/tint2.git
 cd tint2
-git checkout v0.12.1
+git checkout 0.12.2
 mkdir build
 cd build
 cmake ..
@@ -71,7 +71,7 @@ tint2 is a simple panel/taskbar made for modern X window managers. It was specif
   * Old project location (inactive): https://code.google.com/p/tint2
 
 ### Releases
-  * Latest stable release: tint2 0.12 (July 2015)
+  * Latest stable release: tint2 0.12.2 (August 2015)
 
 ### Screenshots
 ![screenshot](https://gitlab.com/o9000/tint2/wikis/screenshot.png)

src/systray/systraybar.c

@@ -295,7 +295,7 @@ void start_net()
 		_NET_WM_PID = XInternAtom(server.dsp, "_NET_WM_PID", True);
 		int ret = XGetWindowProperty(server.dsp, win, _NET_WM_PID, 0, 1024, False, AnyPropertyType, &actual_type, &actual_format, &nitems, &bytes_after, &prop);
 
-		fprintf(stderr, RED "tint2 : another systray is running");
+		fprintf(stderr, RED "tint2 : another systray is running" RESET);
 		if (ret == Success && prop) {
 			pid = prop[1] * 256;
 			pid += prop[0];
@@ -419,10 +419,13 @@ static gint compare_traywindows(gconstpointer a, gconstpointer b)
 	const TrayWindow * traywin_a = (TrayWindow*)a;
 	const TrayWindow * traywin_b = (TrayWindow*)b;
 
+#if 0
+	// This breaks pygtk2 StatusIcon with blinking activated
 	if (traywin_a->empty && !traywin_b->empty)
 		return 1 * (systray.sort == SYSTRAY_SORT_RIGHT2LEFT ? -1 : 1);
 	if (!traywin_a->empty && traywin_b->empty)
 		return -1 * (systray.sort == SYSTRAY_SORT_RIGHT2LEFT ? -1 : 1);
+#endif
 
 	if (systray.sort == SYSTRAY_SORT_ASCENDING ||
 		systray.sort == SYSTRAY_SORT_DESCENDING) {

src/tint.c

@@ -123,23 +123,35 @@ void init (int argc, char *argv[])
 
 	// read options
 	for (i = 1; i < argc; ++i) {
-		if (!strcmp(argv[i], "-h") || !strcmp(argv[i], "--help"))	{
+		int error = 0;
-			printf("Usage: tint2 [-c] <config_file>\n");
+		if (strcmp(argv[i], "-h") == 0 || strcmp(argv[i], "--help") == 0) {
+			printf("Usage: tint2 [[-c] <config_file>]\n");
 			exit(0);
-		}
+		} else if (strcmp(argv[i], "-v") == 0 || strcmp(argv[i], "--version") == 0) {
-		if (!strcmp(argv[i], "-v") || !strcmp(argv[i], "--version"))	{
 			printf("tint2 version %s\n", VERSION_STRING);
 			exit(0);
-		}
+		} else if (strcmp(argv[i], "-c") == 0) {
-		if (!strcmp(argv[i], "-c")) {
+			if (i+1 < argc) {
-			i++;
+				i++;
-			if (i < argc)
 				config_path = strdup(argv[i]);
-		}
+			} else {
-		if (!strcmp(argv[i], "-s"))	{
+				error = 1;
-			i++;
+			}
-			if (i < argc)
+		} else if (strcmp(argv[i], "-s") == 0)	{
+			if (i+1 < argc) {
+				i++;
 				snapshot_path = strdup(argv[i]);
+			} else {
+				error = 1;
+			}
+		} else if (i+1 == argc)	{
+			config_path = strdup(argv[i]);
+		} else {
+			error = 1;
+		}
+		if (error) {
+			printf("Usage: tint2 [[-c] <config_file>]\n");
+			exit(1);
 		}
 	}
 	// Set signal handler

src/tint2conf/properties_rw.c

@@ -856,20 +856,18 @@ void add_entry(char *key, char *value)
 	else if (strcmp(key, "panel_monitor") == 0) {
 		if (strcmp(value, "all") == 0)
 			gtk_combo_box_set_active(GTK_COMBO_BOX(panel_combo_monitor), 0);
-		else if (strcmp(value, "0") == 0)
-			gtk_combo_box_set_active(GTK_COMBO_BOX(panel_combo_monitor), 1);
 		else if (strcmp(value, "1") == 0)
-			gtk_combo_box_set_active(GTK_COMBO_BOX(panel_combo_monitor), 2);
+			gtk_combo_box_set_active(GTK_COMBO_BOX(panel_combo_monitor), 1);
 		else if (strcmp(value, "2") == 0)
-			gtk_combo_box_set_active(GTK_COMBO_BOX(panel_combo_monitor), 3);
+			gtk_combo_box_set_active(GTK_COMBO_BOX(panel_combo_monitor), 2);
 		else if (strcmp(value, "3") == 0)
-			gtk_combo_box_set_active(GTK_COMBO_BOX(panel_combo_monitor), 4);
+			gtk_combo_box_set_active(GTK_COMBO_BOX(panel_combo_monitor), 3);
 		else if (strcmp(value, "4") == 0)
-			gtk_combo_box_set_active(GTK_COMBO_BOX(panel_combo_monitor), 5);
+			gtk_combo_box_set_active(GTK_COMBO_BOX(panel_combo_monitor), 4);
 		else if (strcmp(value, "5") == 0)
-			gtk_combo_box_set_active(GTK_COMBO_BOX(panel_combo_monitor), 6);
+			gtk_combo_box_set_active(GTK_COMBO_BOX(panel_combo_monitor), 5);
 		else if (strcmp(value, "6") == 0)
-			gtk_combo_box_set_active(GTK_COMBO_BOX(panel_combo_monitor), 7);
+			gtk_combo_box_set_active(GTK_COMBO_BOX(panel_combo_monitor), 6);
 	}
 	
 	/* autohide options */
@@ -900,7 +898,7 @@ void add_entry(char *key, char *value)
 	}
 
 	/* Battery */
-	else if (strcmp(key, "systray") == 0) {
+	else if (strcmp(key, "battery") == 0) {
 		// Obsolete option
 		config_has_battery = 1;
 		config_battery_enabled = atoi(value);

src/tooltip/tooltip.c

@@ -259,7 +259,7 @@ void tooltip_update()
 }
 
 
-void tooltip_trigger_hide(Tooltip* tooltip)
+void tooltip_trigger_hide()
 {
 	if (g_tooltip.mapped) {
 		tooltip_copy_text(0);