diff options
| author | Kjartan Maraas <kmaraas@gnome.org> | 2011-02-09 00:57:50 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2011-02-09 00:57:50 +0800 |
| commit | 2c31a5bc23cf5a092c0621bf34554ffb2b6ae2ec (patch) | |
| tree | e311c2818c68f66126ee6879abd4a080b4b7ad6f /shell | |
| parent | eef8eda70ed8f716eeaae7dd8d9c81640b0dd4f8 (diff) | |
| download | gsoc2013-evolution-2c31a5bc23cf5a092c0621bf34554ffb2b6ae2ec.tar gsoc2013-evolution-2c31a5bc23cf5a092c0621bf34554ffb2b6ae2ec.tar.gz gsoc2013-evolution-2c31a5bc23cf5a092c0621bf34554ffb2b6ae2ec.tar.bz2 gsoc2013-evolution-2c31a5bc23cf5a092c0621bf34554ffb2b6ae2ec.tar.lz gsoc2013-evolution-2c31a5bc23cf5a092c0621bf34554ffb2b6ae2ec.tar.xz gsoc2013-evolution-2c31a5bc23cf5a092c0621bf34554ffb2b6ae2ec.tar.zst gsoc2013-evolution-2c31a5bc23cf5a092c0621bf34554ffb2b6ae2ec.zip | |
Bug 641756 - Fix warnings from GCC 4.6
GCC learned how to find dead assignments.
Diffstat (limited to 'shell')
| -rw-r--r-- | shell/e-shell-sidebar.c | 17 | ||||
| -rw-r--r-- | shell/e-shell-utils.c | 4 |
2 files changed, 7 insertions, 14 deletions
diff --git a/shell/e-shell-sidebar.c b/shell/e-shell-sidebar.c index 3e60096fc8..b8ee23b6d0 100644 --- a/shell/e-shell-sidebar.c +++ b/shell/e-shell-sidebar.c @@ -221,24 +221,21 @@ shell_sidebar_constructed (GObject *object) static void shell_sidebar_get_preferred_width (GtkWidget *widget, - gint *minimum, - gint *natural) + gint *minimum, + gint *natural) { - EShellSidebarPrivate *priv; GtkWidget *child; - priv = E_SHELL_SIDEBAR_GET_PRIVATE (widget); - child = gtk_bin_get_child (GTK_BIN (widget)); gtk_widget_get_preferred_width (child, minimum, natural); - /* do not use priv->event_box here, otherwise it'll not ellipsize */ + /* Do not use priv->event_box here, otherwise it won't ellipsize. */ } static void shell_sidebar_get_preferred_height (GtkWidget *widget, - gint *minimum, - gint *natural) + gint *minimum, + gint *natural) { EShellSidebarPrivate *priv; gint child_min, child_nat; @@ -252,8 +249,8 @@ shell_sidebar_get_preferred_height (GtkWidget *widget, child = priv->event_box; gtk_widget_get_preferred_height (child, &child_min, &child_nat); - *minimum += child_min; - *natural += child_nat; + *minimum += child_min; + *natural += child_nat; } static void diff --git a/shell/e-shell-utils.c b/shell/e-shell-utils.c index 9d2d4ca584..e5cd6c5546 100644 --- a/shell/e-shell-utils.c +++ b/shell/e-shell-utils.c @@ -44,13 +44,9 @@ void e_shell_configure_ui_manager (EShell *shell, EUIManager *ui_manager) { - EShellSettings *shell_settings; - g_return_if_fail (E_IS_SHELL (shell)); g_return_if_fail (E_IS_UI_MANAGER (ui_manager)); - shell_settings = e_shell_get_shell_settings (shell); - g_object_bind_property ( shell, "express-mode", ui_manager, "express-mode", |