[gnome-utils] [gsearchtool] MAINTAINER_CFLAGS
- From: Dennis Cranston <dcransto src gnome org>
- To: svn-commits-list gnome org
- Subject: [gnome-utils] [gsearchtool] MAINTAINER_CFLAGS
- Date: Sun, 17 May 2009 14:58:04 -0400 (EDT)
commit 0ff045cbe124c9620ed88ef3b964e92765f3e6d4
Author: Dennis Cranston <Dennis_Cranston yahoo com>
Date: Sun May 17 11:56:16 2009 -0700
[gsearchtool] MAINTAINER_CFLAGS
Fix the build when using MAINTAINER_CFLAGS in Makefile.
---
gsearchtool/ChangeLog | 6 ++
gsearchtool/gsearchtool-callbacks.c | 97 +++++++++++++++++------------------
gsearchtool/gsearchtool-support.c | 4 --
gsearchtool/gsearchtool.c | 46 ++++++++--------
4 files changed, 77 insertions(+), 76 deletions(-)
diff --git a/gsearchtool/ChangeLog b/gsearchtool/ChangeLog
index 0cccdbf..47a3d4e 100644
--- a/gsearchtool/ChangeLog
+++ b/gsearchtool/ChangeLog
@@ -1,5 +1,11 @@
2009-05-17 Dennis Cranston <dennis_cranston yahoo com>
+ * gsearchtool-callbacks.c,
+ * gsearchtool-support.c,
+ * gsearchtool.c: Fix build when using MAINTAINER_CFLAGS.
+
+2009-05-17 Dennis Cranston <dennis_cranston yahoo com>
+
* configure.ac, Makefile.am: Use gio-unix.
* gsearchtool-callbacks.c: Remove gnome-desktop-item.h
* gsearchtool-support.c (open_file_with_filemanager):
diff --git a/gsearchtool/gsearchtool-callbacks.c b/gsearchtool/gsearchtool-callbacks.c
index 41314d4..6c604ad 100644
--- a/gsearchtool/gsearchtool-callbacks.c
+++ b/gsearchtool/gsearchtool-callbacks.c
@@ -182,7 +182,7 @@ click_help_cb (GtkWidget * widget,
GTK_BUTTONS_OK,
_("Could not open help document."));
gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
- error->message);
+ error->message, NULL);
gtk_window_set_title (GTK_WINDOW (dialog), "");
gtk_container_set_border_width (GTK_CONTAINER (dialog), 5);
@@ -237,10 +237,10 @@ add_constraint_cb (GtkWidget * widget,
gpointer data)
{
GSearchWindow * gsearch = data;
- gint index;
+ gint idx;
- index = gtk_combo_box_get_active (GTK_COMBO_BOX (gsearch->available_options_combo_box));
- add_constraint (gsearch, index, NULL, FALSE);
+ idx = gtk_combo_box_get_active (GTK_COMBO_BOX (gsearch->available_options_combo_box));
+ add_constraint (gsearch, idx, NULL, FALSE);
}
void
@@ -345,9 +345,9 @@ display_dialog_file_open_limit (GtkWidget * window,
GTK_DIALOG_DESTROY_WITH_PARENT,
GTK_MESSAGE_QUESTION,
GTK_BUTTONS_CANCEL,
- primary);
+ primary, NULL);
gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
- secondary);
+ secondary, NULL);
gtk_window_set_title (GTK_WINDOW (dialog), "");
gtk_container_set_border_width (GTK_CONTAINER (dialog), 5);
@@ -382,9 +382,9 @@ display_dialog_could_not_open_file (GtkWidget * window,
GTK_DIALOG_DESTROY_WITH_PARENT,
GTK_MESSAGE_ERROR,
GTK_BUTTONS_OK,
- primary);
+ primary, NULL);
gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
- message);
+ message, NULL);
gtk_window_set_title (GTK_WINDOW (dialog), "");
gtk_container_set_border_width (GTK_CONTAINER (dialog), 5);
@@ -411,7 +411,7 @@ display_dialog_could_not_open_folder (GtkWidget * window,
GTK_DIALOG_DESTROY_WITH_PARENT,
GTK_MESSAGE_ERROR,
GTK_BUTTONS_OK,
- primary);
+ primary, NULL);
gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
_("The nautilus file manager is not running."));
@@ -442,7 +442,7 @@ open_file_cb (GtkMenuItem * action,
GSearchWindow * gsearch = data;
GtkTreeModel * model;
GList * list;
- guint index;
+ guint idx;
if (gtk_tree_selection_count_selected_rows (GTK_TREE_SELECTION (gsearch->search_results_selection)) == 0) {
return;
@@ -463,7 +463,7 @@ open_file_cb (GtkMenuItem * action,
}
}
- for (index = 0; index < g_list_length (list); index++) {
+ for (idx = 0; idx < g_list_length (list); idx++) {
gboolean no_files_found = FALSE;
gchar * utf8_name;
@@ -471,7 +471,7 @@ open_file_cb (GtkMenuItem * action,
GtkTreeIter iter;
gtk_tree_model_get_iter (GTK_TREE_MODEL (gsearch->search_results_list_store), &iter,
- g_list_nth (list, index)->data);
+ g_list_nth (list, idx)->data);
gtk_tree_model_get (GTK_TREE_MODEL (gsearch->search_results_list_store), &iter,
COLUMN_NAME, &utf8_name,
@@ -542,9 +542,9 @@ display_dialog_folder_open_limit (GtkWidget * window,
GTK_DIALOG_DESTROY_WITH_PARENT,
GTK_MESSAGE_QUESTION,
GTK_BUTTONS_CANCEL,
- primary);
+ primary, NULL);
gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
- secondary);
+ secondary, NULL);
gtk_window_set_title (GTK_WINDOW (dialog), "");
gtk_container_set_border_width (GTK_CONTAINER (dialog), 5);
@@ -575,7 +575,7 @@ open_folder_cb (GtkAction * action,
GFileInfo * g_file_info = NULL;
GAppInfo * g_app_info = NULL;
GList * list;
- guint index;
+ guint idx;
if (gtk_tree_selection_count_selected_rows (GTK_TREE_SELECTION (gsearch->search_results_selection)) == 0) {
return;
@@ -596,7 +596,7 @@ open_folder_cb (GtkAction * action,
}
}
- for (index = 0; index < g_list_length (list); index++) {
+ for (idx = 0; idx < g_list_length (list); idx++) {
gchar * locale_folder;
gchar * utf8_folder;
@@ -604,7 +604,7 @@ open_folder_cb (GtkAction * action,
GtkTreeIter iter;
gtk_tree_model_get_iter (GTK_TREE_MODEL (gsearch->search_results_list_store), &iter,
- g_list_nth (list, index)->data);
+ g_list_nth (list, idx)->data);
gtk_tree_model_get (GTK_TREE_MODEL (gsearch->search_results_list_store), &iter,
COLUMN_RELATIVE_PATH, &utf8_folder,
@@ -613,7 +613,7 @@ open_folder_cb (GtkAction * action,
locale_folder = g_path_get_dirname (locale_file);
- if (index == 0) {
+ if (idx == 0) {
g_file = g_file_new_for_path (locale_folder);
g_file_info = g_file_query_info (g_file, G_FILE_ATTRIBUTE_STANDARD_CONTENT_TYPE, G_FILE_QUERY_INFO_NONE, NULL, NULL);
g_app_info = g_app_info_get_default_for_type (g_file_info_get_content_type (g_file_info), FALSE);
@@ -687,9 +687,9 @@ display_dialog_could_not_move_to_trash (GtkWidget * window,
GTK_DIALOG_DESTROY_WITH_PARENT,
GTK_MESSAGE_ERROR,
GTK_BUTTONS_OK,
- primary);
+ primary, NULL);
gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
- message);
+ message, NULL);
gtk_window_set_title (GTK_WINDOW (dialog), "");
gtk_container_set_border_width (GTK_CONTAINER (dialog), 5);
@@ -722,9 +722,9 @@ display_dialog_delete_permanently (GtkWidget * window,
GTK_DIALOG_DESTROY_WITH_PARENT,
GTK_MESSAGE_QUESTION,
GTK_BUTTONS_CANCEL,
- primary);
+ primary, NULL);
gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
- secondary);
+ secondary, NULL);
gtk_window_set_title (GTK_WINDOW (dialog), "");
gtk_container_set_border_width (GTK_CONTAINER (dialog), 5);
@@ -760,9 +760,9 @@ display_dialog_could_not_delete (GtkWidget * window,
GTK_DIALOG_DESTROY_WITH_PARENT,
GTK_MESSAGE_ERROR,
GTK_BUTTONS_OK,
- primary);
+ primary, NULL);
gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
- message);
+ message, NULL);
gtk_window_set_title (GTK_WINDOW (dialog), "");
gtk_container_set_border_width (GTK_CONTAINER (dialog), 5);
@@ -782,7 +782,7 @@ move_to_trash_cb (GtkAction * action,
GSearchWindow * gsearch = data;
GtkTreePath * last_selected_path = NULL;
gint total;
- gint index;
+ gint idx;
if (gtk_tree_selection_count_selected_rows (GTK_TREE_SELECTION (gsearch->search_results_selection)) == 0) {
return;
@@ -790,7 +790,7 @@ move_to_trash_cb (GtkAction * action,
total = gtk_tree_selection_count_selected_rows (GTK_TREE_SELECTION (gsearch->search_results_selection));
- for (index = 0; index < total; index++) {
+ for (idx = 0; idx < total; idx++) {
gboolean no_files_found = FALSE;
GtkTreeModel * model;
GtkTreeIter iter;
@@ -821,7 +821,7 @@ move_to_trash_cb (GtkAction * action,
return;
}
- if (index + 1 == total) {
+ if (idx + 1 == total) {
last_selected_path = gtk_tree_model_get_path (GTK_TREE_MODEL (gsearch->search_results_list_store), &iter);
}
@@ -850,13 +850,12 @@ move_to_trash_cb (GtkAction * action,
response = display_dialog_delete_permanently (gsearch->window, utf8_filename);
if (response == GTK_RESPONSE_OK) {
- GFile * g_file;
- GError * error;
- gboolean result;
+ GFile * g_file_tmp;
+ GError * error_tmp;
- g_file = g_file_new_for_path (locale_filename);
- result = g_file_delete (g_file, NULL, &error);
- g_object_unref (g_file);
+ g_file_tmp = g_file_new_for_path (locale_filename);
+ result = g_file_delete (g_file_tmp, NULL, &error_tmp);
+ g_object_unref (g_file_tmp);
if (result == TRUE) {
tree_model_iter_free_monitor (GTK_TREE_MODEL (gsearch->search_results_list_store),
@@ -867,11 +866,11 @@ move_to_trash_cb (GtkAction * action,
gchar * message;
message = g_strdup_printf (_("Deleting \"%s\" failed: %s."),
- utf8_filename, error->message);
+ utf8_filename, error_tmp->message);
display_dialog_could_not_delete (gsearch->window, utf8_basename, message);
- g_error_free (error);
+ g_error_free (error_tmp);
g_free (message);
}
}
@@ -1259,7 +1258,7 @@ file_button_release_event_cb (GtkWidget * widget,
GList * tmp;
gchar * locale_file_tmp;
gchar * file = NULL;
- gint index;
+ gint idx;
timer = g_timer_new ();
g_timer_start (timer);
@@ -1267,7 +1266,7 @@ file_button_release_event_cb (GtkWidget * widget,
if (g_list_length (list) >= 2) {
/* Verify the selected files each have the same default handler. */
- for (tmp = g_list_first (list), index = 0; tmp != NULL; tmp = g_list_next (tmp), index++) {
+ for (tmp = g_list_first (list), idx = 0; tmp != NULL; tmp = g_list_next (tmp), idx++) {
GFile * g_file;
GAppInfo * app_info;
@@ -1286,7 +1285,7 @@ file_button_release_event_cb (GtkWidget * widget,
show_app_list = FALSE;
}
else {
- if (index == 0) {
+ if (idx == 0) {
first_app_info = g_app_info_dup (app_info);
g_object_unref (app_info);
continue;
@@ -1490,7 +1489,7 @@ drag_file_cb (GtkWidget * widget,
GdkDragContext * context,
GtkSelectionData * selection_data,
guint info,
- guint time,
+ guint drag_time,
gpointer data)
{
GSearchWindow * gsearch = data;
@@ -1498,7 +1497,7 @@ drag_file_cb (GtkWidget * widget,
GList * list;
GtkTreeModel * model;
GtkTreeIter iter;
- guint index;
+ guint idx;
if (gtk_tree_selection_count_selected_rows (GTK_TREE_SELECTION (gsearch->search_results_selection)) == 0) {
return;
@@ -1507,14 +1506,14 @@ drag_file_cb (GtkWidget * widget,
list = gtk_tree_selection_get_selected_rows (GTK_TREE_SELECTION (gsearch->search_results_selection),
&model);
- for (index = 0; index < g_list_length (list); index++) {
+ for (idx = 0; idx < g_list_length (list); idx++) {
gboolean no_files_found = FALSE;
gchar * utf8_name;
gchar * locale_file;
gtk_tree_model_get_iter (GTK_TREE_MODEL (gsearch->search_results_list_store), &iter,
- g_list_nth (list, index)->data);
+ g_list_nth (list, idx)->data);
gtk_tree_model_get (GTK_TREE_MODEL (gsearch->search_results_list_store), &iter,
COLUMN_NAME, &utf8_name,
@@ -1595,9 +1594,9 @@ display_dialog_could_not_save_no_name (GtkWidget * window)
GTK_DIALOG_DESTROY_WITH_PARENT,
GTK_MESSAGE_ERROR,
GTK_BUTTONS_OK,
- primary);
+ primary, NULL);
gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
- secondary);
+ secondary, NULL);
gtk_window_set_title (GTK_WINDOW (dialog), "");
gtk_container_set_border_width (GTK_CONTAINER (dialog), 5);
@@ -1627,9 +1626,9 @@ display_dialog_could_not_save_to (GtkWidget * window,
GTK_DIALOG_DESTROY_WITH_PARENT,
GTK_MESSAGE_ERROR,
GTK_BUTTONS_OK,
- primary);
+ primary, NULL);
gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
- message);
+ message, NULL);
gtk_window_set_title (GTK_WINDOW (dialog), "");
gtk_container_set_border_width (GTK_CONTAINER (dialog), 5);
@@ -1743,11 +1742,11 @@ save_results_cb (GtkWidget * chooser,
if ((fp = fopen (gsearch->save_results_as_default_filename, "w")) != NULL) {
- gint index;
+ gint idx;
- for (index = 0; index < gtk_tree_model_iter_n_children (GTK_TREE_MODEL (store), NULL); index++)
+ for (idx = 0; idx < gtk_tree_model_iter_n_children (GTK_TREE_MODEL (store), NULL); idx++)
{
- if (gtk_tree_model_iter_nth_child (GTK_TREE_MODEL (store), &iter, NULL, index) == TRUE) {
+ if (gtk_tree_model_iter_nth_child (GTK_TREE_MODEL (store), &iter, NULL, idx) == TRUE) {
gchar * locale_file;
diff --git a/gsearchtool/gsearchtool-support.c b/gsearchtool/gsearchtool-support.c
index 9219152..e573015 100644
--- a/gsearchtool/gsearchtool-support.c
+++ b/gsearchtool/gsearchtool-support.c
@@ -361,8 +361,6 @@ is_quick_search_excluded_path (const gchar * path)
for (tmp_list = exclude_path_list; tmp_list; tmp_list = tmp_list->next) {
- gchar * dir;
-
/* Skip empty or null values. */
if ((tmp_list->data == NULL) || (strlen (tmp_list->data) == 0)) {
continue;
@@ -439,8 +437,6 @@ is_second_scan_excluded_path (const gchar * path)
for (tmp_list = exclude_path_list; tmp_list; tmp_list = tmp_list->next) {
- gchar * dir;
-
/* Skip empty or null values. */
if ((tmp_list->data == NULL) || (strlen (tmp_list->data) == 0)) {
continue;
diff --git a/gsearchtool/gsearchtool.c b/gsearchtool/gsearchtool.c
index 9430dd6..bd37be2 100644
--- a/gsearchtool/gsearchtool.c
+++ b/gsearchtool/gsearchtool.c
@@ -485,7 +485,7 @@ display_dialog_character_set_conversion_error (GtkWidget * window,
string);
gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
- (error == NULL) ? " " : error->message);
+ (error == NULL) ? " " : error->message, NULL);
gtk_window_set_title (GTK_WINDOW (dialog), "");
gtk_container_set_border_width (GTK_CONTAINER (dialog), 5);
@@ -865,19 +865,19 @@ add_file_to_search_results (const gchar * file,
look_in_folder = g_strdup (gsearch->command_details->look_in_folder_string);
if (strlen (look_in_folder) > 1) {
- gchar * path;
+ gchar * path_str;
if (g_str_has_suffix (look_in_folder, G_DIR_SEPARATOR_S) == TRUE) {
look_in_folder[strlen (look_in_folder) - 1] = '\0';
}
- path = g_path_get_dirname (look_in_folder);
- if (strcmp (path, G_DIR_SEPARATOR_S) == 0) {
- relative_dir_name = g_strconcat (&dir_name[strlen (path)], NULL);
+ path_str = g_path_get_dirname (look_in_folder);
+ if (strcmp (path_str, G_DIR_SEPARATOR_S) == 0) {
+ relative_dir_name = g_strconcat (&dir_name[strlen (path_str)], NULL);
}
else {
- relative_dir_name = g_strconcat (&dir_name[strlen (path) + 1], NULL);
+ relative_dir_name = g_strconcat (&dir_name[strlen (path_str) + 1], NULL);
}
- g_free (path);
+ g_free (path_str);
}
else {
relative_dir_name = g_strdup (dir_name);
@@ -1065,18 +1065,18 @@ gsearch_create_list_of_templates (void)
{
GtkListStore * store;
GtkTreeIter iter;
- gint index;
+ gint idx;
store = gtk_list_store_new (1, G_TYPE_STRING);
- for (index = 0; GSearchOptionTemplates[index].type != SEARCH_CONSTRAINT_TYPE_NONE; index++) {
+ for (idx = 0; GSearchOptionTemplates[idx].type != SEARCH_CONSTRAINT_TYPE_NONE; idx++) {
- if (GSearchOptionTemplates[index].type == SEARCH_CONSTRAINT_TYPE_SEPARATOR) {
+ if (GSearchOptionTemplates[idx].type == SEARCH_CONSTRAINT_TYPE_SEPARATOR) {
gtk_list_store_append (store, &iter);
gtk_list_store_set (store, &iter, 0, "separator", -1);
}
else {
- gchar * text = remove_mnemonic_character (_(GSearchOptionTemplates[index].desc));
+ gchar * text = remove_mnemonic_character (_(GSearchOptionTemplates[idx].desc));
gtk_list_store_append (store, &iter);
gtk_list_store_set (store, &iter, 0, text, -1);
g_free (text);
@@ -1132,13 +1132,13 @@ set_constraint_selected_state (GSearchWindow * gsearch,
gint constraint_id,
gboolean state)
{
- gint index;
+ gint idx;
GSearchOptionTemplates[constraint_id].is_selected = state;
- for (index = 0; GSearchOptionTemplates[index].type != SEARCH_CONSTRAINT_TYPE_NONE; index++) {
- if (GSearchOptionTemplates[index].is_selected == FALSE) {
- gtk_combo_box_set_active (GTK_COMBO_BOX (gsearch->available_options_combo_box), index);
+ for (idx = 0; GSearchOptionTemplates[idx].type != SEARCH_CONSTRAINT_TYPE_NONE; idx++) {
+ if (GSearchOptionTemplates[idx].is_selected == FALSE) {
+ gtk_combo_box_set_active (GTK_COMBO_BOX (gsearch->available_options_combo_box), idx);
gtk_widget_set_sensitive (gsearch->available_options_add_button, TRUE);
gtk_widget_set_sensitive (gsearch->available_options_combo_box, TRUE);
gtk_widget_set_sensitive (gsearch->available_options_label, TRUE);
@@ -1831,7 +1831,7 @@ spawn_search_command (GSearchWindow * gsearch,
GTK_BUTTONS_OK,
_("Error parsing the search command."));
gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
- (error == NULL) ? " " : error->message);
+ (error == NULL) ? " " : error->message, NULL);
gtk_window_set_title (GTK_WINDOW (dialog), "");
gtk_container_set_border_width (GTK_CONTAINER (dialog), 5);
@@ -1864,7 +1864,7 @@ spawn_search_command (GSearchWindow * gsearch,
GTK_BUTTONS_OK,
_("Error running the search command."));
gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
- (error == NULL) ? " " : error->message);
+ (error == NULL) ? " " : error->message, NULL);
gtk_window_set_title (GTK_WINDOW (dialog), "");
gtk_container_set_border_width (GTK_CONTAINER (dialog), 5);
@@ -2104,13 +2104,13 @@ set_sensitive (GtkCellLayout * cell_layout,
gpointer data)
{
GtkTreePath * path;
- gint index;
+ gint idx;
path = gtk_tree_model_get_path (tree_model, iter);
- index = gtk_tree_path_get_indices (path)[0];
+ idx = gtk_tree_path_get_indices (path)[0];
gtk_tree_path_free (path);
- g_object_set (cell, "sensitive", !(GSearchOptionTemplates[index].is_selected), NULL);
+ g_object_set (cell, "sensitive", !(GSearchOptionTemplates[idx].is_selected), NULL);
}
static gboolean
@@ -2119,13 +2119,13 @@ is_separator (GtkTreeModel * model,
gpointer data)
{
GtkTreePath * path;
- gint index;
+ gint idx;
path = gtk_tree_model_get_path (model, iter);
- index = gtk_tree_path_get_indices (path)[0];
+ idx = gtk_tree_path_get_indices (path)[0];
gtk_tree_path_free (path);
- return (GSearchOptionTemplates[index].type == SEARCH_CONSTRAINT_TYPE_SEPARATOR);
+ return (GSearchOptionTemplates[idx].type == SEARCH_CONSTRAINT_TYPE_SEPARATOR);
}
static void
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
