From: Marco Pesenti Gritti Date: Tue, 10 May 2005 16:01:08 +0000 (+0000) Subject: Update label when connecting proxy. Fix a warning with NULL page_cache. X-Git-Tag: EVINCE_0_3_1~38 X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=commitdiff_plain;h=5112457d6c321bde178c3577eb37bd0ee62bc209;p=evince.git Update label when connecting proxy. Fix a warning with NULL page_cache. 2005-05-10 Marco Pesenti Gritti * shell/ev-page-action.c: (update_pages_label), (connect_proxy): Update label when connecting proxy. Fix a warning with NULL page_cache. --- diff --git a/ChangeLog b/ChangeLog index 3906c701..af010f72 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2005-05-10 Marco Pesenti Gritti + + * shell/ev-page-action.c: (update_pages_label), (connect_proxy): + + Update label when connecting proxy. Fix a warning with NULL + page_cache. + 2005-05-10 Marco Pesenti Gritti * data/evince-ui.xml: diff --git a/shell/ev-page-action.c b/shell/ev-page-action.c index 8ba9d77b..2eed3763 100644 --- a/shell/ev-page-action.c +++ b/shell/ev-page-action.c @@ -132,7 +132,7 @@ update_pages_label (EvPageActionWidget *proxy, gint n_pages; n_pages = page_cache ? ev_page_cache_get_n_pages (page_cache) : 0; - if (ev_page_cache_has_nonnumeric_page_labels (page_cache)) { + if (page_cache && ev_page_cache_has_nonnumeric_page_labels (page_cache)) { label_text = g_strdup_printf (_("(%d of %d)"), page + 1, n_pages); } else { label_text = g_strdup_printf (_("of %d"), n_pages); @@ -429,6 +429,8 @@ connect_proxy (GtkAction *action, GtkWidget *proxy) g_signal_connect_object (action, "notify::page-cache", G_CALLBACK (update_page_cache), proxy, 0); + update_page_cache (EV_PAGE_ACTION (action), NULL, + EV_PAGE_ACTION_WIDGET (proxy)); /* We only go through this whole rigmarole if we can set * GtkEntryCompletion::popup-set-width, which appeared in * GTK+-2.7.0 */