aboutsummaryrefslogtreecommitdiffstats
path: root/shell/e-shell-view.c
diff options
context:
space:
mode:
authorEttore Perazzoli <ettore@src.gnome.org>2002-07-12 03:28:00 +0800
committerEttore Perazzoli <ettore@src.gnome.org>2002-07-12 03:28:00 +0800
commit88c6bf4d473d73c03000621f69a16c9c8617cd5b (patch)
tree626dda8d19f42d3e20ef7ba9aa87821e78d62cf4 /shell/e-shell-view.c
parent96d94fc6708215dc1a7d3fa3d1c8324446e0d95c (diff)
downloadgsoc2013-evolution-88c6bf4d473d73c03000621f69a16c9c8617cd5b.tar.gz
gsoc2013-evolution-88c6bf4d473d73c03000621f69a16c9c8617cd5b.tar.zst
gsoc2013-evolution-88c6bf4d473d73c03000621f69a16c9c8617cd5b.zip
Remove some `#if 0'ed broken code. New members title_icon and
* e-shell-folder-title-bar.c: Remove some `#if 0'ed broken code. New members title_icon and title_button_icon in struct EShellFolderTitleBarPrivate. Remove member icon_widget. New static global variable empty_pixbuf. (init): Initialize these new members to NULL. Don't initialize icon_widget anymore since it's gone. (e_shell_folder_title_bar_construct): Create the title_button_icon and pack it into the title_button_hbox. Also, create the title_icon and pack that one as well. Retouched some of the hardcoded padding values. (size_allocate_icon): Rewritten to use the title_icon and return the allocated space like size_allocate_navigation_buttons. (e_shell_folder_title_bar_set_icon): Remove bogus const from the @icon arg. Ref the pixbuf, and update the two pixmap widgets from it. If @icon is NULL, use the empty_pixbuf. (impl_destroy): Renamed from destroy(). (realize): Removed. (unrealize): Removed. (impl_size_allocate): Renamed from size_allocate(). (class_init): Call it. (add_icon_widget): Removed. (new_empty_pixbuf): New. (new_empty_pixmap_widget): New. (size_allocate_navigation_buttons_and_title_icon): Renamed from size_allocate_navigation_buttons; set up the title_icon too. * e-shell-view.c (update_folder_title_bar): Unref the folder_icon after using it. * e-icon-factory.c (e_icon_factory_get_icon): Ref the returned pixbuf. svn path=/trunk/; revision=17419
Diffstat (limited to 'shell/e-shell-view.c')
-rw-r--r--shell/e-shell-view.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/shell/e-shell-view.c b/shell/e-shell-view.c
index be8a3ba77b..b93984e56f 100644
--- a/shell/e-shell-view.c
+++ b/shell/e-shell-view.c
@@ -1793,6 +1793,8 @@ update_folder_title_bar (EShellView *shell_view,
e_shell_folder_title_bar_set_title (E_SHELL_FOLDER_TITLE_BAR (priv->folder_title_bar), s);
g_free (s);
}
+
+ gdk_pixbuf_unref (folder_icon);
}
static void