From: Andreas Fink <andreas.fink85@googlemail.com>
Date: Thu, 18 Nov 2010 20:29:30 +0000 (+0000)
Subject: *fix* warning
X-Git-Url: https://git.dogcows.com/gitweb?a=commitdiff_plain;h=caa0f8fbb901def18eab94a2e7f0131705967c5e;p=chaz%2Ftint2

*fix* warning
*fix* tint2conf installation directories
---

diff --git a/src/tint.c b/src/tint.c
index 5d5720c..db40959 100644
--- a/src/tint.c
+++ b/src/tint.c
@@ -923,7 +923,7 @@ start:
 								break;
 							}
 						}
-					break;
+						break;
 
 					case ClientMessage:
 						ev = &e.xclient;
diff --git a/src/tint2conf/CMakeLists.txt b/src/tint2conf/CMakeLists.txt
index 76f8069..0ec906d 100644
--- a/src/tint2conf/CMakeLists.txt
+++ b/src/tint2conf/CMakeLists.txt
@@ -45,6 +45,6 @@ set_target_properties( tint2conf PROPERTIES LINK_FLAGS "-pthread" )
 
 install( TARGETS tint2conf DESTINATION bin )
 install( PROGRAMS tintwizard.py DESTINATION bin )
-install( FILES taskbar.svg DESTINATION share/icons/hicolor/scalable/apps )
-install( FILES tint2conf.desktop DESTINATION share/applications )
+install( FILES taskbar.svg DESTINATION ${DATADIR}/icons/hicolor/scalable/apps )
+install( FILES tint2conf.desktop DESTINATION ${DATADIR}/applications )
 install( CODE "execute_process(COMMAND gtk-update-icon-cache -f -t ${DATADIR}/icons/hicolor WORKING_DIRECTORY ${CMAKE_INSTALL_PREFIX})" )
diff --git a/src/util/timer.c b/src/util/timer.c
index dd68473..9f7ca0d 100644
--- a/src/util/timer.c
+++ b/src/util/timer.c
@@ -398,7 +398,7 @@ void remove_from_multi_timeout(timeout* t)
 
 	if (g_slist_length(mth->timeout_list) == 1) {
 		timeout* last_timeout = mth->timeout_list->data;
-		g_slist_remove(mth->timeout_list, last_timeout);
+		mth->timeout_list = g_slist_remove(mth->timeout_list, last_timeout);
 		free(last_timeout->multi_timeout);
 		last_timeout->multi_timeout = 0;
 		g_hash_table_remove(multi_timeouts, last_timeout);