[Xfce4-commits] <mousepad:matt/gtksourceview> Noise: remove extra whitespace added by editor.
Matthew Brush
noreply at xfce.org
Thu Oct 6 23:20:03 CEST 2011
Updating branch refs/heads/matt/gtksourceview
to c5ac3ceeff8979a20d60e40f62f0b04d0ea67b9f (commit)
from 7be1dde6dfe47b08cf49f6bfb3f4fe031d9fad8e (commit)
commit c5ac3ceeff8979a20d60e40f62f0b04d0ea67b9f
Author: Matthew Brush <mbrush at codebrainz.ca>
Date: Tue Oct 4 01:28:34 2011 -0700
Noise: remove extra whitespace added by editor.
Apologies for the noise.
mousepad/mousepad-document.c | 12 +++++-----
mousepad/mousepad-file.c | 20 ++++++++--------
mousepad/mousepad-preferences.c | 2 +-
mousepad/mousepad-statusbar.c | 6 ++--
mousepad/mousepad-view.c | 4 +-
mousepad/mousepad-window.c | 48 +++++++++++++++++++-------------------
6 files changed, 46 insertions(+), 46 deletions(-)
diff --git a/mousepad/mousepad-document.c b/mousepad/mousepad-document.c
index 843cd14..a3d9099 100644
--- a/mousepad/mousepad-document.c
+++ b/mousepad/mousepad-document.c
@@ -160,7 +160,7 @@ mousepad_document_class_init (MousepadDocumentClass *klass)
0, NULL, NULL,
g_cclosure_marshal_VOID__BOOLEAN,
G_TYPE_NONE, 1, G_TYPE_BOOLEAN);
-
+
document_signals[LANGUAGE_CHANGED] =
g_signal_new (I_("language-changed"),
G_TYPE_FROM_CLASS (gobject_class),
@@ -241,7 +241,7 @@ mousepad_document_init (MousepadDocument *document)
mousepad_view_set_auto_indent (document->textview, auto_indent);
mousepad_view_set_tab_size (document->textview, tab_size);
mousepad_view_set_insert_spaces (document->textview, insert_spaces);
-
+
if (g_strcmp0 (color_scheme, "none") != 0)
scheme = gtk_source_style_scheme_manager_get_scheme (gtk_source_style_scheme_manager_get_default (), color_scheme);
gtk_source_buffer_set_highlight_syntax (GTK_SOURCE_BUFFER (document->buffer), (scheme != NULL));
@@ -369,13 +369,13 @@ mousepad_document_notify_language (GtkSourceBuffer *buffer,
MousepadDocument *document)
{
GtkSourceLanguage *language;
-
+
mousepad_return_if_fail (MOUSEPAD_IS_DOCUMENT (document));
mousepad_return_if_fail (GTK_IS_SOURCE_BUFFER (buffer));
-
+
/* the new language */
language = gtk_source_buffer_get_language (buffer);
-
+
/* emit the signal */
g_signal_emit (G_OBJECT (document), document_signals[LANGUAGE_CHANGED], 0, language);
}
@@ -542,7 +542,7 @@ mousepad_document_send_signals (MousepadDocument *document)
/* re-send the selection status */
mousepad_document_notify_has_selection (document->buffer, NULL, document);
-
+
/* re-send the language signal */
mousepad_document_notify_language (GTK_SOURCE_BUFFER (document->buffer), NULL, document);
}
diff --git a/mousepad/mousepad-file.c b/mousepad/mousepad-file.c
index 2e4a86c..0148b69 100644
--- a/mousepad/mousepad-file.c
+++ b/mousepad/mousepad-file.c
@@ -393,13 +393,13 @@ mousepad_file_get_line_ending (MousepadFile *file)
-void
+void
mousepad_file_set_language (MousepadFile *file,
GtkSourceLanguage *language)
{
mousepad_return_if_fail (MOUSEPAD_IS_FILE (file));
mousepad_return_if_fail (GTK_IS_SOURCE_BUFFER (file->buffer));
-
+
gtk_source_buffer_set_language (GTK_SOURCE_BUFFER (file->buffer), language);
}
@@ -410,7 +410,7 @@ mousepad_file_get_language (MousepadFile *file)
{
mousepad_return_val_if_fail (MOUSEPAD_IS_FILE (file), NULL);
mousepad_return_val_if_fail (GTK_IS_SOURCE_BUFFER (file->buffer), NULL);
-
+
return gtk_source_buffer_get_language (GTK_SOURCE_BUFFER (file->buffer));
}
@@ -421,16 +421,16 @@ mousepad_file_set_language_id (MousepadFile *file,
const gchar *language_id)
{
GtkSourceLanguage *lang;
-
+
mousepad_return_if_fail (MOUSEPAD_IS_FILE (file));
mousepad_return_if_fail (GTK_IS_SOURCE_BUFFER (file->buffer));
-
+
if (G_UNLIKELY (language_id == NULL))
{
gtk_source_buffer_set_language (GTK_SOURCE_BUFFER (file->buffer), NULL);
return;
}
-
+
lang = gtk_source_language_manager_get_language (gtk_source_language_manager_get_default (), language_id);
mousepad_file_set_language (file, lang);
}
@@ -441,7 +441,7 @@ const gchar *
mousepad_file_get_language_id (MousepadFile *file)
{
GtkSourceLanguage *lang;
-
+
lang = mousepad_file_get_language (file);
return (lang != NULL) ? gtk_source_language_get_id (lang) : NULL;
}
@@ -462,11 +462,11 @@ mousepad_file_guess_language (MousepadFile *file)
content_type = NULL;
}
- language = gtk_source_language_manager_guess_language (gtk_source_language_manager_get_default (),
- file->filename,
+ language = gtk_source_language_manager_guess_language (gtk_source_language_manager_get_default (),
+ file->filename,
content_type);
g_free (content_type);
-
+
return language;
}
diff --git a/mousepad/mousepad-preferences.c b/mousepad/mousepad-preferences.c
index 5b45b71..740b281 100644
--- a/mousepad/mousepad-preferences.c
+++ b/mousepad/mousepad-preferences.c
@@ -214,7 +214,7 @@ mousepad_preferences_class_init (MousepadPreferencesClass *klass)
NULL,
FALSE,
MOUSEPAD_PARAM_READWRITE));
-
+
g_object_class_install_property (gobject_class,
PROP_VIEW_COLOR_SCHEME,
g_param_spec_string ("view-color-scheme",
diff --git a/mousepad/mousepad-statusbar.c b/mousepad/mousepad-statusbar.c
index a7da0f8..bdeac76 100644
--- a/mousepad/mousepad-statusbar.c
+++ b/mousepad/mousepad-statusbar.c
@@ -120,7 +120,7 @@ mousepad_statusbar_init (MousepadStatusbar *statusbar)
separator = gtk_vseparator_new ();
gtk_box_pack_start (GTK_BOX (box), separator, FALSE, FALSE, 0);
gtk_widget_show (separator);
-
+
/* language/filetype */
statusbar->language = gtk_label_new (_("Filetype: None"));
gtk_box_pack_start (GTK_BOX (box), statusbar->language, FALSE, TRUE, 0);
@@ -184,9 +184,9 @@ mousepad_statusbar_set_language (MousepadStatusbar *statusbar,
GtkSourceLanguage *language)
{
gchar *label;
-
+
mousepad_return_if_fail (MOUSEPAD_IS_STATUSBAR (statusbar));
-
+
if (language == NULL)
gtk_label_set_text (GTK_LABEL (statusbar->language), _("Filetype: None"));
else
diff --git a/mousepad/mousepad-view.c b/mousepad/mousepad-view.c
index 6c98b15..9bb4ace 100644
--- a/mousepad/mousepad-view.c
+++ b/mousepad/mousepad-view.c
@@ -1024,7 +1024,7 @@ mousepad_view_indent_decrease (MousepadView *view,
/* set iters */
start = end = *iter;
-
+
tab_size = gtk_source_view_get_tab_width (GTK_SOURCE_VIEW (view));
columns = tab_size;
@@ -2284,7 +2284,7 @@ mousepad_view_set_line_numbers (MousepadView *view,
gboolean line_numbers)
{
mousepad_return_if_fail (MOUSEPAD_IS_VIEW (view));
-
+
gtk_source_view_set_show_line_numbers (GTK_SOURCE_VIEW (view), line_numbers);
}
diff --git a/mousepad/mousepad-window.c b/mousepad/mousepad-window.c
index f042aae..06f9a9f 100644
--- a/mousepad/mousepad-window.c
+++ b/mousepad/mousepad-window.c
@@ -99,7 +99,7 @@ static gboolean mousepad_window_close_document (MousepadW
static void mousepad_window_set_title (MousepadWindow *window);
/* color scheme functions */
-static gint mousepad_window_color_schemes_compare_by_name(gconstpointer a,
+static gint mousepad_window_color_schemes_compare_by_name(gconstpointer a,
gconstpointer b);
static GList *mousepad_window_color_schemes_sorted_by_name (void);
@@ -616,7 +616,7 @@ mousepad_window_init (MousepadWindow *window)
/* add tab size menu */
mousepad_window_menu_tab_sizes (window);
-
+
/* add color schemes menu */
mousepad_window_menu_color_schemes (window);
@@ -1699,7 +1699,7 @@ mousepad_window_can_undo (MousepadWindow *window,
{
GtkAction *action;
gboolean can_undo;
-
+
can_undo = gtk_source_buffer_can_undo (GTK_SOURCE_BUFFER (buffer));
action = gtk_action_group_get_action (window->action_group, "undo");
@@ -1715,7 +1715,7 @@ mousepad_window_can_redo (MousepadWindow *window,
{
GtkAction *action;
gboolean can_redo;
-
+
can_redo = gtk_source_buffer_can_redo (GTK_SOURCE_BUFFER (buffer));
action = gtk_action_group_get_action (window->action_group, "redo");
@@ -3075,16 +3075,16 @@ mousepad_window_delete_event (MousepadWindow *window,
* Colour scheme functions
*/
static gint
-mousepad_window_color_schemes_compare_by_name (gconstpointer a,
+mousepad_window_color_schemes_compare_by_name (gconstpointer a,
gconstpointer b)
{
const gchar *name_a, *name_b;
-
+
if (G_UNLIKELY (!a))
return -(a != b);
if (G_UNLIKELY (!b))
return a != b;
-
+
name_a = gtk_source_style_scheme_get_name (GTK_SOURCE_STYLE_SCHEME (a));
name_b = gtk_source_style_scheme_get_name (GTK_SOURCE_STYLE_SCHEME (b));
@@ -3099,10 +3099,10 @@ mousepad_window_color_schemes_sorted_by_name (void)
GList *list = NULL;
const gchar * const *schemes;
GtkSourceStyleScheme *scheme;
-
+
schemes = gtk_source_style_scheme_manager_get_scheme_ids (
gtk_source_style_scheme_manager_get_default ());
-
+
while (*schemes)
{
scheme = gtk_source_style_scheme_manager_get_scheme (
@@ -3110,13 +3110,13 @@ mousepad_window_color_schemes_sorted_by_name (void)
list = g_list_prepend (list, scheme);
schemes++;
}
-
+
return g_list_sort (list, mousepad_window_color_schemes_compare_by_name);
}
-static void
+static void
mousepad_window_menu_color_schemes (MousepadWindow *window)
{
GtkRadioAction *action;
@@ -3135,10 +3135,10 @@ mousepad_window_menu_color_schemes (MousepadWindow *window)
merge_id = gtk_ui_manager_new_merge_id (window->ui_manager);
/* create a "none" action */
- action = gtk_radio_action_new ("color-scheme-none",
- _("None"),
- _("Turn off color schemes"),
- NULL,
+ action = gtk_radio_action_new ("color-scheme-none",
+ _("None"),
+ _("Turn off color schemes"),
+ NULL,
g_str_hash ("none"));
gtk_radio_action_set_group (action, group);
group = gtk_radio_action_get_group (action);
@@ -3152,7 +3152,7 @@ mousepad_window_menu_color_schemes (MousepadWindow *window)
gtk_ui_manager_add_ui (window->ui_manager, merge_id,
"/main-menu/view-menu/color-scheme-menu/placeholder-color-scheme-items",
"color-scheme-none", "color-scheme-none", GTK_UI_MANAGER_MENUITEM, FALSE);
-
+
/* add a separator */
gtk_ui_manager_add_ui (window->ui_manager, merge_id,
"/main-menu/view-menu/color-scheme-menu/placeholder-color-scheme-items",
@@ -3164,10 +3164,10 @@ mousepad_window_menu_color_schemes (MousepadWindow *window)
/* create action name */
name = g_strdup_printf ("color-scheme_%s", gtk_source_style_scheme_get_id (iter->data));
- action = gtk_radio_action_new (name,
- gtk_source_style_scheme_get_name (iter->data),
- gtk_source_style_scheme_get_description (iter->data),
- NULL,
+ action = gtk_radio_action_new (name,
+ gtk_source_style_scheme_get_name (iter->data),
+ gtk_source_style_scheme_get_description (iter->data),
+ NULL,
g_str_hash (gtk_source_style_scheme_get_id (iter->data)));
gtk_radio_action_set_group (action, group);
group = gtk_radio_action_get_group (action);
@@ -4631,7 +4631,7 @@ mousepad_window_action_color_scheme (GtkToggleAction *action,
/* get the color scheme id hashed */
scheme_id_hash = (guint) gtk_radio_action_get_current_value (GTK_RADIO_ACTION (action));
-
+
if (scheme_id_hash != g_str_hash ("none"))
{
/* lookup the scheme from the id hash */
@@ -4648,9 +4648,9 @@ mousepad_window_action_color_scheme (GtkToggleAction *action,
}
/* store as last used value */
- g_object_set (G_OBJECT (window->preferences),
- "view-color-scheme",
- (scheme != NULL) ? gtk_source_style_scheme_get_id (scheme) : "none",
+ g_object_set (G_OBJECT (window->preferences),
+ "view-color-scheme",
+ (scheme != NULL) ? gtk_source_style_scheme_get_id (scheme) : "none",
NULL);
/* apply colour scheme to all open textviews */
More information about the Xfce4-commits
mailing list