Coverity fixes

[claws.git] / src / statusbar.c

diff --git a/src/statusbar.c b/src/statusbar.c
index bb419b9243ccd946ea45dd625499f72db0aac7a6..4ced87f329cc0923746b2a14df119a15e9af6036 100644 (file)
--- a/src/statusbar.c
+++ b/src/statusbar.c
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2009 Hiroyuki Yamamoto and the Claws Mail team
+ * Copyright (C) 1999-2013 Hiroyuki Yamamoto and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -19,6 +19,7 @@
 
 #ifdef HAVE_CONFIG_H
 #  include "config.h"
+#include "claws-features.h"
 #endif
 
 #include <glib.h>
@@ -33,15 +34,6 @@
 #include "log.h"
 #include "hooks.h"
 
-#ifdef MAEMO
-#ifdef CHINOOK
-#include <hildon/hildon-banner.h>
-#else
-#include <hildon-widgets/hildon-banner.h>
-#endif
-#endif
-
-
 #define BUFFSIZE 1024
 
 static GList *statusbar_list = NULL;
@@ -57,14 +49,12 @@ GtkWidget *statusbar_create(void)
        statusbar = gtk_statusbar_new();
        gtk_widget_set_size_request(statusbar, 1, -1);
        statusbar_list = g_list_append(statusbar_list, statusbar);
+#if !GTK_CHECK_VERSION(3, 0, 0)
        gtk_statusbar_set_has_resize_grip(GTK_STATUSBAR(statusbar), 
                                          FALSE);
+#endif
        gtk_container_set_border_width(GTK_CONTAINER(statusbar), 1);
-#if GTK_CHECK_VERSION (2, 19, 1)
        child = gtk_statusbar_get_message_area(GTK_STATUSBAR(statusbar));
-#else
-       child = GTK_STATUSBAR(statusbar)->label;
-#endif
        parent = gtk_widget_get_parent(child);
        gtk_container_remove(GTK_CONTAINER(parent), g_object_ref(child));
        hbox = gtk_hbox_new(FALSE, 0);
@@ -115,69 +105,6 @@ void statusbar_print(GtkStatusbar *statusbar, const gchar *format, ...)
        statusbar_puts(statusbar, buf);
 }
 
-#ifdef MAEMO
-static GSList *banner_texts = NULL;
-static GtkWidget *banner = NULL;
-void statuswindow_print_all(const gchar *format, ...)
-{
-       va_list args;
-       gchar buf[BUFFSIZE];
-       GList *cur;
-
-       va_start(args, format);
-       g_vsnprintf(buf, sizeof(buf), format, args);
-       va_end(args);
-
-       for (cur = statusbar_list; cur != NULL; cur = cur->next)
-               statusbar_puts(GTK_STATUSBAR(cur->data), buf);
-       if (mainwindow_get_mainwindow()) {
-               if (banner != NULL) {
-                       gchar *last_text = (gchar *)banner_texts->data;
-                       if (!strcmp2(last_text, buf))
-                               return;
-               }
-               statusbar_pop_all();
-               if (banner == NULL) {
-                       banner = hildon_banner_show_animation(
-                               mainwindow_get_mainwindow()->window,
-                               NULL,
-                               buf);
-                       g_object_ref(banner);
-                       banner_texts = g_slist_prepend(banner_texts, g_strdup(buf));
-               } else {
-                       hildon_banner_set_text(HILDON_BANNER(banner), buf);
-                       banner_texts = g_slist_prepend(banner_texts, g_strdup(buf));
-               }
-       }
-}
-
-void statuswindow_pop_all(void)
-{
-       GList *cur;
-       gint cid;
-
-       for (cur = statusbar_list; cur != NULL; cur = cur->next) {
-               cid = gtk_statusbar_get_context_id(GTK_STATUSBAR(cur->data),
-                                                  "Standard Output");
-               gtk_statusbar_pop(GTK_STATUSBAR(cur->data), cid);
-       }
-       if (banner && banner_texts) {
-               gchar *old_text = (gchar *)banner_texts->data;
-               gchar *prev_text = NULL;
-               banner_texts = g_slist_remove(banner_texts, old_text);  
-               g_free(old_text);
-               if (banner_texts) {
-                       prev_text = (gchar *)banner_texts->data;
-                       hildon_banner_set_text(HILDON_BANNER(banner), prev_text);
-               } else {
-                       gtk_widget_destroy(banner);
-                       g_object_unref(banner);
-                       banner = NULL;
-               }
-       }
-}
-#endif
-
 void statusbar_print_all(const gchar *format, ...)
 {
        va_list args;
@@ -240,11 +167,17 @@ void statusbar_progress_all (gint done, gint total, gint step)
        gchar buf[32];
        
        if (total && done % step == 0) {
-               g_snprintf(buf, sizeof(buf), "%d / %d", done, total);
+#ifdef GENERIC_UMPC
+               /* use a more compact format */
+               const gchar *format = "%d/%d";
+#else
+               const gchar *format = "%d / %d";
+#endif
+               g_snprintf(buf, sizeof(buf), format, done, total);
                gtk_progress_bar_set_text(progressbar, buf);
                gtk_progress_bar_set_fraction(progressbar,
-                        (total == 0) ? 0 : (gfloat)done / (gfloat)total);
-               if (!gtkut_widget_get_visible(GTK_WIDGET(progressbar)))
+                        (gfloat)done / (gfloat)total);
+               if (!gtk_widget_get_visible(GTK_WIDGET(progressbar)))
                        gtk_widget_show(GTK_WIDGET(progressbar));
        } else if (total == 0) {
                gtk_progress_bar_set_text(progressbar, "");