Release 0.14.1

tint2conf: Fix bad code when compiling with clang
2017-03-26 15:50:55 +02:00 · 2017-03-26 15:47:16 +02:00 · 2017-03-26 15:46:10 +02:00
8 changed files with 27 additions and 21 deletions
--- a/4
+++ b/4
@@ -1,3 +1,7 @@
 2017-03-26 0.14.1
 - Fixes:
  - Fixed tint2conf problem under FreeBSD (or generally any system using clang).
 2017-03-26 0.14
 - Enhancements:
  - New plugin: button.
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
-# Latest stable release: 0.14
+# Latest stable release: 0.14.1
-Changes: https://gitlab.com/o9000/tint2/blob/0.14/ChangeLog
+Changes: https://gitlab.com/o9000/tint2/blob/0.14.1/ChangeLog
 Documentation: [doc/tint2.md](doc/tint2.md)
@@ -8,7 +8,7 @@ Compile it with (after you install the [dependencies](https://gitlab.com/o9000/t
 ```
 git clone https://gitlab.com/o9000/tint2.git
 cd tint2
-git checkout 0.14
+git checkout 0.14.1
 mkdir build
 cd build
 cmake ..
--- a/doc/readme.html
+++ b/doc/readme.html
@@ -199,9 +199,9 @@ pre {
 </style>
 </head>
 <body>
-<h1 id="latest-stable-release-0-14"><span class="md2man-title">Latest</span> <span class="md2man-section">stable</span> <span class="md2man-date">release:</span> <span class="md2man-source">0.14</span><a name="latest-stable-release-0-14" href="#latest-stable-release-0-14" class="md2man-permalink" title="permalink"></a></h1><p>Changes: <a href="https://gitlab.com/o9000/tint2/blob/0.14/ChangeLog">https://gitlab.com/o9000/tint2/blob/0.14/ChangeLog</a></p><p>Documentation: <a href="manual.html">manual.html</a></p><p>Compile it with (after you install the <a href="https://gitlab.com/o9000/tint2/wikis/Install#dependencies">dependencies</a>):</p><pre class="highlight plaintext"><code>git clone https://gitlab.com/o9000/tint2.git
+<h1 id="latest-stable-release-0-14-1"><span class="md2man-title">Latest</span> <span class="md2man-section">stable</span> <span class="md2man-date">release:</span> <span class="md2man-source">0.14.1</span><a name="latest-stable-release-0-14-1" href="#latest-stable-release-0-14-1" class="md2man-permalink" title="permalink"></a></h1><p>Changes: <a href="https://gitlab.com/o9000/tint2/blob/0.14.1/ChangeLog">https://gitlab.com/o9000/tint2/blob/0.14.1/ChangeLog</a></p><p>Documentation: <a href="manual.html">manual.html</a></p><p>Compile it with (after you install the <a href="https://gitlab.com/o9000/tint2/wikis/Install#dependencies">dependencies</a>):</p><pre class="highlight plaintext"><code>git clone https://gitlab.com/o9000/tint2.git
 cd tint2
-git checkout 0.14
+git checkout 0.14.1
 mkdir build
 cd build
 cmake ..
--- a/doc/tint2.1
+++ b/doc/tint2.1
@@ -1,4 +1,4 @@
-.TH TINT2 1 "2017\-03\-26" 0.14
+.TH TINT2 1 "2017\-03\-26" 0.14.1
 .SH NAME
 .PP
 tint2 \- lightweight panel/taskbar
--- a/doc/tint2.md
+++ b/doc/tint2.md
@@ -1,4 +1,4 @@
-# TINT2 1 "2017-03-26" 0.14
+# TINT2 1 "2017-03-26" 0.14.1
 ## NAME
 tint2 - lightweight panel/taskbar
--- a/src/tint2conf/main.c
+++ b/src/tint2conf/main.c
@@ -119,7 +119,7 @@ gchar *import_no_overwrite(const char *filepath)
 	if (!g_file_test(newpath, G_FILE_TEST_EXISTS)) {
 		copy_file(filepath, newpath);
 		theme_list_append(newpath);
-		g_timeout_add(SNAPSHOT_TICK, (GSourceFunc)update_snapshot, NULL);
+		g_timeout_add(SNAPSHOT_TICK, update_snapshot, NULL);
 	}
 	return newpath;
@@ -138,7 +138,7 @@ void import_with_overwrite(const char *filepath, const char *newpath)
 	if (theme_is_editable(newpath)) {
 		if (!theme_existed) {
 			theme_list_append(newpath);
-			g_timeout_add(SNAPSHOT_TICK, (GSourceFunc)update_snapshot, NULL);
+			g_timeout_add(SNAPSHOT_TICK, update_snapshot, NULL);
 		} else {
 			int unused = system("killall -SIGUSR1 tint2 || pkill -SIGUSR1 -x tint2");
 			(void)unused;
@@ -158,7 +158,7 @@ static void menuImportFile();
 static void menuSaveAs();
 static void menuDelete();
 static void menuReset();
-static void edit_theme();
+static gboolean edit_theme(gpointer ignored);
 static void make_selected_theme_default();
 static void menuAbout();
 static gboolean view_onPopupMenu(GtkWidget *treeview, gpointer userdata);
@@ -309,7 +309,7 @@ int main(int argc, char **argv)
 	argc--, argv++;
 	if (argc > 0) {
 		load_specific_themes(argv, argc);
-		g_timeout_add(SNAPSHOT_TICK, (GSourceFunc)edit_theme, NULL);
+		g_timeout_add(SNAPSHOT_TICK, edit_theme, NULL);
 	}
 	gtk_widget_show_all(g_window);
@@ -643,11 +643,11 @@ void select_theme(const char *given_path)
 }
 // Edits the selected theme. If it is read-only, it copies first to ~.
-static void edit_theme()
+static gboolean edit_theme(gpointer ignored)
 {
 	gchar *filepath = get_selected_theme_or_warn();
 	if (!filepath)
-		return;
+		return FALSE;
 	gboolean editable = theme_is_editable(filepath);
 	if (!editable) {
@@ -665,6 +665,8 @@ static void edit_theme()
 	g_free(filepath);
 	destroy_please_wait();
 	return FALSE;
 }
 static void make_selected_theme_default()
@@ -702,7 +704,7 @@ static void make_selected_theme_default()
 static void viewRowActivated(GtkTreeView *tree_view, GtkTreePath *path, GtkTreeViewColumn *column, gpointer user_data)
 {
-	edit_theme();
+	edit_theme(NULL);
 }
 // ====== Theme load/reload ======
@@ -834,7 +836,7 @@ static void load_all_themes()
 			have_iter = gtk_tree_model_iter_next(model, &iter);
 		}
-		g_timeout_add(SNAPSHOT_TICK, (GSourceFunc)update_snapshot, NULL);
+		g_timeout_add(SNAPSHOT_TICK, update_snapshot, NULL);
 	}
 }
@@ -865,7 +867,7 @@ static void reload_all_themes()
 			have_iter = gtk_tree_model_iter_next(model, &iter);
 		}
-		g_timeout_add(SNAPSHOT_TICK, (GSourceFunc)update_snapshot, NULL);
+		g_timeout_add(SNAPSHOT_TICK, update_snapshot, NULL);
 	}
 }
@@ -899,7 +901,7 @@ static void load_specific_themes(char **paths, int count)
 			have_iter = gtk_tree_model_iter_next(model, &iter);
 		}
-		g_timeout_add(SNAPSHOT_TICK, (GSourceFunc)update_snapshot, NULL);
+		g_timeout_add(SNAPSHOT_TICK, update_snapshot, NULL);
 	}
 }
@@ -910,7 +912,7 @@ void refresh_current_theme()
 	GtkTreeModel *model;
 	if (gtk_tree_selection_get_selected(GTK_TREE_SELECTION(sel), &model, &iter)) {
 		gtk_list_store_set(theme_list_store, &iter, COL_SNAPSHOT, NULL, -1);
-		g_timeout_add(SNAPSHOT_TICK, (GSourceFunc)update_snapshot, NULL);
+		g_timeout_add(SNAPSHOT_TICK, update_snapshot, NULL);
 	}
 }
@@ -925,7 +927,7 @@ void refresh_theme(const char *given_path)
 		gtk_tree_model_get(model, &iter, COL_THEME_FILE, &filepath, -1);
 		if (g_str_equal(filepath, given_path)) {
 			gtk_list_store_set(theme_list_store, &iter, COL_SNAPSHOT, NULL, -1);
-			g_timeout_add(SNAPSHOT_TICK, (GSourceFunc)update_snapshot, NULL);
+			g_timeout_add(SNAPSHOT_TICK, update_snapshot, NULL);
 			g_free(filepath);
 			break;
 		}
--- a/src/tint2conf/main.h
+++ b/src/tint2conf/main.h
@@ -15,7 +15,7 @@
 #endif
 #define SNAPSHOT_TICK 190
-gboolean update_snapshot();
+gboolean update_snapshot(gpointer ignored);
 void menuApply();
 void refresh_current_theme();
 extern GtkWidget *g_window;
--- a/src/tint2conf/theme_view.c
+++ b/src/tint2conf/theme_view.c
@@ -153,7 +153,7 @@ void theme_list_append(const gchar *path)
 	g_free(suffix);
 }
-gboolean update_snapshot()
+gboolean update_snapshot(gpointer ignored)
 {
 	{
 		gchar *tint2_cache_dir = g_build_filename(g_get_user_cache_dir(), "tint2", NULL);
Author	SHA1	Message	Date
o9000	6cde7bef1e	Release 0.14.1	2017-03-26 15:50:55 +02:00
o9000	b9ab0ae58e	tint2conf: Fix bad code when compiling with clang	2017-03-26 15:47:16 +02:00
o9000	2c90c5640e	tint2conf: Fix bad code when compiling with clang	2017-03-26 15:46:10 +02:00