nilix/tint2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

tint2conf: Fix bad code when compiling with clang

Browse source
This commit is contained in:
o9000 2017-03-26 15:46:10 +02:00
parent cb43e76660
commit 2c90c5640e
2 changed files with 15 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/tint2conf/main.c
View file

@ -119,7 +119,7 @@ gchar *import_no_overwrite(const char *filepath)
if (!g_file_test(newpath, G_FILE_TEST_EXISTS)) { if (!g_file_test(newpath, G_FILE_TEST_EXISTS)) {
copy_file(filepath, newpath); copy_file(filepath, newpath);
theme_list_append(newpath); theme_list_append(newpath);
g_timeout_add(SNAPSHOT_TICK, (GSourceFunc)update_snapshot, NULL); g_timeout_add(SNAPSHOT_TICK, update_snapshot, NULL);
} }
return newpath; return newpath;
@ -138,7 +138,7 @@ void import_with_overwrite(const char *filepath, const char *newpath)
if (theme_is_editable(newpath)) { if (theme_is_editable(newpath)) {
if (!theme_existed) { if (!theme_existed) {
theme_list_append(newpath); theme_list_append(newpath);
g_timeout_add(SNAPSHOT_TICK, (GSourceFunc)update_snapshot, NULL); g_timeout_add(SNAPSHOT_TICK, update_snapshot, NULL);
} else { } else {
int unused = system("killall -SIGUSR1 tint2 || pkill -SIGUSR1 -x tint2"); int unused = system("killall -SIGUSR1 tint2 || pkill -SIGUSR1 -x tint2");
(void)unused; (void)unused;
@ -158,7 +158,7 @@ static void menuImportFile();
static void menuSaveAs(); static void menuSaveAs();
static void menuDelete(); static void menuDelete();
static void menuReset(); static void menuReset();
static void edit_theme(); static gboolean edit_theme(gpointer ignored);
static void make_selected_theme_default(); static void make_selected_theme_default();
static void menuAbout(); static void menuAbout();
static gboolean view_onPopupMenu(GtkWidget *treeview, gpointer userdata); static gboolean view_onPopupMenu(GtkWidget *treeview, gpointer userdata);
@ -309,7 +309,7 @@ int main(int argc, char **argv)
argc--, argv++; argc--, argv++;
if (argc > 0) { if (argc > 0) {
load_specific_themes(argv, argc); 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); 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 ~. // 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(); gchar *filepath = get_selected_theme_or_warn();
if (!filepath) if (!filepath)
return; return FALSE;
gboolean editable = theme_is_editable(filepath); gboolean editable = theme_is_editable(filepath);
if (!editable) { if (!editable) {
@ -665,6 +665,8 @@ static void edit_theme()
g_free(filepath); g_free(filepath);
destroy_please_wait(); destroy_please_wait();
return FALSE;
} }
static void make_selected_theme_default() 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) static void viewRowActivated(GtkTreeView *tree_view, GtkTreePath *path, GtkTreeViewColumn *column, gpointer user_data)
{ {
edit_theme(); edit_theme(NULL);
} }
// ====== Theme load/reload ====== // ====== Theme load/reload ======
@ -834,7 +836,7 @@ static void load_all_themes()
have_iter = gtk_tree_model_iter_next(model, &iter); 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); 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); 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; GtkTreeModel *model;
if (gtk_tree_selection_get_selected(GTK_TREE_SELECTION(sel), &model, &iter)) { if (gtk_tree_selection_get_selected(GTK_TREE_SELECTION(sel), &model, &iter)) {
gtk_list_store_set(theme_list_store, &iter, COL_SNAPSHOT, NULL, -1); 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); gtk_tree_model_get(model, &iter, COL_THEME_FILE, &filepath, -1);
if (g_str_equal(filepath, given_path)) { if (g_str_equal(filepath, given_path)) {
gtk_list_store_set(theme_list_store, &iter, COL_SNAPSHOT, NULL, -1); 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); g_free(filepath);
break; break;
} }

2
src/tint2conf/theme_view.c
View file

@ -153,7 +153,7 @@ void theme_list_append(const gchar *path)
g_free(suffix); 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); gchar *tint2_cache_dir = g_build_filename(g_get_user_cache_dir(), "tint2", NULL);