[gnome-builder] terminal: white space and namespace cleanup
- From: Christian Hergert <chergert src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-builder] terminal: white space and namespace cleanup
- Date: Sat, 18 Feb 2017 18:18:12 +0000 (UTC)
commit 0653a79e5037b3c2688359ca0fe7d738f52fb6a4
Author: Christian Hergert <chergert redhat com>
Date: Sat Feb 18 10:17:54 2017 -0800
terminal: white space and namespace cleanup
plugins/terminal/gb-terminal-search.c | 28 ++++++++++++++--------------
plugins/terminal/gb-terminal-search.h | 10 +++++-----
plugins/terminal/gb-terminal-view.c | 6 +++---
3 files changed, 22 insertions(+), 22 deletions(-)
---
diff --git a/plugins/terminal/gb-terminal-search.c b/plugins/terminal/gb-terminal-search.c
index 70c8246..1708efd 100644
--- a/plugins/terminal/gb-terminal-search.c
+++ b/plugins/terminal/gb-terminal-search.c
@@ -145,7 +145,7 @@ update_regex (GbTerminalSearch *self)
update_sensitivity (self);
- g_object_notify_by_pspec (G_OBJECT (self), properties[PROP_REGEX]);
+ g_object_notify_by_pspec (G_OBJECT (self), properties[PROP_REGEX]);
}
static void
@@ -191,7 +191,7 @@ search_overlay_notify_regex_cb (VteTerminal *terminal,
g_assert (GB_IS_TERMINAL_SEARCH (self));
g_assert (VTE_IS_TERMINAL (terminal));
- regex = terminal_search_get_regex (self);
+ regex = gb_terminal_search_get_regex (self);
vte_terminal_search_set_regex (VTE_TERMINAL (terminal), regex, 0);
}
@@ -205,7 +205,7 @@ search_overlay_notify_wrap_around_cb (VteTerminal *terminal,
g_assert (GB_IS_TERMINAL_SEARCH (self));
g_assert (VTE_IS_TERMINAL (terminal));
- wrap = terminal_search_get_wrap_around (self);
+ wrap = gb_terminal_search_get_wrap_around (self);
vte_terminal_search_set_wrap_around (terminal, wrap);
}
@@ -230,7 +230,7 @@ search_revealer_cb (GtkRevealer *search_revealer,
g_assert (GB_IS_TERMINAL_SEARCH (self));
if (gtk_revealer_get_child_revealed (search_revealer))
- {
+ {
if (vte_terminal_get_has_selection (self->terminal))
{
vte_terminal_copy_primary (self->terminal);
@@ -278,11 +278,11 @@ gb_terminal_search_get_property (GObject *object,
switch (prop_id)
{
case PROP_REGEX:
- g_value_set_boxed (value, terminal_search_get_regex (self));
+ g_value_set_boxed (value, gb_terminal_search_get_regex (self));
break;
-
+
case PROP_WRAP_AROUND:
- g_value_set_boolean (value, terminal_search_get_wrap_around (self));
+ g_value_set_boolean (value, gb_terminal_search_get_wrap_around (self));
break;
default:
@@ -297,9 +297,9 @@ gb_terminal_search_class_init (GbTerminalSearchClass *klass)
GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
object_class->get_property = gb_terminal_search_get_property;
-
+
gtk_widget_class_set_template_from_resource (widget_class,
"/org/gnome/builder/plugins/terminal/gb-terminal-search.ui");
-
+
gtk_widget_class_bind_template_child (widget_class, GbTerminalSearch, search_prev_button);
gtk_widget_class_bind_template_child (widget_class, GbTerminalSearch, search_next_button);
gtk_widget_class_bind_template_child (widget_class, GbTerminalSearch, close_button);
@@ -365,13 +365,13 @@ gb_terminal_search_set_terminal (GbTerminalSearch *self,
VteTerminal *terminal)
{
g_assert (GB_IS_TERMINAL_SEARCH (self));
-
+
self->terminal = terminal;
gb_terminal_search_connect_terminal (self);
}
VteRegex *
-terminal_search_get_regex (GbTerminalSearch *self)
+gb_terminal_search_get_regex (GbTerminalSearch *self)
{
g_return_val_if_fail (GB_IS_TERMINAL_SEARCH (self), NULL);
@@ -379,7 +379,7 @@ terminal_search_get_regex (GbTerminalSearch *self)
}
gboolean
-terminal_search_get_wrap_around (GbTerminalSearch *self)
+gb_terminal_search_get_wrap_around (GbTerminalSearch *self)
{
g_return_val_if_fail (GB_IS_TERMINAL_SEARCH (self), FALSE);
@@ -387,9 +387,9 @@ terminal_search_get_wrap_around (GbTerminalSearch *self)
}
GtkRevealer *
-terminal_search_get_revealer (GbTerminalSearch *self)
+gb_terminal_search_get_revealer (GbTerminalSearch *self)
{
g_return_val_if_fail (GB_IS_TERMINAL_SEARCH (self), FALSE);
return self->search_revealer;
-}
\ No newline at end of file
+}
diff --git a/plugins/terminal/gb-terminal-search.h b/plugins/terminal/gb-terminal-search.h
index e300940..c1c3772 100644
--- a/plugins/terminal/gb-terminal-search.h
+++ b/plugins/terminal/gb-terminal-search.h
@@ -28,11 +28,11 @@ G_BEGIN_DECLS
G_DECLARE_FINAL_TYPE (GbTerminalSearch, gb_terminal_search, GB, TERMINAL_SEARCH, GtkBin)
-VteRegex *terminal_search_get_regex (GbTerminalSearch *self);
-gboolean terminal_search_get_wrap_around (GbTerminalSearch *self);
-void gb_terminal_search_set_terminal (GbTerminalSearch *self,
- VteTerminal *terminal);
-GtkRevealer *terminal_search_get_revealer (GbTerminalSearch *self);
+VteRegex *gb_terminal_search_get_regex (GbTerminalSearch *self);
+gboolean gb_terminal_search_get_wrap_around (GbTerminalSearch *self);
+void gb_terminal_search_set_terminal (GbTerminalSearch *self,
+ VteTerminal *terminal);
+GtkRevealer *gb_terminal_search_get_revealer (GbTerminalSearch *self);
G_END_DECLS
diff --git a/plugins/terminal/gb-terminal-view.c b/plugins/terminal/gb-terminal-view.c
index 676b2cd..5243339 100644
--- a/plugins/terminal/gb-terminal-view.c
+++ b/plugins/terminal/gb-terminal-view.c
@@ -461,7 +461,7 @@ focus_in_event_cb (VteTerminal *terminal,
g_assert (GB_IS_TERMINAL_VIEW (self));
self->bottom_has_focus = (terminal != self->terminal_top);
-
+
if (terminal == self->terminal_top)
{
self->top_has_needs_attention = FALSE;
@@ -601,7 +601,7 @@ gb_terminal_set_split_view (IdeLayoutView *view,
gtk_widget_show ( GTK_WIDGET (self->terminal_overlay_bottom));
self->bsearch = g_object_new (GB_TYPE_TERMINAL_SEARCH, NULL);
- self->search_revealer_bottom = terminal_search_get_revealer (self->bsearch);
+ self->search_revealer_bottom = gb_terminal_search_get_revealer (self->bsearch);
gtk_overlay_add_overlay (self->terminal_overlay_bottom,
GTK_WIDGET (self->search_revealer_bottom));
@@ -822,7 +822,7 @@ gb_terminal_view_init (GbTerminalView *self)
self->manage_spawn = TRUE;
self->tsearch = g_object_new (GB_TYPE_TERMINAL_SEARCH, NULL);
- self->search_revealer_top = terminal_search_get_revealer (self->tsearch);
+ self->search_revealer_top = gb_terminal_search_get_revealer (self->tsearch);
gtk_widget_init_template (GTK_WIDGET (self));
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]