Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
path: root/shell/ev-window-title.c
diff options
context:
space:
mode:
authorMarco Pesenti Gritti <mpg@redhat.com>2005-09-19 10:39:13 (GMT)
committer Marco Pesenti Gritti <marco@src.gnome.org>2005-09-19 10:39:13 (GMT)
commitea7ab15dc184f23fad8b853cbd227b39356c3732 (patch)
tree24ce8e8654057be69fd2ee8cb848e3a9f1e69c5a /shell/ev-window-title.c
parent426a0b4f666543070ea20e2d784f2ea300fcd72a (diff)
Missing null check
2005-09-19 Marco Pesenti Gritti <mpg@redhat.com> * shell/ev-window-title.c: (ev_window_title_set_document): Missing null check
Diffstat (limited to 'shell/ev-window-title.c')
-rw-r--r--shell/ev-window-title.c32
1 files changed, 16 insertions, 16 deletions
diff --git a/shell/ev-window-title.c b/shell/ev-window-title.c
index 787c585..cfa013e 100644
--- a/shell/ev-window-title.c
+++ b/shell/ev-window-title.c
@@ -122,25 +122,25 @@ ev_window_title_set_document (EvWindowTitle *window_title,
window_title->title = g_strdup (title);
}
- /* Some docs report titles with confusing extensions (ex. .doc for pdf).
- Let's show the filename in this case */
- for (i = 0; i < G_N_ELEMENTS (bad_extensions); i++) {
- if (bad_extensions[i].backend == ev_document_factory_get_backend (document) &&
- g_str_has_suffix (window_title->title, bad_extensions[i].ext)) {
- char *new_title;
- char *filename = get_filename_from_uri (uri);
-
- new_title = g_strdup_printf ("%s (%s)", window_title->title, filename);
- g_free (window_title->title);
- window_title->title = new_title;
-
- g_free (filename);
- }
- }
-
if (window_title->title) {
char *p;
+ /* Some docs report titles with confusing extensions (ex. .doc for pdf).
+ Let's show the filename in this case */
+ for (i = 0; i < G_N_ELEMENTS (bad_extensions); i++) {
+ if (bad_extensions[i].backend == ev_document_factory_get_backend (document) &&
+ g_str_has_suffix (window_title->title, bad_extensions[i].ext)) {
+ char *new_title;
+ char *filename = get_filename_from_uri (uri);
+
+ new_title = g_strdup_printf ("%s (%s)", window_title->title, filename);
+ g_free (window_title->title);
+ window_title->title = new_title;
+
+ g_free (filename);
+ }
+ }
+
for (p = window_title->title; *p; ++p) {
/* an '\n' byte is always ASCII, no need for UTF-8 special casing */
if (*p == '\n')