kwo pushed a commit to branch master.

http://git.enlightenment.org/e16/e16.git/commit/?id=cefd067f7d2fca685f5b886c28d77086f0bccbeb

commit cefd067f7d2fca685f5b886c28d77086f0bccbeb
Author: Kim Woelders <k...@woelders.dk>
Date:   Sun Jan 21 16:02:36 2018 +0100

    Swap ThemeFind() and ThemePathFind() names
    
    Seems more reasonable.
---
 src/E.h     | 4 ++--
 src/main.c  | 4 ++--
 src/sound.c | 4 ++--
 src/theme.c | 8 ++++----
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/E.h b/src/E.h
index 5c64cfe2..96f73442 100644
--- a/src/E.h
+++ b/src/E.h
@@ -549,9 +549,9 @@ void                StartupWindowsOpen(void);
 void                StartupBackgroundsDestroy(void);
 
 /* theme.c */
-char               *ThemeFind(const char *theme);
+char               *ThemePathFind(const char *theme);
 char               *ThemePathName(const char *path);
-void                ThemePathFind(void);
+void                ThemeFind(void);
 char              **ThemesList(int *num);
 
 /*
diff --git a/src/main.c b/src/main.c
index f4326d34..5921ee61 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2000-2007 Carsten Haitzler, Geoff Harrison and various 
contributors
- * Copyright (C) 2004-2015 Kim Woelders
+ * Copyright (C) 2004-2018 Kim Woelders
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -240,7 +240,7 @@ main(int argc, char **argv)
    LangInit();
 
    /* The theme path must now be available for config file loading. */
-   ThemePathFind();
+   ThemeFind();
 
    /* Set the Environment variables */
    Esetenv("EVERSION", e_wm_version);
diff --git a/src/sound.c b/src/sound.c
index ea506e21..ec28a9b0 100644
--- a/src/sound.c
+++ b/src/sound.c
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2000-2007 Carsten Haitzler, Geoff Harrison and various 
contributors
- * Copyright (C) 2004-2014 Kim Woelders
+ * Copyright (C) 2004-2018 Kim Woelders
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -374,7 +374,7 @@ _SoundConfigLoad(void)
 
    Efree(Mode_sound.theme_path);
    if (Conf_sound.theme)
-      Mode_sound.theme_path = ThemeFind(Conf_sound.theme);
+      Mode_sound.theme_path = ThemePathFind(Conf_sound.theme);
    else
       Mode_sound.theme_path = NULL;
 
diff --git a/src/theme.c b/src/theme.c
index 4aac0eb5..110314fc 100644
--- a/src/theme.c
+++ b/src/theme.c
@@ -269,7 +269,7 @@ _ThemeExtract(const char *path)
 }
 
 char               *
-ThemeFind(const char *theme)
+ThemePathFind(const char *theme)
 {
    static const char  *const default_themes[] = {
       "DEFAULT", "winter", "BrushedMetal-Tigert", "ShinyMetal", NULL
@@ -337,7 +337,7 @@ ThemeFind(const char *theme)
 }
 
 void
-ThemePathFind(void)
+ThemeFind(void)
 {
    char               *name, *path, *s;
 
@@ -354,7 +354,7 @@ ThemePathFind(void)
        Mode.theme.variant = Estrdup(s);
      }
 
-   path = ThemeFind(name);
+   path = ThemePathFind(name);
 
    if (!path && (!name || strcmp(name, "-")))
      {
@@ -456,7 +456,7 @@ ThemesIpc(const char *params)
 
        IpcPrintf("Name: %s\n", (Conf.theme.name) ? Conf.theme.name : "-");
        IpcPrintf("Full: %s\n", Mode.theme.path);
-       path = ThemeFind(NULL);
+       path = ThemePathFind(NULL);
        IpcPrintf("Default: %s\n", path);
        Efree(path);
        IpcPrintf("Path: %s\n", Mode.theme.paths);

-- 


Reply via email to