Commit c9707487 authored by Sébastien Wilmet's avatar Sébastien Wilmet

Remove all trailspaces in *.c and *.h files

The command used:
$ for i in *.{c,h}; do sed -i 's/[[:space:]]*$//' $i; done
parent dae453c6
......@@ -120,7 +120,7 @@ gedit_app_osx_set_window_title_impl (GeditApp *app,
g_object_unref (location);
NSURL *nsurl = [NSURL URLWithString:[NSString stringWithUTF8String:uri]];
[native setRepresentedURL:nsurl];
g_free (uri);
#else
......@@ -134,7 +134,7 @@ gedit_app_osx_set_window_title_impl (GeditApp *app,
#endif
}
ismodified = !gedit_document_is_untouched (document);
ismodified = !gedit_document_is_untouched (document);
[native setDocumentEdited:ismodified];
}
else
......@@ -249,7 +249,7 @@ setup_mac_menu (GeditWindow *window)
GtkWidget *menu;
manager = gedit_window_get_ui_manager (window);
/* Hide the menu bar */
menu = gtk_ui_manager_get_widget (manager, "/MenuBar");
gtk_widget_hide (menu);
......@@ -390,9 +390,9 @@ on_osx_open_files (GtkOSXApplication *osxapp,
g_file_new_for_path (*paths));
++paths;
}
locations = g_slist_reverse (locations);
if (locations != NULL)
{
GSList *files;
......@@ -408,7 +408,7 @@ on_osx_open_files (GtkOSXApplication *osxapp,
g_slist_free_full (locations, g_object_unref);
}
return TRUE;
}
......
......@@ -2,7 +2,7 @@
* gedit-app.c
* This file is part of gedit
*
* Copyright (C) 2005-2006 - Paolo Maggi
* Copyright (C) 2005-2006 - Paolo Maggi
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
......@@ -16,14 +16,14 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330,
* Foundation, Inc., 59 Temple Place, Suite 330,
* Boston, MA 02111-1307, USA.
*/
/*
* Modified by the gedit Team, 2005. See the AUTHORS file for a
* list of people on the gedit Team.
* See the ChangeLog files for a list of changes.
* Modified by the gedit Team, 2005. See the AUTHORS file for a
* list of people on the gedit Team.
* See the ChangeLog files for a list of changes.
*
* $Id$
*/
......@@ -83,7 +83,7 @@ struct _GeditAppPrivate
GtkPageSetup *page_setup;
GtkPrintSettings *print_settings;
GObject *settings;
GSettings *window_settings;
......@@ -279,7 +279,7 @@ gedit_app_show_help_impl (GeditApp *app,
dialog = gtk_message_dialog_new (parent,
GTK_DIALOG_DESTROY_WITH_PARENT,
GTK_MESSAGE_ERROR,
GTK_BUTTONS_CLOSE,
GTK_BUTTONS_CLOSE,
_("There was an error displaying the help."));
gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
......@@ -991,7 +991,7 @@ get_page_setup_file (void)
gchar *setup = NULL;
config_dir = gedit_dirs_get_user_config_dir ();
if (config_dir != NULL)
{
setup = g_build_filename (config_dir,
......@@ -1111,7 +1111,7 @@ gedit_app_constructed (GObject *object)
load_accels ();
}
static gboolean
static gboolean
window_delete_event (GeditWindow *window,
GdkEvent *event,
GeditApp *app)
......@@ -1120,7 +1120,7 @@ window_delete_event (GeditWindow *window,
ws = gedit_window_get_state (window);
if (ws &
if (ws &
(GEDIT_WINDOW_STATE_SAVING | GEDIT_WINDOW_STATE_PRINTING))
{
return TRUE;
......@@ -1136,7 +1136,7 @@ static GeditWindow *
gedit_app_create_window_impl (GeditApp *app)
{
GeditWindow *window;
window = g_object_new (GEDIT_TYPE_WINDOW, "application", app, NULL);
gedit_debug_message (DEBUG_APP, "Window created");
......@@ -1257,7 +1257,7 @@ gen_role (void)
{
GTimeVal result;
static gint serial;
g_get_current_time (&result);
return g_strdup_printf ("gedit-window-%ld-%ld-%d-%s",
......
......@@ -2,7 +2,7 @@
* gedit-close-confirmation-dialog.c
* This file is part of gedit
*
* Copyright (C) 2004-2005 GNOME Foundation
* Copyright (C) 2004-2005 GNOME Foundation
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
......@@ -16,13 +16,13 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330,
* Boston, MA 02111-1307, USA.
* Foundation, Inc., 59 Temple Place, Suite 330,
* Boston, MA 02111-1307, USA.
*/
/*
* Modified by the gedit Team, 2004-2005. See the AUTHORS file for a
* list of people on the gedit Team.
* Modified by the gedit Team, 2004-2005. See the AUTHORS file for a
* list of people on the gedit Team.
* See the ChangeLog files for a list of changes.
*
* $Id$
......@@ -40,9 +40,9 @@
#include <gedit/gedit-window.h>
/* Properties */
enum
enum
{
PROP_0,
PROP_0,
PROP_UNSAVED_DOCUMENTS
};
......@@ -62,7 +62,7 @@ enum
N_COLUMNS
};
struct _GeditCloseConfirmationDialogPrivate
struct _GeditCloseConfirmationDialogPrivate
{
GList *unsaved_documents;
GList *selected_documents;
......@@ -85,7 +85,7 @@ static void set_unsaved_document (GeditCloseConfirmationDialog *dlg,
static GList *get_selected_docs (GtkTreeModel *store);
/* Since we connect in the costructor we are sure this handler will be called
/* Since we connect in the costructor we are sure this handler will be called
* before the user ones
*/
static void
......@@ -98,7 +98,7 @@ response_cb (GeditCloseConfirmationDialog *dlg,
g_return_if_fail (GEDIT_IS_CLOSE_CONFIRMATION_DIALOG (dlg));
priv = dlg->priv;
if (priv->selected_documents != NULL)
g_list_free (priv->selected_documents);
......@@ -106,7 +106,7 @@ response_cb (GeditCloseConfirmationDialog *dlg,
{
if (GET_MODE (priv) == SINGLE_DOC_MODE)
{
priv->selected_documents =
priv->selected_documents =
g_list_copy (priv->unsaved_documents);
}
else
......@@ -123,7 +123,7 @@ response_cb (GeditCloseConfirmationDialog *dlg,
}
}
static void
static void
gedit_close_confirmation_dialog_init (GeditCloseConfirmationDialog *dlg)
{
GeditLockdownMask lockdown;
......@@ -135,12 +135,12 @@ gedit_close_confirmation_dialog_init (GeditCloseConfirmationDialog *dlg)
dlg->priv->disable_save_to_disk = lockdown & GEDIT_LOCKDOWN_SAVE_TO_DISK;
gtk_container_set_border_width (GTK_CONTAINER (dlg), 5);
gtk_container_set_border_width (GTK_CONTAINER (dlg), 5);
gtk_box_set_spacing (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dlg))),
14);
gtk_window_set_resizable (GTK_WINDOW (dlg), FALSE);
gtk_window_set_skip_taskbar_hint (GTK_WINDOW (dlg), TRUE);
gtk_window_set_title (GTK_WINDOW (dlg), "");
gtk_window_set_modal (GTK_WINDOW (dlg), TRUE);
......@@ -149,14 +149,14 @@ gedit_close_confirmation_dialog_init (GeditCloseConfirmationDialog *dlg)
atk_obj = gtk_widget_get_accessible (GTK_WIDGET (dlg));
atk_object_set_role (atk_obj, ATK_ROLE_ALERT);
atk_object_set_name (atk_obj, _("Question"));
g_signal_connect (dlg,
"response",
G_CALLBACK (response_cb),
NULL);
}
static void
static void
gedit_close_confirmation_dialog_finalize (GObject *object)
{
GeditCloseConfirmationDialogPrivate *priv;
......@@ -174,9 +174,9 @@ gedit_close_confirmation_dialog_finalize (GObject *object)
}
static void
gedit_close_confirmation_dialog_set_property (GObject *object,
guint prop_id,
const GValue *value,
gedit_close_confirmation_dialog_set_property (GObject *object,
guint prop_id,
const GValue *value,
GParamSpec *pspec)
{
GeditCloseConfirmationDialog *dlg;
......@@ -196,9 +196,9 @@ gedit_close_confirmation_dialog_set_property (GObject *object,
}
static void
gedit_close_confirmation_dialog_get_property (GObject *object,
guint prop_id,
GValue *value,
gedit_close_confirmation_dialog_get_property (GObject *object,
guint prop_id,
GValue *value,
GParamSpec *pspec)
{
GeditCloseConfirmationDialogPrivate *priv;
......@@ -217,7 +217,7 @@ gedit_close_confirmation_dialog_get_property (GObject *object,
}
}
static void
static void
gedit_close_confirmation_dialog_class_init (GeditCloseConfirmationDialogClass *klass)
{
GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
......@@ -233,7 +233,7 @@ gedit_close_confirmation_dialog_class_init (GeditCloseConfirmationDialogClass *k
g_param_spec_pointer ("unsaved_documents",
"Unsaved Documents",
"List of Unsaved Documents",
(G_PARAM_READWRITE |
(G_PARAM_READWRITE |
G_PARAM_CONSTRUCT_ONLY)));
}
......@@ -252,7 +252,7 @@ get_selected_docs (GtkTreeModel *store)
gboolean to_save;
GeditDocument *doc;
gtk_tree_model_get (store, &iter,
gtk_tree_model_get (store, &iter,
SAVE_COLUMN, &to_save,
DOC_COLUMN, &doc,
-1);
......@@ -276,7 +276,7 @@ gedit_close_confirmation_dialog_get_selected_documents (GeditCloseConfirmationDi
}
GtkWidget *
gedit_close_confirmation_dialog_new (GtkWindow *parent,
gedit_close_confirmation_dialog_new (GtkWindow *parent,
GList *unsaved_documents)
{
GtkWidget *dlg;
......@@ -292,26 +292,26 @@ gedit_close_confirmation_dialog_new (GtkWindow *parent,
{
gtk_window_group_add_window (gedit_window_get_group (GEDIT_WINDOW (parent)),
GTK_WINDOW (dlg));
gtk_window_set_transient_for (GTK_WINDOW (dlg), parent);
gtk_window_set_transient_for (GTK_WINDOW (dlg), parent);
}
return dlg;
}
GtkWidget *
gedit_close_confirmation_dialog_new_single (GtkWindow *parent,
gedit_close_confirmation_dialog_new_single (GtkWindow *parent,
GeditDocument *doc)
{
GtkWidget *dlg;
GList *unsaved_documents;
g_return_val_if_fail (doc != NULL, NULL);
unsaved_documents = g_list_prepend (NULL, doc);
dlg = gedit_close_confirmation_dialog_new (parent,
dlg = gedit_close_confirmation_dialog_new (parent,
unsaved_documents);
g_list_free (unsaved_documents);
return dlg;
......@@ -363,10 +363,10 @@ get_text_secondary_label (GeditDocument *doc)
{
glong seconds;
gchar *secondary_msg;
seconds = MAX (1, _gedit_document_get_seconds_since_last_save_or_load (doc));
if (seconds < 55)
if (seconds < 55)
{
secondary_msg = g_strdup_printf (
ngettext ("If you don't save, changes from the last %ld second "
......@@ -460,7 +460,7 @@ build_single_doc_dialog (GeditCloseConfirmationDialog *dlg)
add_buttons (dlg);
/* Image */
image = gtk_image_new_from_stock (GTK_STOCK_DIALOG_WARNING,
image = gtk_image_new_from_stock (GTK_STOCK_DIALOG_WARNING,
GTK_ICON_SIZE_DIALOG);
gtk_widget_set_halign (image, GTK_ALIGN_START);
......@@ -495,7 +495,7 @@ build_single_doc_dialog (GeditCloseConfirmationDialog *dlg)
/* Secondary label */
if (dlg->priv->disable_save_to_disk)
str = g_strdup (_("Saving has been disabled by the system administrator."));
str = g_strdup (_("Saving has been disabled by the system administrator."));
else
str = get_text_secondary_label (doc);
secondary_label = gtk_label_new (str);
......@@ -515,9 +515,9 @@ build_single_doc_dialog (GeditCloseConfirmationDialog *dlg)
gtk_box_pack_start (GTK_BOX (vbox), primary_label, FALSE, FALSE, 0);
gtk_box_pack_start (GTK_BOX (vbox), secondary_label, FALSE, FALSE, 0);
gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dlg))),
hbox,
FALSE,
FALSE,
hbox,
FALSE,
FALSE,
0);
gtk_widget_show_all (hbox);
......@@ -590,7 +590,7 @@ create_treeview (GeditCloseConfirmationDialogPrivate *priv)
g_object_unref (store);
priv->list_store = GTK_TREE_MODEL (store);
/* Add columns */
if (!priv->disable_save_to_disk)
{
......@@ -643,7 +643,7 @@ build_multiple_docs_dialog (GeditCloseConfirmationDialog *dlg)
hbox, TRUE, TRUE, 0);
/* Image */
image = gtk_image_new_from_stock (GTK_STOCK_DIALOG_WARNING,
image = gtk_image_new_from_stock (GTK_STOCK_DIALOG_WARNING,
GTK_ICON_SIZE_DIALOG);
gtk_widget_set_halign (image, GTK_ALIGN_START);
gtk_box_pack_start (GTK_BOX (hbox), image, FALSE, FALSE, 0);
......@@ -679,11 +679,11 @@ build_multiple_docs_dialog (GeditCloseConfirmationDialog *dlg)
markup_str = g_strconcat ("<span weight=\"bold\" size=\"larger\">", str, "</span>", NULL);
g_free (str);
gtk_label_set_markup (GTK_LABEL (primary_label), markup_str);
g_free (markup_str);
gtk_box_pack_start (GTK_BOX (vbox), primary_label, FALSE, FALSE, 0);
vbox2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 8);
gtk_box_pack_start (GTK_BOX (vbox), vbox2, FALSE, FALSE, 0);
......@@ -698,10 +698,10 @@ build_multiple_docs_dialog (GeditCloseConfirmationDialog *dlg)
scrolledwindow = gtk_scrolled_window_new (NULL, NULL);
gtk_box_pack_start (GTK_BOX (vbox2), scrolledwindow, TRUE, TRUE, 0);
gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolledwindow),
GTK_POLICY_AUTOMATIC,
gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolledwindow),
GTK_POLICY_AUTOMATIC,
GTK_POLICY_AUTOMATIC);
gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrolledwindow),
gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrolledwindow),
GTK_SHADOW_IN);
treeview = create_treeview (priv);
......@@ -725,7 +725,7 @@ build_multiple_docs_dialog (GeditCloseConfirmationDialog *dlg)
gtk_label_set_mnemonic_widget (GTK_LABEL (select_label), treeview);
gtk_widget_show_all (hbox);
gtk_widget_show_all (hbox);
}
static void
......@@ -734,7 +734,7 @@ set_unsaved_document (GeditCloseConfirmationDialog *dlg,
{
GeditCloseConfirmationDialogPrivate *priv;
g_return_if_fail (list != NULL);
g_return_if_fail (list != NULL);
priv = dlg->priv;
g_return_if_fail (priv->unsaved_documents == NULL);
......@@ -748,7 +748,7 @@ set_unsaved_document (GeditCloseConfirmationDialog *dlg,
else
{
build_multiple_docs_dialog (dlg);
}
}
}
const GList *
......
......@@ -2,7 +2,7 @@
* gedit-close-confirmation-dialog.h
* This file is part of gedit
*
* Copyright (C) 2004-2005 GNOME Foundation
* Copyright (C) 2004-2005 GNOME Foundation
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
......@@ -16,14 +16,14 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330,
* Boston, MA 02111-1307, USA.
* Foundation, Inc., 59 Temple Place, Suite 330,
* Boston, MA 02111-1307, USA.
*/
/*
* Modified by the gedit Team, 2004-2005. See the AUTHORS file for a
* list of people on the gedit Team.
* See the ChangeLog files for a list of changes.
* Modified by the gedit Team, 2004-2005. See the AUTHORS file for a
* list of people on the gedit Team.
* See the ChangeLog files for a list of changes.
*/
#ifndef __GEDIT_CLOSE_CONFIRMATION_DIALOG_H__
......@@ -45,7 +45,7 @@ typedef struct _GeditCloseConfirmationDialog GeditCloseConfirmationDialog;
typedef struct _GeditCloseConfirmationDialogClass GeditCloseConfirmationDialogClass;
typedef struct _GeditCloseConfirmationDialogPrivate GeditCloseConfirmationDialogPrivate;
struct _GeditCloseConfirmationDialog
struct _GeditCloseConfirmationDialog
{
GtkDialog parent;
......@@ -53,7 +53,7 @@ struct _GeditCloseConfirmationDialog
GeditCloseConfirmationDialogPrivate *priv;
};
struct _GeditCloseConfirmationDialogClass
struct _GeditCloseConfirmationDialogClass
{
GtkDialogClass parent_class;
};
......@@ -62,7 +62,7 @@ GType gedit_close_confirmation_dialog_get_type (void) G_GNUC_CONST;
GtkWidget *gedit_close_confirmation_dialog_new (GtkWindow *parent,
GList *unsaved_documents);
GtkWidget *gedit_close_confirmation_dialog_new_single (GtkWindow *parent,
GtkWidget *gedit_close_confirmation_dialog_new_single (GtkWindow *parent,
GeditDocument *doc);
const GList *gedit_close_confirmation_dialog_get_unsaved_documents (GeditCloseConfirmationDialog *dlg);
......
......@@ -214,7 +214,7 @@ load_file_list (GeditWindow *window,
line_pos,
column_pos,
create);
/* make sure the view has focus */
gtk_widget_grab_focus (GTK_WIDGET (gedit_tab_get_view (tab)));
......@@ -438,7 +438,7 @@ _gedit_cmd_file_open (GtkAction *action,
return;
}
/* Translators: "Open Files" is the title of the file chooser window */
/* Translators: "Open Files" is the title of the file chooser window */
open_dialog = gedit_file_chooser_dialog_new (_("Open Files"),
GTK_WINDOW (window),
GTK_FILE_CHOOSER_ACTION_OPEN,
......@@ -939,7 +939,7 @@ _gedit_cmd_file_save_tab (GeditTab *tab,
doc = gedit_tab_get_document (tab);
g_return_if_fail (GEDIT_IS_DOCUMENT (doc));
if (gedit_document_is_untitled (doc) ||
if (gedit_document_is_untitled (doc) ||
gedit_document_get_readonly (doc))
{
gedit_debug_message (DEBUG_COMMANDS, "Untitled or Readonly");
......@@ -1016,7 +1016,7 @@ _gedit_cmd_file_save_documents_list (GeditWindow *window,
gedit_debug (DEBUG_COMMANDS);
g_return_if_fail (!(gedit_window_get_state (window) &
g_return_if_fail (!(gedit_window_get_state (window) &
GEDIT_WINDOW_STATE_PRINTING));
l = docs;
......@@ -1027,7 +1027,7 @@ _gedit_cmd_file_save_documents_list (GeditWindow *window,
GeditTabState state;
g_return_if_fail (GEDIT_IS_DOCUMENT (l->data));
doc = GEDIT_DOCUMENT (l->data);
t = gedit_tab_get_from_document (doc);
state = gedit_tab_get_state (t);
......@@ -1042,7 +1042,7 @@ _gedit_cmd_file_save_documents_list (GeditWindow *window,
{
/* FIXME: manage the case of local readonly files owned by the
user is running gedit - Paolo (Dec. 8, 2005) */
if (gedit_document_is_untitled (doc) ||
if (gedit_document_is_untitled (doc) ||
gedit_document_get_readonly (doc))
{
if (document_needs_saving (doc))
......@@ -1116,7 +1116,7 @@ void
gedit_commands_save_all_documents (GeditWindow *window)
{
GList *docs;
g_return_if_fail (GEDIT_IS_WINDOW (window));
gedit_debug (DEBUG_COMMANDS);
......@@ -1143,9 +1143,9 @@ gedit_commands_save_document (GeditWindow *window,
g_return_if_fail (GEDIT_IS_WINDOW (window));
g_return_if_fail (GEDIT_IS_DOCUMENT (document));
gedit_debug (DEBUG_COMMANDS);
tab = gedit_tab_get_from_document (document);
_gedit_cmd_file_save_tab (tab, window);
}
......@@ -1508,7 +1508,7 @@ save_and_close_all_documents (const GList *docs,
- GEDIT_TAB_STATE_LOADING: close, we are sure the file is unmodified
- GEDIT_TAB_STATE_REVERTING: since the user wants
to return back to the version of the file she previously saved, we can close
without saving (CHECK: are we sure this is the right behavior, suppose the case
without saving (CHECK: are we sure this is the right behavior, suppose the case
the original file has been deleted)
- [*] GEDIT_TAB_STATE_SAVING: invalid, ClosAll
and Quit are unsensitive if the window state is SAVING.
......@@ -1538,12 +1538,12 @@ save_and_close_all_documents (const GList *docs,
{
if ((g_list_index ((GList *)docs, doc) >= 0) &&
(state != GEDIT_TAB_STATE_LOADING) &&
(state != GEDIT_TAB_STATE_LOADING_ERROR) &&
(state != GEDIT_TAB_STATE_LOADING_ERROR) &&
(state != GEDIT_TAB_STATE_REVERTING)) /* CHECK: is this the right behavior with REVERTING ?*/
{
{
/* The document must be saved before closing */
g_return_if_fail (document_needs_saving (doc));
/* FIXME: manage the case of local readonly files owned by the
user is running gedit - Paolo (Dec. 8, 2005) */
if (gedit_document_is_untitled (doc) ||
......@@ -1806,8 +1806,8 @@ _gedit_cmd_file_close_tab (GeditTab *tab,
GEDIT_IS_QUITTING,
GBOOLEAN_TO_POINTER (FALSE));
g_object_set_data (G_OBJECT (window),
GEDIT_IS_QUITTING_ALL,
g_object_set_data (G_OBJECT (window),
GEDIT_IS_QUITTING_ALL,
GINT_TO_POINTER (FALSE));
......@@ -1858,7 +1858,7 @@ file_close_all (GeditWindow *window,
g_object_set_data (G_OBJECT (window),
GEDIT_IS_QUITTING,
GBOOLEAN_TO_POINTER (is_quitting));
unsaved_docs = gedit_window_get_unsaved_documents (window);
if (unsaved_docs == NULL)
......@@ -1933,7 +1933,7 @@ quit_all ()
for (item = windows; item; item = g_list_next (item))
{
GeditWindow *window = GEDIT_WINDOW (item->data);
g_object_set_data (G_OBJECT (window),
GEDIT_IS_QUITTING_ALL,
GINT_TO_POINTER (TRUE));
......
......@@ -134,7 +134,7 @@ text_not_found (GeditWindow *window,
const gchar *text)
{
gchar *searched;
searched = gedit_utils_str_end_truncate (text, MAX_MSG_LENGTH);
gedit_statusbar_flash_message (GEDIT_STATUSBAR (window->priv->statusbar),
......@@ -197,12 +197,12 @@ run_search (GeditView *view,
{
found = gedit_document_search_backward (doc,
NULL, /* FIXME: set the start_inter */
NULL,
NULL,
&match_start,
&match_end);
}
}
if (found)
{
gtk_text_buffer_place_cursor (GTK_TEXT_BUFFER (doc),
......@@ -267,7 +267,7 @@ do_find (GeditReplaceDialog *dialog,
}
g_free (search_text);
found = run_search (active_view,
wrap_around,
search_backwards);
......@@ -393,8 +393,8 @@ do_replace (GeditReplaceDialog *dialog,
unescaped_search_text = gedit_utils_unescape_search_text (search_entry_text);
get_selected_text (GTK_TEXT_BUFFER (doc),
&selected_text,
get_selected_text (GTK_TEXT_BUFFER (doc),
&selected_text,
NULL);
match_case = gedit_replace_dialog_get_match_case (dialog);
......@@ -413,7 +413,7 @@ do_replace (GeditReplaceDialog *dialog,
return;
}
unescaped_replace_text = gedit_utils_unescape_search_text (replace_entry_text);
unescaped_replace_text = gedit_utils_unescape_search_text (replace_entry_text);
replace_selected_text (GTK_TEXT_BUFFER (doc), unescaped_replace_text);
g_free (unescaped_search_text);
......@@ -456,7 +456,7 @@ do_replace_all (GeditReplaceDialog *dialog,
GEDIT_SEARCH_SET_CASE_SENSITIVE (flags, match_case);
GEDIT_SEARCH_SET_ENTIRE_WORD (flags, entire_word);
count = gedit_document_replace_all (doc,
count = gedit_document_replace_all (doc,
search_entry_text,
replace_entry_text,
flags);
......@@ -575,7 +575,7 @@ _gedit_cmd_search_replace (GtkAction *action,
else
{
g_return_if_fail (GEDIT_IS_REPLACE_DIALOG (data));
replace_dialog = GTK_WIDGET (data);
}
......@@ -610,15 +610,15 @@ do_find_again (GeditWindow *window,
GeditView *active_view;
gboolean wrap_around = TRUE;
gpointer data;
active_view = gedit_window_get_active_view (window);
g_return_if_fail (active_view != NULL);
data = g_object_get_data (G_OBJECT (window), GEDIT_REPLACE_DIALOG_KEY);
if (data != NULL)
wrap_around = gedit_replace_dialog_get_wrap_around (GEDIT_REPLACE_DIALOG (data));
run_search (active_view,
wrap_around,
backward);
......
......@@ -79,7 +79,7 @@ _gedit_cmd_view_show_side_panel (GtkAction *action,
visible = gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action));
panel = gedit_window_get_side_panel (window);
gtk_widget_set_visible (GTK_WIDGET (panel), visible);