Commit d788acc0 authored by Yongha Hwang's avatar Yongha Hwang
Browse files

Use xfce-string functions

Related: libxfce4util!24, #82
parent 32b89d0c
Pipeline #13313 passed with stages
in 2 minutes and 53 seconds
......@@ -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])
......
......@@ -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>
......
......@@ -22,6 +22,7 @@
#endif
#include <exo-desktop-item-edit/exo-die-command-model.h>
#include <libxfce4util/libxfce4util.h>
......
......@@ -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)));
......
......@@ -22,6 +22,7 @@
#endif
#include <exo-desktop-item-edit/exo-die-enum-types.h>
#include <libxfce4util/libxfce4util.h>
......
......@@ -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))
......
......@@ -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>
......
......@@ -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
......
......@@ -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
......
......@@ -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);
......
......@@ -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
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment