[nautilus] all: use g_strcmp0 instead of eel_str_is_empty()
- From: Cosimo Cecchi <cosimoc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [nautilus] all: use g_strcmp0 instead of eel_str_is_empty()
- Date: Wed, 11 Apr 2012 16:16:24 +0000 (UTC)
commit 3032b3c30cc564fed55ed1bee2cb861bf6497666
Author: Cosimo Cecchi <cosimoc gnome org>
Date: Wed Apr 11 11:34:20 2012 -0400
all: use g_strcmp0 instead of eel_str_is_empty()
libnautilus-private/nautilus-file.c | 6 +++---
src/nautilus-view-dnd.c | 4 ++--
2 files changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/libnautilus-private/nautilus-file.c b/libnautilus-private/nautilus-file.c
index 212cbe1..1341f02 100644
--- a/libnautilus-private/nautilus-file.c
+++ b/libnautilus-private/nautilus-file.c
@@ -5183,7 +5183,7 @@ get_real_name (const char *name, const char *gecos)
}
- if (eel_str_is_empty (real_name)
+ if (g_strcmp0 (real_name, NULL) == 0
|| g_strcmp0 (name, real_name) == 0
|| g_strcmp0 (capitalized_login_name, real_name) == 0) {
g_free (real_name);
@@ -6277,7 +6277,7 @@ get_description (NautilusFile *file)
g_assert (NAUTILUS_IS_FILE (file));
mime_type = eel_ref_str_peek (file->details->mime_type);
- if (eel_str_is_empty (mime_type)) {
+ if (g_strcmp0 (mime_type, NULL) == 0) {
return NULL;
}
@@ -6287,7 +6287,7 @@ get_description (NautilusFile *file)
}
description = g_content_type_get_description (mime_type);
- if (!eel_str_is_empty (description)) {
+ if (g_strcmp0 (description, NULL) != 0) {
return description;
}
diff --git a/src/nautilus-view-dnd.c b/src/nautilus-view-dnd.c
index 83b3176..eb5080d 100644
--- a/src/nautilus-view-dnd.c
+++ b/src/nautilus-view-dnd.c
@@ -210,13 +210,13 @@ nautilus_view_handle_netscape_url_drop (NautilusView *view,
}
if (action == GDK_ACTION_LINK) {
- if (eel_str_is_empty (title)) {
+ if (g_strcmp0 (title, NULL) == 0) {
link_name = g_file_get_basename (f);
} else {
link_name = g_strdup (title);
}
- if (!eel_str_is_empty (link_name)) {
+ if (g_strcmp0 (link_name, NULL) != 0) {
NetscapeUrlDropLink *data;
data = g_slice_new0 (NetscapeUrlDropLink);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]