Don't use a hildon banner for map download progress, it's annoying.

diff --git a/src/map-download.c b/src/map-download.c
index d1860a577c8f2b70659c654a51acee8e5d0b21c4..9e80eaadc38f02cd0fff4d11b5e85cd384f17d04 100644 (file)
--- a/src/map-download.c
+++ b/src/map-download.c
@@ -430,24 +430,15 @@ else {
 g_tree_remove(_downloading_tree, pui);
 
 if (++_curr_download == _num_downloads) {
-#ifdef WITH_HILDON
-       gtk_widget_destroy(_download_banner);
-       _download_banner = NULL;
-#else
        _num_downloads = _curr_download = 0;
-       hildon_banner_set_fraction(HILDON_BANNER(_download_banner), 0.0);
+       gtk_progress_bar_set_fraction(_progress_item, 0.0);
        gtk_progress_bar_set_text(_progress_item, "");
-#endif
 } else {
        gchar buffer[64];
 
        g_snprintf(buffer, sizeof(buffer), _("Downloading maps (%d/%d)"), _curr_download, _num_downloads);
-#ifdef WITH_HILDON
-       hildon_banner_set_text(HILDON_BANNER(_download_banner), buffer);
-#else
        gtk_progress_bar_set_text(_progress_item, buffer);      
-#endif
-       hildon_banner_set_fraction(HILDON_BANNER(_download_banner), _curr_download / (double)_num_downloads);
+       gtk_progress_bar_set_fraction(_progress_item, _curr_download / (double)_num_downloads);
 }
 return FALSE;
 }
@@ -487,9 +478,8 @@ g_tree_insert(_pui_tree, pui, pui);
 if (iap_is_connected() && !_curl_sid)
        _curl_sid = g_timeout_add(100, (GSourceFunc) map_download_timeout, NULL);
 
-if (!_num_downloads++ && !_download_banner) {
-       _download_banner = hildon_banner_show_progress(_window, NULL, _("Downloading maps..."));
-}
+if (!_num_downloads++)
+       gtk_progress_bar_set_text(_progress_item, _("Downloading maps..."));    
 }
 
 void

diff --git a/src/ui-common.h b/src/ui-common.h
index 33a0f2ff1074aa7227e51b07639948b8df839637..5ced54439d6ad9659a26d679cb635ebfe8562d5e 100644 (file)
--- a/src/ui-common.h
+++ b/src/ui-common.h
@@ -106,7 +106,6 @@ GtkWidget *_cmenu_poi_add_way;
 GtkWidget *_cmenu_poi_goto_nearpoi;
 
 /* Banners/Progress bars */
-GtkWidget *_download_banner;
 GtkWidget *_status_bar;
 
 struct _info_banner {