From c003c99a75587ba39a45d164272760c33f9666b5 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Fri, 25 Feb 2011 16:20:41 +0100 Subject: Bug #614480 - Avoid using G_TYPE_INSTANCE_GET_PRIVATE repeatedly --- shell/e-shell-backend.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) (limited to 'shell/e-shell-backend.c') diff --git a/shell/e-shell-backend.c b/shell/e-shell-backend.c index c2abb470a2..cd672842f1 100644 --- a/shell/e-shell-backend.c +++ b/shell/e-shell-backend.c @@ -37,10 +37,6 @@ #include "e-shell.h" #include "e-shell-view.h" -#define E_SHELL_BACKEND_GET_PRIVATE(obj) \ - (G_TYPE_INSTANCE_GET_PRIVATE \ - ((obj), E_TYPE_SHELL_BACKEND, EShellBackendPrivate)) - struct _EShellBackendPrivate { /* We keep a reference to corresponding EShellView subclass @@ -171,7 +167,7 @@ shell_backend_dispose (GObject *object) { EShellBackendPrivate *priv; - priv = E_SHELL_BACKEND_GET_PRIVATE (object); + priv = E_SHELL_BACKEND (object)->priv; if (priv->shell_view_class != NULL) { g_type_class_unref (priv->shell_view_class); @@ -187,7 +183,7 @@ shell_backend_finalize (GObject *object) { EShellBackendPrivate *priv; - priv = E_SHELL_BACKEND_GET_PRIVATE (object); + priv = E_SHELL_BACKEND (object)->priv; g_warn_if_fail (g_queue_is_empty (priv->activities)); g_queue_free (priv->activities); @@ -294,7 +290,7 @@ e_shell_backend_class_init (EShellBackendClass *class) static void e_shell_backend_init (EShellBackend *shell_backend) { - shell_backend->priv = E_SHELL_BACKEND_GET_PRIVATE (shell_backend); + shell_backend->priv = G_TYPE_INSTANCE_GET_PRIVATE (shell_backend, E_TYPE_SHELL_BACKEND, EShellBackendPrivate); shell_backend->priv->activities = g_queue_new (); } -- cgit v1.2.3 From 3f746c4a55779d784dd48317a0305b131b0ad771 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Fri, 4 Mar 2011 10:00:26 +0100 Subject: Do not flush Outbox when mail shell backend not started --- shell/e-shell-backend.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) (limited to 'shell/e-shell-backend.c') diff --git a/shell/e-shell-backend.c b/shell/e-shell-backend.c index cd672842f1..03acc0ef04 100644 --- a/shell/e-shell-backend.c +++ b/shell/e-shell-backend.c @@ -507,6 +507,21 @@ e_shell_backend_start (EShellBackend *shell_backend) shell_backend->priv->started = TRUE; } +/** + * e_shell_backend_is_started: + * @shell_backend: an #EShellBackend + * + * Returns whether was shelll_backend already started, by + * calling e_shell_backend_start(). + **/ +gboolean +e_shell_backend_is_started (EShellBackend *shell_backend) +{ + g_return_val_if_fail (E_IS_SHELL_BACKEND (shell_backend), FALSE); + + return shell_backend->priv->started; +} + /** * e_shell_backend_migrate: * @shell_backend: an #EShellBackend -- cgit v1.2.3 From 7aacf983b32ecac26bc9707697da622b3ef164a3 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sat, 5 Mar 2011 12:33:49 -0500 Subject: Coding style and whitespace cleanup. --- shell/e-shell-backend.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'shell/e-shell-backend.c') 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 (); } -- cgit v1.2.3 From c24038c4f62f37b89d1bda9542ca5ccc843d4ea0 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Fri, 27 May 2011 15:23:07 +0200 Subject: Bug #646109 - Fix use of include to make sure translations work --- shell/e-shell-backend.c | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'shell/e-shell-backend.c') diff --git a/shell/e-shell-backend.c b/shell/e-shell-backend.c index b1dadce99d..d8af58c6b3 100644 --- a/shell/e-shell-backend.c +++ b/shell/e-shell-backend.c @@ -27,6 +27,10 @@ * @include: shell/e-shell-backend.h **/ +#ifdef HAVE_CONFIG_H +#include +#endif + #include "e-shell-backend.h" #include -- cgit v1.2.3 From e64d6fe05c30c2cc1d7625a202afba3ba2da07cd Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Tue, 22 Nov 2011 18:22:14 -0500 Subject: Miscellaneous cleanups. --- shell/e-shell-backend.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'shell/e-shell-backend.c') diff --git a/shell/e-shell-backend.c b/shell/e-shell-backend.c index d8af58c6b3..e5700d4b2c 100644 --- a/shell/e-shell-backend.c +++ b/shell/e-shell-backend.c @@ -41,6 +41,10 @@ #include "e-shell.h" #include "e-shell-view.h" +#define E_SHELL_BACKEND_GET_PRIVATE(obj) \ + (G_TYPE_INSTANCE_GET_PRIVATE \ + ((obj), E_TYPE_SHELL_BACKEND, EShellBackendPrivate)) + struct _EShellBackendPrivate { /* We keep a reference to corresponding EShellView subclass @@ -171,7 +175,7 @@ shell_backend_dispose (GObject *object) { EShellBackendPrivate *priv; - priv = E_SHELL_BACKEND (object)->priv; + priv = E_SHELL_BACKEND_GET_PRIVATE (object); if (priv->shell_view_class != NULL) { g_type_class_unref (priv->shell_view_class); @@ -187,7 +191,7 @@ shell_backend_finalize (GObject *object) { EShellBackendPrivate *priv; - priv = E_SHELL_BACKEND (object)->priv; + priv = E_SHELL_BACKEND_GET_PRIVATE (object); g_warn_if_fail (g_queue_is_empty (priv->activities)); g_queue_free (priv->activities); @@ -294,8 +298,7 @@ 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 = E_SHELL_BACKEND_GET_PRIVATE (shell_backend); shell_backend->priv->activities = g_queue_new (); } -- cgit v1.2.3