Use xfce-string functions

Related: libxfce4util!24, exo#82

11 files changed, 23 insertions, 17 deletions

diff --git a/configure.ac.in b/configure.ac.in
index b248d9c..99d42df 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -162,7 +162,7 @@ XDT_CHECK_PACKAGE([GLIB], [glib-2.0], [2.50.0])
 XDT_CHECK_PACKAGE([GIO], [gio-2.0], [2.50.0])
 XDT_CHECK_PACKAGE([GTK], [gtk+-3.0], [3.22.0])
 XDT_CHECK_PACKAGE([GTHREAD], [gthread-2.0], [2.50.0])
-XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.17.0])
+XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.17.2])
 XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-2], [4.15.1])
 XDT_CHECK_OPTIONAL_PACKAGE([GIO_UNIX], [gio-unix-2.0], [2.50.0], [gio-unix], [GIO-Unix features])
 
diff --git a/exo-desktop-item-edit/exo-die-command-entry.c b/exo-desktop-item-edit/exo-die-command-entry.c
index 6a11319..c6a5f92 100644
--- a/exo-desktop-item-edit/exo-die-command-entry.c
+++ b/exo-desktop-item-edit/exo-die-command-entry.c
@@ -30,6 +30,7 @@
 
 #include <exo-desktop-item-edit/exo-die-command-entry.h>
 #include <exo-desktop-item-edit/exo-die-command-model.h>
+#include <libxfce4util/libxfce4util.h>
 
 
 
diff --git a/exo-desktop-item-edit/exo-die-command-model.c b/exo-desktop-item-edit/exo-die-command-model.c
index 9558d78..f354076 100644
--- a/exo-desktop-item-edit/exo-die-command-model.c
+++ b/exo-desktop-item-edit/exo-die-command-model.c
@@ -22,6 +22,7 @@
 #endif
 
 #include <exo-desktop-item-edit/exo-die-command-model.h>
+#include <libxfce4util/libxfce4util.h>
 
 
 
diff --git a/exo-desktop-item-edit/exo-die-editor.c b/exo-desktop-item-edit/exo-die-editor.c
index 9be14fa..6b4c3fe 100644
--- a/exo-desktop-item-edit/exo-die-editor.c
+++ b/exo-desktop-item-edit/exo-die-editor.c
@@ -24,6 +24,7 @@
 #include <exo-desktop-item-edit/exo-die-command-entry.h>
 #include <exo-desktop-item-edit/exo-die-desktop-model.h>
 #include <exo-desktop-item-edit/exo-die-editor.h>
+#include <libxfce4util/libxfce4util.h>
 
 
 
@@ -626,7 +627,7 @@ exo_die_editor_icon_clicked (GtkWidget    *button,
   gtk_dialog_set_default_response (GTK_DIALOG (chooser), GTK_RESPONSE_ACCEPT);
 
   /* check if we have an icon to set for the chooser */
-  if (G_LIKELY (!exo_str_is_empty (editor->icon)))
+  if (G_LIKELY (!xfce_str_is_empty (editor->icon)))
     exo_icon_chooser_dialog_set_icon (EXO_ICON_CHOOSER_DIALOG (chooser), editor->icon);
 
   /* run the chooser dialog */
@@ -670,7 +671,7 @@ exo_die_editor_path_clicked (GtkWidget    *button,
   gtk_dialog_set_default_response (GTK_DIALOG (chooser), GTK_RESPONSE_ACCEPT);
 
   /* check if we have a path to set for the chooser */
-  if (G_LIKELY (!exo_str_is_empty (editor->path)))
+  if (G_LIKELY (!xfce_str_is_empty (editor->path)))
     gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (chooser), editor->path);
 
   /* run the chooser dialog */
@@ -760,7 +761,7 @@ exo_die_editor_cell_data_func (GtkCellLayout   *cell_layout,
       /* try to load the icon from the file */
       pixbuf = gdk_pixbuf_new_from_file (icon, NULL);
     }
-  else if (!exo_str_is_empty (icon))
+  else if (!xfce_str_is_empty (icon))
     {
       /* determine the appropriate icon theme */
       icon_theme = gtk_icon_theme_get_for_screen (gtk_widget_get_screen (GTK_WIDGET (editor)));
@@ -828,15 +829,15 @@ exo_die_editor_get_complete (ExoDieEditor *editor)
   switch (editor->mode)
     {
     case EXO_DIE_EDITOR_MODE_APPLICATION:
-      return (!exo_str_is_empty (editor->name)
-              && !exo_str_is_empty (editor->command));
+      return (!xfce_str_is_empty (editor->name)
+              && !xfce_str_is_empty (editor->command));
 
     case EXO_DIE_EDITOR_MODE_LINK:
-      return (!exo_str_is_empty (editor->name)
-              && !exo_str_is_empty (editor->url));
+      return (!xfce_str_is_empty (editor->name)
+              && !xfce_str_is_empty (editor->url));
 
     case EXO_DIE_EDITOR_MODE_DIRECTORY:
-      return !exo_str_is_empty (editor->name);
+      return !xfce_str_is_empty (editor->name);
 
     default:
       g_assert_not_reached ();
@@ -1220,7 +1221,7 @@ exo_die_editor_set_icon (ExoDieEditor *editor,
           /* try to load the icon from the file */
           pixbuf = gdk_pixbuf_new_from_file (icon, NULL);
         }
-      else if (!exo_str_is_empty (icon))
+      else if (!xfce_str_is_empty (icon))
         {
           /* determine the appropriate icon theme */
           icon_theme = gtk_icon_theme_get_for_screen (gtk_widget_get_screen (GTK_WIDGET (editor)));
diff --git a/exo-desktop-item-edit/exo-die-enum-types.c b/exo-desktop-item-edit/exo-die-enum-types.c
index b5ecc2d..691ac33 100644
--- a/exo-desktop-item-edit/exo-die-enum-types.c
+++ b/exo-desktop-item-edit/exo-die-enum-types.c
@@ -22,6 +22,7 @@
 #endif
 
 #include <exo-desktop-item-edit/exo-die-enum-types.h>
+#include <libxfce4util/libxfce4util.h>
 
 
 
diff --git a/exo/exo-icon-chooser-dialog.c b/exo/exo-icon-chooser-dialog.c
index aae3054..2c2efec 100644
--- a/exo/exo-icon-chooser-dialog.c
+++ b/exo/exo-icon-chooser-dialog.c
@@ -41,6 +41,7 @@
 #include <exo/exo-string.h>
 #include <exo/exo-private.h>
 #include <exo/exo-alias.h>
+#include <libxfce4util/libxfce4util.h>
 
 #define FILTER_ENTRY_DELAY 300
 
@@ -550,7 +551,7 @@ exo_icon_chooser_dialog_entry_changed (gpointer user_data)
   priv->casefolded_text = NULL;
 
   text = gtk_entry_get_text (GTK_ENTRY (priv->filter_entry));
-  if (!exo_str_is_empty (text))
+  if (!xfce_str_is_empty (text))
     {
       /* case fold the search string */
       normalized = g_utf8_normalize (text, -1, G_NORMALIZE_ALL);
@@ -560,7 +561,7 @@ exo_icon_chooser_dialog_entry_changed (gpointer user_data)
 
   gtk_entry_set_icon_sensitive (GTK_ENTRY (priv->filter_entry),
                                 GTK_ENTRY_ICON_SECONDARY,
-                                !exo_str_is_empty (text));
+                                !xfce_str_is_empty (text));
 
   model = exo_icon_view_get_model (EXO_ICON_VIEW (priv->icon_chooser));
   if (G_LIKELY (model != NULL))
diff --git a/exo/exo-icon-chooser-model.c b/exo/exo-icon-chooser-model.c
index dc9e92b..4f021bb 100644
--- a/exo/exo-icon-chooser-model.c
+++ b/exo/exo-icon-chooser-model.c
@@ -30,8 +30,8 @@
 
 #include <exo/exo-icon-chooser-model.h>
 #include <exo/exo-private.h>
-#include <exo/exo-string.h>
 #include <exo/exo-alias.h>
+#include <libxfce4util/libxfce4util.h>
 
 
 
diff --git a/exo/exo-icon-view.c b/exo/exo-icon-view.c
index 6d786ea..edbaf8f 100644
--- a/exo/exo-icon-view.c
+++ b/exo/exo-icon-view.c
@@ -46,8 +46,8 @@
 #include <exo/exo-cell-renderer-icon.h>
 #include <exo/exo-marshal.h>
 #include <exo/exo-private.h>
-#include <exo/exo-string.h>
 #include <exo/exo-alias.h>
+#include <libxfce4util/libxfce4util.h>
 
 /**
  * SECTION: exo-icon-view
diff --git a/exo/exo-job.c b/exo/exo-job.c
index 162ca40..ea1841f 100644
--- a/exo/exo-job.c
+++ b/exo/exo-job.c
@@ -30,8 +30,8 @@
 #include <exo/exo-config.h>
 #include <exo/exo-job.h>
 #include <exo/exo-private.h>
-#include <exo/exo-string.h>
 #include <exo/exo-alias.h>
+#include <libxfce4util/libxfce4util.h>
 
 /**
  * SECTION: exo-job
diff --git a/exo/exo-thumbnail-preview.c b/exo/exo-thumbnail-preview.c
index 77eb506..93f2506 100644
--- a/exo/exo-thumbnail-preview.c
+++ b/exo/exo-thumbnail-preview.c
@@ -42,6 +42,7 @@
 #include <exo/exo-utils.h>
 #include <exo/exo-alias.h>
 #include <exo/exo-string.h>
+#include <libxfce4util/libxfce4util.h>
 
 
 
@@ -327,7 +328,7 @@ _exo_thumbnail_preview_set_uri (ExoThumbnailPreview *thumbnail_preview,
         {
           /* determine the basename from the URI */
           slash = strrchr (uri, '/');
-          if (G_LIKELY (!exo_str_is_empty (slash)))
+          if (G_LIKELY (!xfce_str_is_empty (slash)))
             displayname = g_filename_display_name (slash + 1);
           else
             displayname = g_filename_display_name (uri);
diff --git a/exo/exo-tree-view.c b/exo/exo-tree-view.c
index 4ed61b5..918ad0b 100644
--- a/exo/exo-tree-view.c
+++ b/exo/exo-tree-view.c
@@ -23,10 +23,10 @@
 
 #include <exo/exo-config.h>
 #include <exo/exo-private.h>
-#include <exo/exo-string.h>
 #include <exo/exo-tree-view.h>
 #include <exo/exo-utils.h>
 #include <exo/exo-alias.h>
+#include <libxfce4util/libxfce4util.h>
 
 /**
  * SECTION: exo-tree-view