move install.[ch] to theme.[ch]

diff --git a/Makefile.am b/Makefile.am
index add3e1882141900dde852d8d01a512fbc0c22789..e553d3723b168983b6804b36a6f9df3721b6b393 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -38,8 +38,8 @@ src_obconf_SOURCES = \
        src/main.h \
        src/handlers.c \
        src/handlers.h \
-       src/install.c \
-       src/install.h \
+       src/theme.c \
+       src/theme.h \
        src/tree.c \
        src/tree.h
 

diff --git a/src/handlers.c b/src/handlers.c
index 33a0f930f8f17b0f5bfbee1e06f8db19ad889cf1..e48a7d84e0014254c268c46da8016e7ac1e495b3 100644 (file)
--- a/src/handlers.c
+++ b/src/handlers.c
@@ -19,7 +19,7 @@
 
 #include "main.h"
 #include "tree.h"
-#include "install.h"
+#include "theme.h"
 #include "gettext.h"
 #include "openbox/render.h"
 

diff --git a/src/install.c b/src/theme.c
similarity index 98%
rename from src/install.c
rename to src/theme.c
index 3b6af76e0392e768edbdede2bf9e3b44a45d127c..4cde0d7814f612ddf6eca7a0c98a96c95481ca5f 100644 (file)
--- a/src/install.c
+++ b/src/theme.c
@@ -1,4 +1,4 @@
-#include "install.h"
+#include "theme.h"
 #include "main.h"
 #include "gettext.h"
 
@@ -39,6 +39,31 @@ tartype_t funcs = {
     (writefunc_t) gzwrite_frontend
 };
 
+gboolean theme_install(gchar *path, gchar *theme)
+{
+    gchar *dest;
+    gchar *curdir;
+
+    if (!(dest = get_theme_dir()))
+        return FALSE;
+
+    curdir = g_get_current_dir();
+    if (!change_dir(dest)) {
+        g_free(curdir);
+        return FALSE;
+    }
+
+    if (install_theme_to(theme, path, dest))
+        gtk_msg(GTK_MESSAGE_INFO, _("%s was installed to %s"), theme, dest);
+
+    g_free(dest);
+
+    change_dir(curdir);
+    g_free(curdir);
+
+    return TRUE;
+}
+
 static gchar *get_theme_dir()
 {
     gchar *dir;
@@ -94,31 +119,6 @@ static gboolean install_theme_to(gchar *theme, gchar *file, gchar *to)
     return r == 0;
 }
 
-gboolean install_theme(gchar *path, gchar *theme)
-{
-    gchar *dest;
-    gchar *curdir;
-
-    if (!(dest = get_theme_dir()))
-        return FALSE;
-
-    curdir = g_get_current_dir();
-    if (!change_dir(dest)) {
-        g_free(curdir);
-        return FALSE;
-    }
-
-    if (install_theme_to(theme, path, dest))
-        gtk_msg(GTK_MESSAGE_INFO, _("%s was installed to %s"), theme, dest);
-
-    g_free(dest);
-
-    change_dir(curdir);
-    g_free(curdir);
-
-    return TRUE;
-}
-
 static int gzopen_frontend(const char *path, int oflags, int mode)
 {
     int fd;

diff --git a/src/install.h b/src/theme.h
similarity index 57%
rename from src/install.h
rename to src/theme.h
index 215bd341bd363c470b59b602d9dfa8e921ceaa4e..e02eb6af30567556f89a5abbdf5d98902cc281a1 100644 (file)
--- a/src/install.h
+++ b/src/theme.h
@@ -3,6 +3,6 @@
 
 #include <glib.h>
 
-gboolean install_theme(gchar *path, gchar *theme);
+gboolean theme_install(gchar *path, gchar *theme);
 
 #endif