aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEttore Perazzoli <ettore@src.gnome.org>2002-07-12 05:28:24 +0800
committerEttore Perazzoli <ettore@src.gnome.org>2002-07-12 05:28:24 +0800
commit583f8ba770418d53c134fe4004d1f89e3880f466 (patch)
tree451ae6d19538f1db58547b6bbd89e88e5bb05d2f
parente8e6da16764e24d4137c16ae1009a9be701ddfaa (diff)
downloadgsoc2013-evolution-583f8ba770418d53c134fe4004d1f89e3880f466.tar
gsoc2013-evolution-583f8ba770418d53c134fe4004d1f89e3880f466.tar.gz
gsoc2013-evolution-583f8ba770418d53c134fe4004d1f89e3880f466.tar.bz2
gsoc2013-evolution-583f8ba770418d53c134fe4004d1f89e3880f466.tar.lz
gsoc2013-evolution-583f8ba770418d53c134fe4004d1f89e3880f466.tar.xz
gsoc2013-evolution-583f8ba770418d53c134fe4004d1f89e3880f466.tar.zst
gsoc2013-evolution-583f8ba770418d53c134fe4004d1f89e3880f466.zip
Allow a NULL icon [remove the precondition].
* e-shell-folder-title-bar.c (e_shell_folder_title_bar_set_icon): Allow a NULL icon [remove the precondition]. * e-shell-view.c (update_folder_title_bar): Only unref the folder_icon if not NULL. svn path=/trunk/; revision=17426
-rw-r--r--shell/ChangeLog8
-rw-r--r--shell/e-shell-folder-title-bar.c2
-rw-r--r--shell/e-shell-view.c8
3 files changed, 13 insertions, 5 deletions
diff --git a/shell/ChangeLog b/shell/ChangeLog
index cb1478b7c2..817efda21a 100644
--- a/shell/ChangeLog
+++ b/shell/ChangeLog
@@ -1,5 +1,13 @@
2002-07-11 Ettore Perazzoli <ettore@ximian.com>
+ * e-shell-folder-title-bar.c (e_shell_folder_title_bar_set_icon):
+ Allow a NULL icon [remove the precondition].
+
+ * e-shell-view.c (update_folder_title_bar): Only unref the
+ folder_icon if not NULL.
+
+2002-07-11 Ettore Perazzoli <ettore@ximian.com>
+
* evolution-storage-set-view.c
(impl_StorageSetView__set_checkedFolders): Handle
Folder.evolutionUri as a URI, not as a path. Also use
diff --git a/shell/e-shell-folder-title-bar.c b/shell/e-shell-folder-title-bar.c
index f1fef8c68b..c3750f8cdc 100644
--- a/shell/e-shell-folder-title-bar.c
+++ b/shell/e-shell-folder-title-bar.c
@@ -689,8 +689,6 @@ e_shell_folder_title_bar_set_icon (EShellFolderTitleBar *folder_title_bar,
GdkPixmap *pixmap;
GdkBitmap *mask;
- g_return_if_fail (icon != NULL);
-
g_return_if_fail (folder_title_bar != NULL);
g_return_if_fail (E_IS_SHELL_FOLDER_TITLE_BAR (folder_title_bar));
diff --git a/shell/e-shell-view.c b/shell/e-shell-view.c
index 8a717bcaf9..a06e8eeabd 100644
--- a/shell/e-shell-view.c
+++ b/shell/e-shell-view.c
@@ -1785,7 +1785,11 @@ update_folder_title_bar (EShellView *shell_view,
}
}
- e_shell_folder_title_bar_set_icon (E_SHELL_FOLDER_TITLE_BAR (priv->folder_title_bar), folder_icon);
+ e_shell_folder_title_bar_set_icon (E_SHELL_FOLDER_TITLE_BAR (priv->folder_title_bar),
+ folder_icon);
+
+ if (folder_icon != NULL)
+ gdk_pixbuf_unref (folder_icon);
if (title != NULL) {
char *s;
@@ -1794,8 +1798,6 @@ 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