diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2011-11-18 22:09:48 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2011-11-23 03:50:09 +0800 |
| commit | 0c83b9b25d967ce6d6793ef851e86bc272a2f129 (patch) | |
| tree | d97a5083bd6a03c273f744a60b56205dcf2befaf /shell | |
| parent | c75f58d01bb7bbe139cd73a85894dc5f50185816 (diff) | |
| download | gsoc2013-evolution-0c83b9b25d967ce6d6793ef851e86bc272a2f129.tar gsoc2013-evolution-0c83b9b25d967ce6d6793ef851e86bc272a2f129.tar.gz gsoc2013-evolution-0c83b9b25d967ce6d6793ef851e86bc272a2f129.tar.bz2 gsoc2013-evolution-0c83b9b25d967ce6d6793ef851e86bc272a2f129.tar.lz gsoc2013-evolution-0c83b9b25d967ce6d6793ef851e86bc272a2f129.tar.xz gsoc2013-evolution-0c83b9b25d967ce6d6793ef851e86bc272a2f129.tar.zst gsoc2013-evolution-0c83b9b25d967ce6d6793ef851e86bc272a2f129.zip | |
Miscellaneous cleanups.
Diffstat (limited to 'shell')
| -rw-r--r-- | shell/e-shell-settings.c | 4 | ||||
| -rw-r--r-- | shell/e-shell.c | 11 |
2 files changed, 10 insertions, 5 deletions
diff --git a/shell/e-shell-settings.c b/shell/e-shell-settings.c index 0fd8d105e1..11d8eca3ad 100644 --- a/shell/e-shell-settings.c +++ b/shell/e-shell-settings.c @@ -365,7 +365,9 @@ e_shell_settings_install_property_for_key (const gchar *property_name, shell_settings = E_SHELL_SETTINGS (iter->data); - g_settings_bind (settings, key, G_OBJECT (shell_settings), property_name, G_SETTINGS_BIND_DEFAULT); + g_settings_bind ( + settings, key, G_OBJECT (shell_settings), + property_name, G_SETTINGS_BIND_DEFAULT); } for (iter = instances; iter != NULL; iter = next) { diff --git a/shell/e-shell.c b/shell/e-shell.c index ccc57f825c..cc1591337f 100644 --- a/shell/e-shell.c +++ b/shell/e-shell.c @@ -46,6 +46,10 @@ #include "e-shell-window.h" #include "e-shell-utils.h" +#define E_SHELL_GET_PRIVATE(obj) \ + (G_TYPE_INSTANCE_GET_PRIVATE \ + ((obj), E_TYPE_SHELL, EShellPrivate)) + struct _EShellPrivate { GQueue alerts; EShellSettings *settings; @@ -693,7 +697,7 @@ shell_dispose (GObject *object) EShellPrivate *priv; EAlert *alert; - priv = E_SHELL (object)->priv; + priv = E_SHELL_GET_PRIVATE (object); while ((alert = g_queue_pop_head (&priv->alerts)) != NULL) { g_signal_handlers_disconnect_by_func ( @@ -747,7 +751,7 @@ shell_finalize (GObject *object) { EShellPrivate *priv; - priv = E_SHELL (object)->priv; + priv = E_SHELL_GET_PRIVATE (object); g_hash_table_destroy (priv->backends_by_name); g_hash_table_destroy (priv->backends_by_scheme); @@ -1162,8 +1166,7 @@ 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 = E_SHELL_GET_PRIVATE (shell); 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); |