diff --git a/capplets/theme-switcher/gui.c b/capplets/theme-switcher/gui.c index 18bb5b311..415ba171a 100644 --- a/capplets/theme-switcher/gui.c +++ b/capplets/theme-switcher/gui.c @@ -157,13 +157,13 @@ click_try(GtkWidget *widget, gpointer data) /* hack for enlightenment only!!!! */ /* FIXME: restart what ever windowmanager you have! */ /*g_snprintf(cmd, sizeof(cmd), "eesh -e \"restart %s/e\"", dir);*/ - printf("%s\n", cmd); + /* printf("%s\n", cmd); */ send_reread(); use_theme(rc); gdk_error_warnings = 0; signal_apply_theme(widget); gdk_flush(); - system(cmd); + /* system(cmd); */ gdk_error_warnings = 1; } void @@ -193,13 +193,13 @@ click_revert(GtkWidget *widget, gpointer data) /* hack for enlightenment only!!!! */ /* FIXME: restart what ever windowmanager you have! */ /* g_snprintf(cmd, sizeof(cmd), "eesh -e \"restart %s/e\"", dir);*/ - printf("%s\n", cmd); + /* printf("%s\n", cmd); */ send_reread(); use_theme(rc); gdk_error_warnings = 0; signal_apply_theme(widget); gdk_flush(); - system(cmd); + /* system(cmd); */ gdk_error_warnings = 1; gtk_list_select_child (GTK_LIST (system_list), initial_theme); } diff --git a/capplets/theme-switcher/gui.c-6060 b/capplets/theme-switcher/gui.c-6060 index 18bb5b311..415ba171a 100644 --- a/capplets/theme-switcher/gui.c-6060 +++ b/capplets/theme-switcher/gui.c-6060 @@ -157,13 +157,13 @@ click_try(GtkWidget *widget, gpointer data) /* hack for enlightenment only!!!! */ /* FIXME: restart what ever windowmanager you have! */ /*g_snprintf(cmd, sizeof(cmd), "eesh -e \"restart %s/e\"", dir);*/ - printf("%s\n", cmd); + /* printf("%s\n", cmd); */ send_reread(); use_theme(rc); gdk_error_warnings = 0; signal_apply_theme(widget); gdk_flush(); - system(cmd); + /* system(cmd); */ gdk_error_warnings = 1; } void @@ -193,13 +193,13 @@ click_revert(GtkWidget *widget, gpointer data) /* hack for enlightenment only!!!! */ /* FIXME: restart what ever windowmanager you have! */ /* g_snprintf(cmd, sizeof(cmd), "eesh -e \"restart %s/e\"", dir);*/ - printf("%s\n", cmd); + /* printf("%s\n", cmd); */ send_reread(); use_theme(rc); gdk_error_warnings = 0; signal_apply_theme(widget); gdk_flush(); - system(cmd); + /* system(cmd); */ gdk_error_warnings = 1; gtk_list_select_child (GTK_LIST (system_list), initial_theme); } diff --git a/capplets/theme-switcher/install.c b/capplets/theme-switcher/install.c index af00a64c8..a0b29c1cf 100644 --- a/capplets/theme-switcher/install.c +++ b/capplets/theme-switcher/install.c @@ -44,7 +44,7 @@ install_theme(gchar *file) { /*gzipped tarball */ /*sprintf(s,"gzip -d -c < %s | tar -xf - -C %s",Theme_Tar_Ball,Theme_Path); */ - g_snprintf(s, sizeof(s), + g_snprintf(s, sizeof(s), "gzip -d -c < %s | (cd %s ; tar -xf -)", file, th); } @@ -56,9 +56,13 @@ install_theme(gchar *file) g_snprintf(s, sizeof(s), "(cd %s ; tar -xf %s", file, th); - } - system(s); - wait(&i); + } else + s[0] = '\0'; + + if(*s) { + system(s); + wait(&i); + } return; } } diff --git a/capplets/theme-switcher/install.c-64828 b/capplets/theme-switcher/install.c-64828 index af00a64c8..a0b29c1cf 100644 --- a/capplets/theme-switcher/install.c-64828 +++ b/capplets/theme-switcher/install.c-64828 @@ -44,7 +44,7 @@ install_theme(gchar *file) { /*gzipped tarball */ /*sprintf(s,"gzip -d -c < %s | tar -xf - -C %s",Theme_Tar_Ball,Theme_Path); */ - g_snprintf(s, sizeof(s), + g_snprintf(s, sizeof(s), "gzip -d -c < %s | (cd %s ; tar -xf -)", file, th); } @@ -56,9 +56,13 @@ install_theme(gchar *file) g_snprintf(s, sizeof(s), "(cd %s ; tar -xf %s", file, th); - } - system(s); - wait(&i); + } else + s[0] = '\0'; + + if(*s) { + system(s); + wait(&i); + } return; } }