[gtk+] More uses of g_strcmp0
- From: Javier Jardón <jjardon src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+] More uses of g_strcmp0
- Date: Tue, 16 Mar 2010 18:30:45 +0000 (UTC)
commit 14c9a3a596040048e0d869e830253322f4b1f11f
Author: Javier Jardón <jjardon gnome org>
Date: Tue Mar 16 19:16:31 2010 +0100
More uses of g_strcmp0
gtk/gtkprinteroptionset.c | 3 +--
gtk/tests/filechooser.c | 32 ++++++++++++++++----------------
2 files changed, 17 insertions(+), 18 deletions(-)
---
diff --git a/gtk/gtkprinteroptionset.c b/gtk/gtkprinteroptionset.c
index dde9d5b..5a30c72 100644
--- a/gtk/gtkprinteroptionset.c
+++ b/gtk/gtkprinteroptionset.c
@@ -180,8 +180,7 @@ gtk_printer_option_set_foreach_in_group (GtkPrinterOptionSet *set,
{
option = g_ptr_array_index (set->array, i);
- if (group == NULL ||
- (option->group != NULL && strcmp (group, option->group) == 0))
+ if (group == NULL || g_strcmp0 (group, option->group) == 0)
func (option, user_data);
}
}
diff --git a/gtk/tests/filechooser.c b/gtk/tests/filechooser.c
index dd5988f..c1811f3 100644
--- a/gtk/tests/filechooser.c
+++ b/gtk/tests/filechooser.c
@@ -705,7 +705,7 @@ test_reload_sequence (gboolean set_folder_before_map)
wait_for_idle ();
folder = gtk_file_chooser_get_current_folder (GTK_FILE_CHOOSER (dialog));
- passed = passed && (folder != NULL && strcmp (folder, g_get_home_dir()) == 0);
+ passed = passed && (g_strcmp0 (folder, g_get_home_dir()) == 0);
g_free (folder);
}
else
@@ -721,7 +721,7 @@ test_reload_sequence (gboolean set_folder_before_map)
wait_for_idle ();
folder = gtk_file_chooser_get_current_folder (GTK_FILE_CHOOSER (dialog));
- passed = passed && (folder != NULL && strcmp (folder, current_working_dir) == 0);
+ passed = passed && (g_strcmp0 (folder, current_working_dir) == 0);
}
log_test (passed, "test_reload_sequence(): initial status");
@@ -743,9 +743,9 @@ test_reload_sequence (gboolean set_folder_before_map)
folder = gtk_file_chooser_get_current_folder (GTK_FILE_CHOOSER (dialog));
if (set_folder_before_map)
- passed = passed && (folder != NULL && strcmp (folder, g_get_home_dir()) == 0);
+ passed = passed && (g_strcmp0 (folder, g_get_home_dir()) == 0);
else
- passed = passed && (folder != NULL && strcmp (folder, current_working_dir) == 0);
+ passed = passed && (g_strcmp0 (folder, current_working_dir) == 0);
g_free (folder);
@@ -768,9 +768,9 @@ test_reload_sequence (gboolean set_folder_before_map)
folder = gtk_file_chooser_get_current_folder (GTK_FILE_CHOOSER (dialog));
if (set_folder_before_map)
- passed = passed && (folder != NULL && strcmp (folder, g_get_home_dir()) == 0);
+ passed = passed && (g_strcmp0 (folder, g_get_home_dir()) == 0);
else
- passed = passed && (folder != NULL && strcmp (folder, current_working_dir) == 0);
+ passed = passed && (g_strcmp0 (folder, current_working_dir) == 0);
g_free (folder);
@@ -793,9 +793,9 @@ test_reload_sequence (gboolean set_folder_before_map)
folder = gtk_file_chooser_get_current_folder (GTK_FILE_CHOOSER (dialog));
if (set_folder_before_map)
- passed = passed && (folder != NULL && strcmp (folder, g_get_home_dir()) == 0);
+ passed = passed && (g_strcmp0 (folder, g_get_home_dir()) == 0);
else
- passed = passed && (folder != NULL && strcmp (folder, current_working_dir) == 0);
+ passed = passed && (g_strcmp0 (folder, current_working_dir) == 0);
g_free (folder);
@@ -863,9 +863,9 @@ test_button_folder_states_for_action (GtkFileChooserAction action, gboolean use_
folder = gtk_file_chooser_get_current_folder (GTK_FILE_CHOOSER (button));
if (must_have_cwd)
- passed = passed && (folder != NULL && strcmp (folder, current_working_dir) == 0);
+ passed = passed && (g_strcmp0 (folder, current_working_dir) == 0);
else
- passed = passed && (folder != NULL && strcmp (folder, g_get_home_dir()) == 0);
+ passed = passed && (g_strcmp0 (folder, g_get_home_dir()) == 0);
log_test (passed, "test_button_folder_states_for_action(): %s, use_dialog=%d, set_folder_on_dialog=%d, pre-map, %s",
get_action_name (action),
@@ -883,9 +883,9 @@ test_button_folder_states_for_action (GtkFileChooserAction action, gboolean use_
folder = gtk_file_chooser_get_current_folder (GTK_FILE_CHOOSER (button));
if (must_have_cwd)
- passed = passed && (folder != NULL && strcmp (folder, current_working_dir) == 0);
+ passed = passed && (g_strcmp0 (folder, current_working_dir) == 0);
else
- passed = passed && (folder != NULL && strcmp (folder, g_get_home_dir()) == 0);
+ passed = passed && (g_strcmp0 (folder, g_get_home_dir()) == 0);
log_test (passed, "test_button_folder_states_for_action(): %s, use_dialog=%d, set_folder_on_dialog=%d, mapped, %s",
get_action_name (action),
@@ -901,9 +901,9 @@ test_button_folder_states_for_action (GtkFileChooserAction action, gboolean use_
folder = gtk_file_chooser_get_current_folder (GTK_FILE_CHOOSER (button));
if (must_have_cwd)
- passed = passed && (folder != NULL && strcmp (folder, current_working_dir) == 0);
+ passed = passed && (g_strcmp0 (folder, current_working_dir) == 0);
else
- passed = passed && (folder != NULL && strcmp (folder, g_get_home_dir()) == 0);
+ passed = passed && (g_strcmp0 (folder, g_get_home_dir()) == 0);
log_test (passed, "test_button_folder_states_for_action(): %s, use_dialog=%d, set_folder_on_dialog=%d, unmapped, %s",
get_action_name (action),
@@ -918,9 +918,9 @@ test_button_folder_states_for_action (GtkFileChooserAction action, gboolean use_
folder = gtk_file_chooser_get_current_folder (GTK_FILE_CHOOSER (button));
if (must_have_cwd)
- passed = passed && (folder != NULL && strcmp (folder, current_working_dir) == 0);
+ passed = passed && (g_strcmp0 (folder, current_working_dir) == 0);
else
- passed = passed && (folder != NULL && strcmp (folder, g_get_home_dir()) == 0);
+ passed = passed && (g_strcmp0 (folder, g_get_home_dir()) == 0);
wait_for_idle ();
log_test (passed, "test_button_folder_states_for_action(): %s, use_dialog=%d, set_folder_on_dialog=%d, re-mapped, %s",
get_action_name (action),
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]