*fix* warning

*fix* tint2conf installation directories

diff --git a/src/tint.c b/src/tint.c
index 5d5720c996ad591ff9631e6e6045a87dc5bd7b70..db4095985ffa2668afdf23ec237e8b55b13c1d47 100644 (file)
--- a/src/tint.c
+++ b/src/tint.c
@@ -923,7 +923,7 @@ start:
                                                                break;
                                                        }
                                                }
                                                                break;
                                                        }
                                                }

-                                       break;
+                                               break;

 
                                        case ClientMessage:
                                                ev = &e.xclient;
 
                                        case ClientMessage:
                                                ev = &e.xclient;

diff --git a/src/tint2conf/CMakeLists.txt b/src/tint2conf/CMakeLists.txt
index 76f8069fe6ab4b640853e8e80f74ee59cfd2d78b..0ec906dfdc3851f34e2b254120adb878237a0528 100644 (file)
--- 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( 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})" )
 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 dd6847318569126796964e3caea4f70b64d0df44..9f7ca0d65c85713e9d951e7facf4cd14eefef65d 100644 (file)
--- 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;
 
        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);
                free(last_timeout->multi_timeout);
                last_timeout->multi_timeout = 0;
                g_hash_table_remove(multi_timeouts, last_timeout);