talons

commit 418e8c9d098fd7976f9b612acc6fd7bb55cf6e62
parent a24745f499008e5a9e3055190fe47ebba6ac9315
Author: Ricardo Mones <ricardo@mones.org>
Date:   Mon,  1 Oct 2018 23:58:24 +0200

Don't try to be too clever and remove superuser_p()

Being root doesn't really tell much about filesystem permissions. Now it
simply ask user what to do and does it as requested. If things go wrong
errors will be catched anyway.

Diffstat:
M
src/common/utils.c
 | 
11
-----------
M
src/common/utils.h
 | 
5
-----
M
src/prefs_themes.c
 | 
57
++++++++++++++++++++++++++++-----------------------------

3 files changed, 28 insertions(+), 45 deletions(-)
diff --git a/src/common/utils.c b/src/common/utils.c
@@ -90,17 +90,6 @@
 
 static gboolean debug_mode = FALSE;
 
-/* Return true if we are running as root.  This function should beused
-   instead of getuid () == 0.  */
-gboolean superuser_p (void)
-{
-#ifdef G_OS_WIN32
-  return w32_is_administrator ();
-#else
-  return !getuid();
-#endif  
-}
-
 GSList *slist_copy_deep(GSList *list, GCopyFunc func)
 {
 #if GLIB_CHECK_VERSION(2, 34, 0)
diff --git a/src/common/utils.h b/src/common/utils.h
@@ -247,11 +247,6 @@ gboolean debug_get_mode		(void);
 #define Str(x)	#x
 #define Xstr(x)	Str(x)
 
-
-/* System related stuff.  */
-
-gboolean superuser_p (void);
-
 /* List utilities. */
 
 GSList *slist_copy_deep		(GSList		*list,
diff --git a/src/prefs_themes.c b/src/prefs_themes.c
@@ -495,18 +495,11 @@ static void prefs_themes_btn_remove_clicked_cb(GtkWidget *widget, gpointer data)
 	theme_str = tdata->displayed;
 
 	tmp = g_path_get_basename(theme_str);
-
 	if (IS_SYSTEM_THEME(theme_str)) {
-		if (!superuser_p()) {
-			alertpanel_error(_("Only root can remove system themes"));
-			return;
-		}
 		alert_title = g_strdup_printf(_("Remove system theme '%s'"), tmp);
-	}
-	if (NULL == alert_title) {
+	} else {
 		alert_title = g_strdup_printf(_("Remove theme '%s'"), tmp);
 	}
-
 	g_free(tmp);
 
 	val = alertpanel(alert_title,
@@ -565,27 +558,30 @@ static void prefs_themes_btn_install_clicked_cb(GtkWidget *widget, gpointer data
 	alert_title = g_strdup_printf(_("Install theme '%s'"), themename);
 	if (file_exist(themeinfo, FALSE) == FALSE) {
 		val = alertpanel(alert_title,
-				 _("This folder doesn't seem to be a theme folder.\nInstall anyway?"),
-				 GTK_STOCK_NO, GTK_STOCK_YES, NULL, ALERTFOCUS_FIRST);
-		if (G_ALERTALTERNATE != val)
-			goto end_inst;
-	}
-	if (superuser_p ()) {
-		val = alertpanel(alert_title,
-				 _("Do you want to install theme for all users?"),
+				 _("This folder doesn't seem to be a theme"
+				   "folder.\nInstall anyway?"),
 				 GTK_STOCK_NO, GTK_STOCK_YES, NULL, ALERTFOCUS_FIRST);
-		switch (val) {
-		case G_ALERTALTERNATE:
-			cinfo->dest = stock_pixmap_get_system_theme_dir_for_theme(
-						themename);
-			break;
-		case G_ALERTDEFAULT:
-			break;
-		default:
+		if (G_ALERTALTERNATE != val) {
+			g_free(alert_title);
 			goto end_inst;
 		}
 	}
+
+	val = alertpanel(alert_title,
+			 _("Do you want to install theme for all users?"),
+			 GTK_STOCK_NO, GTK_STOCK_YES, NULL, ALERTFOCUS_FIRST);
 	g_free(alert_title);
+	switch (val) {
+	case G_ALERTALTERNATE:
+		cinfo->dest = stock_pixmap_get_system_theme_dir_for_theme(
+					themename);
+		break;
+	case G_ALERTDEFAULT:
+		break;
+	default:
+		goto end_inst;
+	}
+
 	if (cinfo->dest == NULL) {
 		cinfo->dest = g_strconcat(get_rc_dir(), G_DIR_SEPARATOR_S,
 					  PIXMAP_THEME_DIR, G_DIR_SEPARATOR_S,
@@ -593,13 +589,15 @@ static void prefs_themes_btn_install_clicked_cb(GtkWidget *widget, gpointer data
 	}
 	if (TRUE == is_dir_exist(cinfo->dest)) {
 		AlertValue val = alertpanel_full(_("Theme exists"),
-				_("A theme with the same name is\nalready installed in this location.\n\n"
+				_("A theme with the same name is\n"
+				  "already installed in this location.\n\n"
 				  "Do you want to replace it?"),
 				GTK_STOCK_CANCEL, _("Overwrite"), NULL, ALERTFOCUS_FIRST,
 				FALSE, NULL, ALERT_WARNING);
 		if (val == G_ALERTALTERNATE) {
 			if (remove_dir_recursive(cinfo->dest) < 0) {
-				alertpanel_error(_("Couldn't delete the old theme in %s."), cinfo->dest);
+				alertpanel_error(_("Couldn't delete the old theme in %s."),
+						 cinfo->dest);
 				goto end_inst;
 			}
 		} else {
@@ -607,7 +605,8 @@ static void prefs_themes_btn_install_clicked_cb(GtkWidget *widget, gpointer data
 		}
 	}
 	if (0 != make_dir_hier(cinfo->dest)) {
-		alertpanel_error(_("Couldn't create destination directory %s."), cinfo->dest);
+		alertpanel_error(_("Couldn't create destination directory %s."),
+				 cinfo->dest);
 		goto end_inst;
 	}
 	prefs_themes_foreach_file(source, prefs_themes_file_install, cinfo);
@@ -616,8 +615,8 @@ static void prefs_themes_btn_install_clicked_cb(GtkWidget *widget, gpointer data
 
 		/* update interface to show newly installed theme */
 		prefs_themes_get_themes_and_names(tdata);
-		insted = g_list_find_custom(tdata->themes, 
-					    (gpointer)(cinfo->dest), 
+		insted = g_list_find_custom(tdata->themes,
+					    (gpointer)(cinfo->dest),
 					    (GCompareFunc)strcmp2);
 		if (NULL != insted) {
 			alertpanel_notice(_("Theme installed successfully."));