callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

More uses of g_strcmp0

Browse Source
This commit is contained in:
Javier Jardón 2010-03-16 19:16:31 +01:00 committed by Tristan Van Berkom
parent 7a6e782184
commit add084329c
2 changed files with 17 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gtk/gtkprinteroptionset.c
View File

@ -180,8 +180,7 @@ gtk_printer_option_set_foreach_in_group (GtkPrinterOptionSet *set,
{ {
option = g_ptr_array_index (set->array, i); option = g_ptr_array_index (set->array, i);
if (group == NULL || if (group == NULL || g_strcmp0 (group, option->group) == 0)
(option->group != NULL && strcmp (group, option->group) == 0))
func (option, user_data); func (option, user_data);
} }
} }

32
gtk/tests/filechooser.c
View File

@ -705,7 +705,7 @@ test_reload_sequence (gboolean set_folder_before_map)
wait_for_idle (); wait_for_idle ();
folder = gtk_file_chooser_get_current_folder (GTK_FILE_CHOOSER (dialog)); 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); g_free (folder);
} }
else else
@ -721,7 +721,7 @@ test_reload_sequence (gboolean set_folder_before_map)
wait_for_idle (); wait_for_idle ();
folder = gtk_file_chooser_get_current_folder (GTK_FILE_CHOOSER (dialog)); 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"); 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)); folder = gtk_file_chooser_get_current_folder (GTK_FILE_CHOOSER (dialog));
if (set_folder_before_map) 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 else
passed = passed && (folder != NULL && strcmp (folder, current_working_dir) == 0); passed = passed && (g_strcmp0 (folder, current_working_dir) == 0);
g_free (folder); 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)); folder = gtk_file_chooser_get_current_folder (GTK_FILE_CHOOSER (dialog));
if (set_folder_before_map) 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 else
passed = passed && (folder != NULL && strcmp (folder, current_working_dir) == 0); passed = passed && (g_strcmp0 (folder, current_working_dir) == 0);
g_free (folder); 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)); folder = gtk_file_chooser_get_current_folder (GTK_FILE_CHOOSER (dialog));
if (set_folder_before_map) 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 else
passed = passed && (folder != NULL && strcmp (folder, current_working_dir) == 0); passed = passed && (g_strcmp0 (folder, current_working_dir) == 0);
g_free (folder); 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)); folder = gtk_file_chooser_get_current_folder (GTK_FILE_CHOOSER (button));
if (must_have_cwd) if (must_have_cwd)
passed = passed && (folder != NULL && strcmp (folder, current_working_dir) == 0); passed = passed && (g_strcmp0 (folder, current_working_dir) == 0);
else 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", 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), 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)); folder = gtk_file_chooser_get_current_folder (GTK_FILE_CHOOSER (button));
if (must_have_cwd) if (must_have_cwd)
passed = passed && (folder != NULL && strcmp (folder, current_working_dir) == 0); passed = passed && (g_strcmp0 (folder, current_working_dir) == 0);
else 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", log_test (passed, "test_button_folder_states_for_action(): %s, use_dialog=%d, set_folder_on_dialog=%d, mapped, %s",
get_action_name (action), 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)); folder = gtk_file_chooser_get_current_folder (GTK_FILE_CHOOSER (button));
if (must_have_cwd) if (must_have_cwd)
passed = passed && (folder != NULL && strcmp (folder, current_working_dir) == 0); passed = passed && (g_strcmp0 (folder, current_working_dir) == 0);
else 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", log_test (passed, "test_button_folder_states_for_action(): %s, use_dialog=%d, set_folder_on_dialog=%d, unmapped, %s",
get_action_name (action), 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)); folder = gtk_file_chooser_get_current_folder (GTK_FILE_CHOOSER (button));
if (must_have_cwd) if (must_have_cwd)
passed = passed && (folder != NULL && strcmp (folder, current_working_dir) == 0); passed = passed && (g_strcmp0 (folder, current_working_dir) == 0);
else 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 (); wait_for_idle ();
log_test (passed, "test_button_folder_states_for_action(): %s, use_dialog=%d, set_folder_on_dialog=%d, re-mapped, %s", 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), get_action_name (action),