diff options
| author | Matthew Barnes <mbarnes@src.gnome.org> | 2008-08-23 23:36:32 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@src.gnome.org> | 2008-08-23 23:36:32 +0800 |
| commit | fd6cd9e3a6dc06f9b8e44ec13ac881ebd6793e6e (patch) | |
| tree | e97b9ea12c3007cee5933246893d18a63461ce3a /shell/e-sidebar.c | |
| parent | 036bb44de80f86a9fa5d92ce9e8848332f2a9cd2 (diff) | |
| download | gsoc2013-evolution-fd6cd9e3a6dc06f9b8e44ec13ac881ebd6793e6e.tar gsoc2013-evolution-fd6cd9e3a6dc06f9b8e44ec13ac881ebd6793e6e.tar.gz gsoc2013-evolution-fd6cd9e3a6dc06f9b8e44ec13ac881ebd6793e6e.tar.bz2 gsoc2013-evolution-fd6cd9e3a6dc06f9b8e44ec13ac881ebd6793e6e.tar.lz gsoc2013-evolution-fd6cd9e3a6dc06f9b8e44ec13ac881ebd6793e6e.tar.xz gsoc2013-evolution-fd6cd9e3a6dc06f9b8e44ec13ac881ebd6793e6e.tar.zst gsoc2013-evolution-fd6cd9e3a6dc06f9b8e44ec13ac881ebd6793e6e.zip | |
Progress update:
- Discard libnm-glib method of monitoring network connectivity.
- Decided to make EShell a singleton GObject after all. Makes the
design cleaner, despite having to pass a singleton instance around.
- Make the switcher button style persistent.
svn path=/branches/kill-bonobo/; revision=36043
Diffstat (limited to 'shell/e-sidebar.c')
| -rw-r--r-- | shell/e-sidebar.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/shell/e-sidebar.c b/shell/e-sidebar.c index db5134fb79..6c773a76de 100644 --- a/shell/e-sidebar.c +++ b/shell/e-sidebar.c @@ -27,8 +27,6 @@ #define H_PADDING 6 #define V_PADDING 6 -#define DEFAULT_TOOLBAR_STYLE GTK_TOOLBAR_BOTH_HORIZ - struct _ESidebarPrivate { GList *proxies; gboolean actions_visible; @@ -451,7 +449,7 @@ sidebar_class_init (ESidebarClass *class) NULL, NULL, GTK_TYPE_TOOLBAR_STYLE, - DEFAULT_TOOLBAR_STYLE, + E_SIDEBAR_DEFAULT_TOOLBAR_STYLE, G_PARAM_CONSTRUCT | G_PARAM_READWRITE)); @@ -575,7 +573,8 @@ e_sidebar_set_actions_visible (ESidebar *sidebar, GtkToolbarStyle e_sidebar_get_style (ESidebar *sidebar) { - g_return_val_if_fail (E_IS_SIDEBAR (sidebar), DEFAULT_TOOLBAR_STYLE); + g_return_val_if_fail ( + E_IS_SIDEBAR (sidebar), E_SIDEBAR_DEFAULT_TOOLBAR_STYLE); return sidebar->priv->style; } @@ -605,7 +604,7 @@ e_sidebar_unset_style (ESidebar *sidebar) if (settings != NULL) g_object_get (settings, "gtk-toolbar-style", &style, NULL); else - style = DEFAULT_TOOLBAR_STYLE; + style = E_SIDEBAR_DEFAULT_TOOLBAR_STYLE; if (style == GTK_TOOLBAR_BOTH) style = GTK_TOOLBAR_BOTH_HORIZ; |