[PATCH 2/2] Get rid of $GLADEPATH and $PIXMAPPATH.

Chris Lumens clumens at redhat.com
Wed May 29 14:38:19 UTC 2013


With how updates images are now constructed, we do not need these environment
variables.  They are simply included in the right place to begin with.
---
 anaconda                         |  3 ---
 widgets/src/MountpointSelector.c | 37 ++++---------------------------------
 2 files changed, 4 insertions(+), 36 deletions(-)

diff --git a/anaconda b/anaconda
index 875a23b..6f9d817 100755
--- a/anaconda
+++ b/anaconda
@@ -325,9 +325,6 @@ def setupEnvironment():
     if os.environ.has_key("LD_PRELOAD"):
         del os.environ["LD_PRELOAD"]
 
-    os.environ["GLADEPATH"] = "/tmp/updates/:/tmp/updates/data/ui/:ui/:/usr/share/anaconda/ui/:/usr/share/python-meh/"
-    os.environ["PIXMAPPATH"] = "/tmp/updates/pixmaps/:/tmp/updates/:/tmp/product/pixmaps/:/tmp/product/:pixmaps/:/usr/share/anaconda/pixmaps/:/usr/share/pixmaps/:/usr/share/anaconda/:/usr/share/python-meh/:/usr/share/icons/Fedora/48x48/apps/"
-
 def setupLoggingFromOpts(opts):
     if opts.loglevel and anaconda_log.logLevelMap.has_key(opts.loglevel):
         level = anaconda_log.logLevelMap[opts.loglevel]
diff --git a/widgets/src/MountpointSelector.c b/widgets/src/MountpointSelector.c
index 3c6e3c9..517d77e 100644
--- a/widgets/src/MountpointSelector.c
+++ b/widgets/src/MountpointSelector.c
@@ -142,31 +142,6 @@ GtkWidget *anaconda_mountpoint_selector_new() {
     return g_object_new(ANACONDA_TYPE_MOUNTPOINT_SELECTOR, NULL);
 }
 
-static gchar *find_pixmap(const gchar *file) {
-    const gchar *envvar;
-    gchar **paths, **iterator = NULL;
-
-    envvar = g_getenv("PIXMAPPATH");
-    if (!envvar)
-       envvar = g_strdup("/usr/share/anaconda/pixmaps");
-
-    paths = g_strsplit(envvar, ":", 0);
-    iterator = paths;
-
-    while (*iterator != NULL) {
-        gchar *path = g_strjoin("/", *iterator, file, NULL);
-
-        if (!g_access(path, R_OK))
-           return path;
-
-        g_free(path);
-        iterator++;
-    }
-
-    g_strfreev(paths);
-    return NULL;
-}
-
 static void format_mountpoint_label(AnacondaMountpointSelector *widget, const char *value) {
     char *markup;
 
@@ -192,8 +167,6 @@ static void format_name_label(AnacondaMountpointSelector *widget, const char *va
 }
 
 static void anaconda_mountpoint_selector_init(AnacondaMountpointSelector *mountpoint) {
-    gchar *pixmap_path;
-
     mountpoint->priv = G_TYPE_INSTANCE_GET_PRIVATE(mountpoint,
                                                    ANACONDA_TYPE_MOUNTPOINT_SELECTOR,
                                                    AnacondaMountpointSelectorPrivate);
@@ -215,14 +188,12 @@ static void anaconda_mountpoint_selector_init(AnacondaMountpointSelector *mountp
     gtk_grid_set_column_spacing(GTK_GRID(mountpoint->priv->grid), 12);
     gtk_widget_set_margin_left(GTK_WIDGET(mountpoint->priv->grid), 30);
 
-    /* Create the icon.  We don't need to check if find_pixmap returned NULL
-     * since gtk_image_new_from_file will just display a broken image icon in
-     * that case.  That's good enough error notification.
+    /* Create the icon.  We don't need to check if it returned NULL since
+     * gtk_image_new_from_file will just display a broken image icon in that
+     * case.  That's good enough error notification.
      */
-    pixmap_path = find_pixmap("right-arrow-icon.png");
-    mountpoint->priv->arrow = gtk_image_new_from_file(pixmap_path);
+    mountpoint->priv->arrow = gtk_image_new_from_file("/usr/share/anaconda/pixmaps/right-arrow-icon.png");
     gtk_widget_set_no_show_all(GTK_WIDGET(mountpoint->priv->arrow), TRUE);
-    g_free(pixmap_path);
 
     /* Set some properties. */
     mountpoint->priv->chosen = FALSE;
-- 
1.8.1.2



More information about the anaconda-patches mailing list