Coverity fixes

[claws.git] / src / statusbar.c

diff --git a/src/statusbar.c b/src/statusbar.c
index a3e11e705a9bbc8f06202d26458a6dfc43c54f87..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-2007 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,12 +19,12 @@
 
 #ifdef HAVE_CONFIG_H
 #  include "config.h"
+#include "claws-features.h"
 #endif
 
 #include <glib.h>
 #include <glib/gi18n.h>
-#include <gtk/gtkstatusbar.h>
-#include <gtk/gtkprogressbar.h>
+#include <gtk/gtk.h>
 #include <stdarg.h>
 
 #include "mainwindow.h"
@@ -42,24 +42,26 @@ gint statusbar_puts_all_hook_id = -1;
 GtkWidget *statusbar_create(void)
 {
        GtkWidget *statusbar;
+       GtkWidget *child;
+       GtkWidget *parent;
+       GtkWidget *hbox;
 
        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);
-
-       gtk_widget_ref(GTK_STATUSBAR(statusbar)->label);
-       gtk_container_remove(GTK_CONTAINER(GTK_STATUSBAR(statusbar)->frame),
-               GTK_STATUSBAR(statusbar)->label);
-       gtk_widget_hide(GTK_STATUSBAR(statusbar)->frame);
-       gtk_box_pack_start (GTK_BOX(statusbar), GTK_STATUSBAR(statusbar)->label, 
-               TRUE, TRUE, 0);
-       gtk_widget_unref(GTK_STATUSBAR(statusbar)->label);
-       gtk_container_remove(GTK_CONTAINER(statusbar),
-               GTK_STATUSBAR(statusbar)->frame);
-       GTK_STATUSBAR(statusbar)->frame = gtk_frame_new(NULL);
+       child = gtk_statusbar_get_message_area(GTK_STATUSBAR(statusbar));
+       parent = gtk_widget_get_parent(child);
+       gtk_container_remove(GTK_CONTAINER(parent), g_object_ref(child));
+       hbox = gtk_hbox_new(FALSE, 0);
+       gtk_container_add(GTK_CONTAINER(parent), hbox);
+       gtk_widget_show(hbox);
+       gtk_box_pack_start(GTK_BOX(hbox), child, TRUE, TRUE, 0);
+       g_object_unref(child);  
 
        return statusbar;
 }
@@ -133,8 +135,8 @@ static gboolean statusbar_puts_all_hook (gpointer source, gpointer data)
 {
        LogText *logtext = (LogText *) source;
 
-       g_return_val_if_fail(logtext != NULL, TRUE);
-       g_return_val_if_fail(logtext->text != NULL, TRUE);
+       cm_return_val_if_fail(logtext != NULL, TRUE);
+       cm_return_val_if_fail(logtext->text != NULL, TRUE);
 
        statusbar_pop_all();
        if (logtext->type == LOG_NORMAL) {
@@ -160,18 +162,26 @@ void statusbar_verbosity_set(gboolean verbose)
 
 void statusbar_progress_all (gint done, gint total, gint step) 
 {
+       GtkProgressBar *progressbar = GTK_PROGRESS_BAR(
+                                       mainwindow_get_mainwindow()->progressbar);
        gchar buf[32];
+       
        if (total && done % step == 0) {
-               g_snprintf(buf, sizeof(buf), "%d / %d", done, total);
-               gtk_progress_bar_set_text
-                       (GTK_PROGRESS_BAR(mainwindow_get_mainwindow()->progressbar), buf);
-               gtk_progress_bar_set_fraction
-                       (GTK_PROGRESS_BAR(mainwindow_get_mainwindow()->progressbar),
-                        (total == 0) ? 0 : (gfloat)done / (gfloat)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,
+                        (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
-                       (GTK_PROGRESS_BAR(mainwindow_get_mainwindow()->progressbar), "");
-               gtk_progress_bar_set_fraction
-                       (GTK_PROGRESS_BAR(mainwindow_get_mainwindow()->progressbar), 0.0);
+               gtk_progress_bar_set_text(progressbar, "");
+               gtk_progress_bar_set_fraction(progressbar, 0.0);
+               gtk_widget_hide(GTK_WIDGET(progressbar));
        }
 }