aboutsummaryrefslogtreecommitdiffstats
path: root/shell
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@redhat.com>2011-03-06 01:33:49 +0800
committerRodrigo Moya <rodrigo@gnome-db.org>2011-06-30 00:41:41 +0800
commit7aacf983b32ecac26bc9707697da622b3ef164a3 (patch)
tree754e32b12d21674efa6d55c7a1c8727477197dd4 /shell
parentbca1a2c5ea655a8cfacedadf8a9a6c6b62d2b0ab (diff)
downloadgsoc2013-evolution-7aacf983b32ecac26bc9707697da622b3ef164a3.tar
gsoc2013-evolution-7aacf983b32ecac26bc9707697da622b3ef164a3.tar.gz
gsoc2013-evolution-7aacf983b32ecac26bc9707697da622b3ef164a3.tar.bz2
gsoc2013-evolution-7aacf983b32ecac26bc9707697da622b3ef164a3.tar.lz
gsoc2013-evolution-7aacf983b32ecac26bc9707697da622b3ef164a3.tar.xz
gsoc2013-evolution-7aacf983b32ecac26bc9707697da622b3ef164a3.tar.zst
gsoc2013-evolution-7aacf983b32ecac26bc9707697da622b3ef164a3.zip
Coding style and whitespace cleanup.
Diffstat (limited to 'shell')
-rw-r--r--shell/e-shell-backend.c3
-rw-r--r--shell/e-shell-content.c3
-rw-r--r--shell/e-shell-migrate.c6
-rw-r--r--shell/e-shell-searchbar.c3
-rw-r--r--shell/e-shell-settings.c3
-rw-r--r--shell/e-shell-sidebar.c3
-rw-r--r--shell/e-shell-switcher.c3
-rw-r--r--shell/e-shell-taskbar.c3
-rw-r--r--shell/e-shell-view.c3
-rw-r--r--shell/e-shell-window.c3
-rw-r--r--shell/e-shell.c3
-rw-r--r--shell/test/e-test-shell-backend.c4
-rw-r--r--shell/test/e-test-shell-view.c4
13 files changed, 30 insertions, 14 deletions
diff --git a/shell/e-shell-backend.c b/shell/e-shell-backend.c
index 03acc0ef04..b1dadce99d 100644
--- a/shell/e-shell-backend.c
+++ b/shell/e-shell-backend.c
@@ -290,7 +290,8 @@ e_shell_backend_class_init (EShellBackendClass *class)
static void
e_shell_backend_init (EShellBackend *shell_backend)
{
- shell_backend->priv = G_TYPE_INSTANCE_GET_PRIVATE (shell_backend, E_TYPE_SHELL_BACKEND, EShellBackendPrivate);
+ shell_backend->priv = G_TYPE_INSTANCE_GET_PRIVATE (
+ shell_backend, E_TYPE_SHELL_BACKEND, EShellBackendPrivate);
shell_backend->priv->activities = g_queue_new ();
}
diff --git a/shell/e-shell-content.c b/shell/e-shell-content.c
index 96e56f75a9..91a6d1f69b 100644
--- a/shell/e-shell-content.c
+++ b/shell/e-shell-content.c
@@ -466,7 +466,8 @@ e_shell_content_alert_sink_init (EAlertSinkInterface *interface)
static void
e_shell_content_init (EShellContent *shell_content)
{
- shell_content->priv = G_TYPE_INSTANCE_GET_PRIVATE (shell_content, E_TYPE_SHELL_CONTENT, EShellContentPrivate);
+ shell_content->priv = G_TYPE_INSTANCE_GET_PRIVATE (
+ shell_content, E_TYPE_SHELL_CONTENT, EShellContentPrivate);
gtk_widget_set_has_window (GTK_WIDGET (shell_content), FALSE);
}
diff --git a/shell/e-shell-migrate.c b/shell/e-shell-migrate.c
index 01b3f9f10e..fbcd701bea 100644
--- a/shell/e-shell-migrate.c
+++ b/shell/e-shell-migrate.c
@@ -819,14 +819,16 @@ merge_duplicate_local_sources (GConfClient *client, const gchar *gconf_key)
}
/* merging respective sources */
- for (sources = e_source_group_peek_sources (group); sources; sources = sources->next) {
+ for (sources = e_source_group_peek_sources (group);
+ sources != NULL; sources = sources->next) {
GSList *liter;
ESource *dupe_source = sources->data;
if (!dupe_source)
continue;
- for (liter = e_source_group_peek_sources (first_local); liter != NULL; liter = liter->next) {
+ for (liter = e_source_group_peek_sources (first_local);
+ liter != NULL; liter = liter->next) {
ESource *my_source = liter->data;
const gchar *val1, *val2;
diff --git a/shell/e-shell-searchbar.c b/shell/e-shell-searchbar.c
index 97349f9b89..7a0f3c7d42 100644
--- a/shell/e-shell-searchbar.c
+++ b/shell/e-shell-searchbar.c
@@ -909,7 +909,8 @@ e_shell_searchbar_init (EShellSearchbar *searchbar)
GtkLabel *label;
GtkWidget *widget;
- searchbar->priv = G_TYPE_INSTANCE_GET_PRIVATE (searchbar, E_TYPE_SHELL_SEARCHBAR, EShellSearchbarPrivate);
+ searchbar->priv = G_TYPE_INSTANCE_GET_PRIVATE (
+ searchbar, E_TYPE_SHELL_SEARCHBAR, EShellSearchbarPrivate);
gtk_box_set_spacing (GTK_BOX (searchbar), 24);
diff --git a/shell/e-shell-settings.c b/shell/e-shell-settings.c
index c8a507e630..e43139acb4 100644
--- a/shell/e-shell-settings.c
+++ b/shell/e-shell-settings.c
@@ -256,7 +256,8 @@ shell_settings_init (EShellSettings *shell_settings,
value_array = g_array_new (FALSE, TRUE, sizeof (GValue));
g_array_set_size (value_array, property_count);
- shell_settings->priv = G_TYPE_INSTANCE_GET_PRIVATE (shell_settings, E_TYPE_SHELL_SETTINGS, EShellSettingsPrivate);
+ shell_settings->priv = G_TYPE_INSTANCE_GET_PRIVATE (
+ shell_settings, E_TYPE_SHELL_SETTINGS, EShellSettingsPrivate);
shell_settings->priv->value_array = value_array;
g_object_freeze_notify (G_OBJECT (shell_settings));
diff --git a/shell/e-shell-sidebar.c b/shell/e-shell-sidebar.c
index 1a9f7d7c22..d99e66ac61 100644
--- a/shell/e-shell-sidebar.c
+++ b/shell/e-shell-sidebar.c
@@ -397,7 +397,8 @@ e_shell_sidebar_init (EShellSidebar *shell_sidebar)
const GdkColor *color;
const gchar *icon_name;
- shell_sidebar->priv = G_TYPE_INSTANCE_GET_PRIVATE (shell_sidebar, E_TYPE_SHELL_SIDEBAR, EShellSidebarPrivate);
+ shell_sidebar->priv = G_TYPE_INSTANCE_GET_PRIVATE (
+ shell_sidebar, E_TYPE_SHELL_SIDEBAR, EShellSidebarPrivate);
gtk_widget_set_has_window (GTK_WIDGET (shell_sidebar), FALSE);
diff --git a/shell/e-shell-switcher.c b/shell/e-shell-switcher.c
index b1d896dee0..594862df8a 100644
--- a/shell/e-shell-switcher.c
+++ b/shell/e-shell-switcher.c
@@ -547,7 +547,8 @@ e_shell_switcher_class_init (EShellSwitcherClass *class)
static void
e_shell_switcher_init (EShellSwitcher *switcher)
{
- switcher->priv = G_TYPE_INSTANCE_GET_PRIVATE (switcher, E_TYPE_SHELL_SWITCHER, EShellSwitcherPrivate);
+ switcher->priv = G_TYPE_INSTANCE_GET_PRIVATE (
+ switcher, E_TYPE_SHELL_SWITCHER, EShellSwitcherPrivate);
gtk_widget_set_has_window (GTK_WIDGET (switcher), FALSE);
diff --git a/shell/e-shell-taskbar.c b/shell/e-shell-taskbar.c
index f4621fc780..c424d504c8 100644
--- a/shell/e-shell-taskbar.c
+++ b/shell/e-shell-taskbar.c
@@ -326,7 +326,8 @@ e_shell_taskbar_init (EShellTaskbar *shell_taskbar)
GtkWidget *widget;
gint height;
- shell_taskbar->priv = G_TYPE_INSTANCE_GET_PRIVATE (shell_taskbar, E_TYPE_SHELL_TASKBAR, EShellTaskbarPrivate);
+ shell_taskbar->priv = G_TYPE_INSTANCE_GET_PRIVATE (
+ shell_taskbar, E_TYPE_SHELL_TASKBAR, EShellTaskbarPrivate);
shell_taskbar->priv->proxy_table = g_hash_table_new (NULL, NULL);
gtk_box_set_spacing (GTK_BOX (shell_taskbar), 12);
diff --git a/shell/e-shell-view.c b/shell/e-shell-view.c
index 379b5ab528..43d843108d 100644
--- a/shell/e-shell-view.c
+++ b/shell/e-shell-view.c
@@ -1078,7 +1078,8 @@ e_shell_view_init (EShellView *shell_view,
size_group = gtk_size_group_new (GTK_SIZE_GROUP_VERTICAL);
- shell_view->priv = G_TYPE_INSTANCE_GET_PRIVATE (shell_view, E_TYPE_SHELL_VIEW, EShellViewPrivate);
+ shell_view->priv = G_TYPE_INSTANCE_GET_PRIVATE (
+ shell_view, E_TYPE_SHELL_VIEW, EShellViewPrivate);
shell_view->priv->state_key_file = g_key_file_new ();
shell_view->priv->size_group = size_group;
}
diff --git a/shell/e-shell-window.c b/shell/e-shell-window.c
index c62bd6411a..8c0258eb87 100644
--- a/shell/e-shell-window.c
+++ b/shell/e-shell-window.c
@@ -947,7 +947,8 @@ e_shell_window_alert_sink_init (EAlertSinkInterface *interface)
static void
e_shell_window_init (EShellWindow *shell_window)
{
- shell_window->priv = G_TYPE_INSTANCE_GET_PRIVATE (shell_window, E_TYPE_SHELL_WINDOW, EShellWindowPrivate);
+ shell_window->priv = G_TYPE_INSTANCE_GET_PRIVATE (
+ shell_window, E_TYPE_SHELL_WINDOW, EShellWindowPrivate);
e_shell_window_private_init (shell_window);
}
diff --git a/shell/e-shell.c b/shell/e-shell.c
index 79ca26cb1c..f3402dd101 100644
--- a/shell/e-shell.c
+++ b/shell/e-shell.c
@@ -1169,7 +1169,8 @@ e_shell_init (EShell *shell)
GtkIconTheme *icon_theme;
EggSMClient *sm_client;
- shell->priv = G_TYPE_INSTANCE_GET_PRIVATE (shell, E_TYPE_SHELL, EShellPrivate);
+ shell->priv = G_TYPE_INSTANCE_GET_PRIVATE (
+ shell, E_TYPE_SHELL, EShellPrivate);
backends_by_name = g_hash_table_new (g_str_hash, g_str_equal);
backends_by_scheme = g_hash_table_new (g_str_hash, g_str_equal);
diff --git a/shell/test/e-test-shell-backend.c b/shell/test/e-test-shell-backend.c
index 9e5f757490..a30cb8a7b5 100644
--- a/shell/test/e-test-shell-backend.c
+++ b/shell/test/e-test-shell-backend.c
@@ -178,7 +178,9 @@ test_shell_backend_class_init (ETestShellBackendClass *class)
static void
test_shell_backend_init (ETestShellBackend *test_shell_backend)
{
- test_shell_backend->priv = G_TYPE_INSTANCE_GET_PRIVATE (test_shell_backend, E_TYPE_TEST_SHELL_BACKEND, ETestShellBackendPrivate);
+ test_shell_backend->priv = G_TYPE_INSTANCE_GET_PRIVATE (
+ test_shell_backend, E_TYPE_TEST_SHELL_BACKEND,
+ ETestShellBackendPrivate);
}
GType
diff --git a/shell/test/e-test-shell-view.c b/shell/test/e-test-shell-view.c
index 7080009dd4..825e27fa37 100644
--- a/shell/test/e-test-shell-view.c
+++ b/shell/test/e-test-shell-view.c
@@ -123,7 +123,9 @@ test_shell_view_class_init (ETestShellViewClass *class,
static void
test_shell_view_init (ETestShellView *test_shell_view)
{
- test_shell_view->priv = G_TYPE_INSTANCE_GET_PRIVATE (test_shell_view, E_TYPE_TEST_SHELL_VIEW, ETestShellViewPrivate);
+ test_shell_view->priv = G_TYPE_INSTANCE_GET_PRIVATE (
+ test_shell_view, E_TYPE_TEST_SHELL_VIEW,
+ ETestShellViewPrivate);
}
GType