remove all gtk3 conditionals

[claws.git] / src / statusbar.c

diff --git a/src/statusbar.c b/src/statusbar.c
index 3d826b97226931f68d6059e6aa0812e30eedce25..3cc4511d19ed143891d087541cd7d26a80d5e18f 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-2012 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
@@ -34,19 +34,10 @@
 #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;
-gint statusbar_puts_all_hook_id = -1;
+static gulong statusbar_puts_all_hook_id = HOOK_NONE;
 
 GtkWidget *statusbar_create(void)
 {
@@ -56,12 +47,9 @@ GtkWidget *statusbar_create(void)
        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);
        child = gtk_statusbar_get_message_area(GTK_STATUSBAR(statusbar));
        parent = gtk_widget_get_parent(child);
@@ -114,69 +102,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;
@@ -222,12 +147,12 @@ static gboolean statusbar_puts_all_hook (gpointer source, gpointer data)
 
 void statusbar_verbosity_set(gboolean verbose)
 {
-       if (verbose && (statusbar_puts_all_hook_id == -1)) {
+       if (verbose && (statusbar_puts_all_hook_id == HOOK_NONE)) {
                statusbar_puts_all_hook_id =
                        hooks_register_hook(LOG_APPEND_TEXT_HOOKLIST, statusbar_puts_all_hook, NULL);
-       } else if (!verbose && (statusbar_puts_all_hook_id != -1)) {
+       } else if (!verbose && (statusbar_puts_all_hook_id != HOOK_NONE)) {
                hooks_unregister_hook(LOG_APPEND_TEXT_HOOKLIST, statusbar_puts_all_hook_id);
-               statusbar_puts_all_hook_id = -1;
+               statusbar_puts_all_hook_id = HOOK_NONE;
                statusbar_pop_all();
        }
 }
@@ -248,7 +173,7 @@ void statusbar_progress_all (gint done, gint total, gint step)
                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);
+                        (gfloat)done / (gfloat)total);
                if (!gtk_widget_get_visible(GTK_WIDGET(progressbar)))
                        gtk_widget_show(GTK_WIDGET(progressbar));
        } else if (total == 0) {