2 files changed, 24 insertions(+), 24 deletions(-)

M src/config.c
M src/config.h

@@ 8,11 8,11 @@
 #endif
 
 #define CONFIG_GROUP_GENERAL "General"
-#define CONFIG_KEY_TERMINAL_SOURCE "Terminal Source"
+#define CONFIG_KEY_TERMINAL_PROVIDER "Terminal Provider"
 #define CONFIG_KEY_TERMINAL "Terminal"
 
 struct config {
-    terminal_source_t term_source;
+    terminal_provider_t term_provider;
     char *terminal;
 };
 


@@ 32,22 32,22 @@ config_t *config_open()
 
     config_t *config = calloc(1, sizeof(config_t));
 
-    char *tsource = g_key_file_get_value(key_file, CONFIG_GROUP_GENERAL, CONFIG_KEY_TERMINAL_SOURCE, NULL);
+    char *tprovider = g_key_file_get_value(key_file, CONFIG_GROUP_GENERAL, CONFIG_KEY_TERMINAL_PROVIDER, NULL);
 
-    if (!tsource) {
-        config->term_source = TERMINAL_SOURCE_INTERNAL;
-    } else if (strcmp(tsource, "Internal") == 0) {
-        config->term_source = TERMINAL_SOURCE_INTERNAL;
-    } else if (strcmp(tsource, "KDE") == 0) {
+    if (!tprovider) {
+        config->term_provider = TERMINAL_PROVIDER_INTERNAL;
+    } else if (strcmp(tprovider, "Internal") == 0) {
+        config->term_provider = TERMINAL_PROVIDER_INTERNAL;
+    } else if (strcmp(tprovider, "KDE") == 0) {
 #ifdef WITH_KDE
-        config->term_source = TERMINAL_SOURCE_KDE;
+        config->term_provider = TERMINAL_PROVIDER_KDE;
 #else
-        fprintf(stderr, "invalid setting for %s: %s, desktoputils not compiled with KDE support; assuming Internal\n", CONFIG_KEY_TERMINAL_SOURCE, tsource);
-        config->term_source = TERMINAL_SOURCE_INTERNAL;
+        fprintf(stderr, "invalid setting for %s: %s, desktoputils not compiled with KDE support; assuming Internal\n", CONFIG_KEY_TERMINAL_PROVIDER, tprovider);
+        config->term_provider = TERMINAL_PROVIDER_INTERNAL;
 #endif
     } else {
-        fprintf(stderr, "invalid setting for %s: %s, assuming Internal\n", CONFIG_KEY_TERMINAL_SOURCE, tsource);
-        config->term_source = TERMINAL_SOURCE_INTERNAL;
+        fprintf(stderr, "invalid setting for %s: %s, assuming Internal\n", CONFIG_KEY_TERMINAL_PROVIDER, tprovider);
+        config->term_provider = TERMINAL_PROVIDER_INTERNAL;
     }
 
     config->terminal = g_key_file_get_string(key_file, CONFIG_GROUP_GENERAL, CONFIG_KEY_TERMINAL, NULL);


@@ 56,14 56,14 @@ config_t *config_open()
         config->terminal = strdup("xterm");
     }
 
-    free(tsource);
+    free(tprovider);
 
     return config;
 }
 
-terminal_source_t config_terminal_source(config_t *config)
+terminal_provider_t config_terminal_provider(config_t *config)
 {
-    return config->term_source;
+    return config->term_provider;
 }
 
 const char *config_terminal(config_t *config)


@@ 73,12 73,12 @@ const char *config_terminal(config_t *config)
 
 const char *config_actual_terminal(config_t *config)
 {
-    switch (config->term_source) {
-    case TERMINAL_SOURCE_INTERNAL:
+    switch (config->term_provider) {
+    case TERMINAL_PROVIDER_INTERNAL:
         return config->terminal;
         break;
 #ifdef WITH_KDE
-    case TERMINAL_SOURCE_KDE:
+    case TERMINAL_PROVIDER_KDE:
         return kde_selected_terminal();
         break;
 #endif

@@ 3,14 3,14 @@
 
 typedef struct config config_t;
 
-typedef enum terminal_source {
-    TERMINAL_SOURCE_INTERNAL,
-    TERMINAL_SOURCE_KDE,
-} terminal_source_t;
+typedef enum terminal_provider {
+    TERMINAL_PROVIDER_INTERNAL,
+    TERMINAL_PROVIDER_KDE,
+} terminal_provider_t;
 
 config_t *config_open();
 
-terminal_source_t config_terminal_source(config_t *config);
+terminal_provider_t config_terminal_provider(config_t *config);
 
 const char *config_terminal(config_t *config);