Merging upstream version 4.4.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 7 insertions, 7 deletions

diff --git a/ui/persfilepath_opt.c b/ui/persfilepath_opt.c
index feaeb74b..ee0d420f 100644
--- a/ui/persfilepath_opt.c
+++ b/ui/persfilepath_opt.c
@@ -24,14 +24,14 @@
  * process command line option that affects the paths of the directories
  * used for personal files (configuration, saved captures)
  */
-gboolean
+bool
 persfilepath_opt(int opt _U_, const char *optstr)
 {
-    gchar *p, *colonp;
+    char *p, *colonp;
 
     colonp = strchr(optstr, ':');
     if (colonp == NULL) {
-        return FALSE;
+        return false;
     }
 
     p = colonp;
@@ -51,7 +51,7 @@ persfilepath_opt(int opt _U_, const char *optstr)
          * looks correct.
          */
         *colonp = ':';
-        return FALSE;
+        return false;
     }
 
     /* directory should be existing */
@@ -63,7 +63,7 @@ persfilepath_opt(int opt _U_, const char *optstr)
          * looks correct.
          */
         *colonp = ':';
-        return FALSE;
+        return false;
     }
 
     if (strcmp(optstr,"persconf") == 0) {
@@ -72,8 +72,8 @@ persfilepath_opt(int opt _U_, const char *optstr)
         set_persdatafile_dir(p);
     } else {
         /* XXX - might need to add the temp file path */
-        return FALSE;
+        return false;
     }
     *colonp = ':'; /* put the colon back */
-    return TRUE;
+    return true;
 }