Documentation: Use G_SOURCE_CONTINUE and G_SOURCE_REMOVE

[geeqie.git] / src / bar-histogram.cc

diff --git a/src/bar-histogram.cc b/src/bar-histogram.cc
index e43a7bf..15fa54e 100644 (file)
--- a/src/bar-histogram.cc
+++ b/src/bar-histogram.cc
@@ -83,27 +83,27 @@ static void bar_pane_histogram_update(PaneHistogramData *phd)
 static gboolean bar_pane_histogram_update_cb(gpointer data)
 {
        const HistMap *histmap;
-       PaneHistogramData *phd = (PaneHistogramData *)data;
+       PaneHistogramData *phd = static_cast<PaneHistogramData *>(data);
 
        phd->idle_id = 0;
        phd->need_update = FALSE;
 
        gtk_widget_queue_draw_area(GTK_WIDGET(phd->drawing_area), 0, 0, phd->histogram_width, phd->histogram_height);
 
-       if (phd->fd == NULL) return FALSE;
+       if (phd->fd == NULL) return G_SOURCE_REMOVE;
        histmap = histmap_get(phd->fd);
 
        if (!histmap)
                {
                histmap_start_idle(phd->fd);
-               return FALSE;
+               return G_SOURCE_REMOVE;
                }
 
        phd->pixbuf = gdk_pixbuf_new(GDK_COLORSPACE_RGB, FALSE, 8, phd->histogram_width, phd->histogram_height);
        gdk_pixbuf_fill(phd->pixbuf, 0xffffffff);
        histogram_draw(phd->histogram, histmap, phd->pixbuf, 0, 0, phd->histogram_width, phd->histogram_height);
 
-       return FALSE;
+       return G_SOURCE_REMOVE;
 }
 
 
@@ -111,7 +111,7 @@ static void bar_pane_histogram_set_fd(GtkWidget *pane, FileData *fd)
 {
        PaneHistogramData *phd;
 
-       phd = g_object_get_data(G_OBJECT(pane), "pane_data");
+       phd = static_cast<PaneHistogramData *>(g_object_get_data(G_OBJECT(pane), "pane_data"));
        if (!phd) return;
 
        file_data_unref(phd->fd);
@@ -124,7 +124,7 @@ static void bar_pane_histogram_write_config(GtkWidget *pane, GString *outstr, gi
 {
        PaneHistogramData *phd;
 
-       phd = g_object_get_data(G_OBJECT(pane), "pane_data");
+       phd = static_cast<PaneHistogramData *>(g_object_get_data(G_OBJECT(pane), "pane_data"));
        if (!phd) return;
 
        WRITE_NL(); WRITE_STRING("<pane_histogram ");
@@ -138,7 +138,7 @@ static void bar_pane_histogram_write_config(GtkWidget *pane, GString *outstr, gi
 
 static void bar_pane_histogram_notify_cb(FileData *fd, NotifyType type, gpointer data)
 {
-       PaneHistogramData *phd = (PaneHistogramData *)data;
+       PaneHistogramData *phd = static_cast<PaneHistogramData *>(data);
        if ((type & (NOTIFY_REREAD | NOTIFY_CHANGE | NOTIFY_HISTMAP | NOTIFY_PIXBUF)) && fd == phd->fd)
                {
                DEBUG_1("Notify pane_histogram: %s %04x", fd->path, type);
@@ -148,7 +148,7 @@ static void bar_pane_histogram_notify_cb(FileData *fd, NotifyType type, gpointer
 
 static gboolean bar_pane_histogram_draw_cb(GtkWidget *UNUSED(widget), cairo_t *cr, gpointer data)
 {
-       PaneHistogramData *phd = (PaneHistogramData *)data;
+       PaneHistogramData *phd = static_cast<PaneHistogramData *>(data);
        if (!phd) return TRUE;
 
        if (phd->need_update)
@@ -166,7 +166,7 @@ static gboolean bar_pane_histogram_draw_cb(GtkWidget *UNUSED(widget), cairo_t *c
 
 static void bar_pane_histogram_size_cb(GtkWidget *UNUSED(widget), GtkAllocation *allocation, gpointer data)
 {
-       PaneHistogramData *phd = (PaneHistogramData *)data;
+       PaneHistogramData *phd = static_cast<PaneHistogramData *>(data);
 
        phd->histogram_width = allocation->width;
        phd->histogram_height = allocation->height;
@@ -175,7 +175,7 @@ static void bar_pane_histogram_size_cb(GtkWidget *UNUSED(widget), GtkAllocation
 
 static void bar_pane_histogram_destroy(GtkWidget *UNUSED(widget), gpointer data)
 {
-       PaneHistogramData *phd = (PaneHistogramData *)data;
+       PaneHistogramData *phd = static_cast<PaneHistogramData *>(data);
 
        if (phd->idle_id) g_source_remove(phd->idle_id);
        file_data_unregister_notify_func(bar_pane_histogram_notify_cb, phd);
@@ -190,7 +190,7 @@ static void bar_pane_histogram_destroy(GtkWidget *UNUSED(widget), gpointer data)
 
 static void bar_pane_histogram_popup_channels_cb(GtkWidget *widget, gpointer data)
 {
-       PaneHistogramData *phd = (PaneHistogramData *)data;
+       PaneHistogramData *phd = static_cast<PaneHistogramData *>(data);
        gint channel;
 
        if (!gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(widget))) return;
@@ -206,7 +206,7 @@ static void bar_pane_histogram_popup_channels_cb(GtkWidget *widget, gpointer dat
 
 static void bar_pane_histogram_popup_mode_cb(GtkWidget *widget, gpointer data)
 {
-       PaneHistogramData *phd = (PaneHistogramData *)data;
+       PaneHistogramData *phd = static_cast<PaneHistogramData *>(data);
        gint logmode;
 
        if (!gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(widget))) return;
@@ -245,7 +245,7 @@ static GtkWidget *bar_pane_histogram_menu(PaneHistogramData *phd)
 
 static gboolean bar_pane_histogram_press_cb(GtkGesture *UNUSED(gesture), gint UNUSED(n_press), gdouble UNUSED(x), gdouble UNUSED(y), gpointer data)
 {
-       PaneHistogramData *phd = (PaneHistogramData *)data;
+       PaneHistogramData *phd = static_cast<PaneHistogramData *>(data);
        GtkWidget *menu;
 
        menu = bar_pane_histogram_menu(phd);
@@ -347,7 +347,7 @@ void bar_pane_histogram_update_from_config(GtkWidget *pane, const gchar **attrib
 {
        PaneHistogramData *phd;
 
-       phd = g_object_get_data(G_OBJECT(pane), "pane_data");
+       phd = static_cast<PaneHistogramData *>(g_object_get_data(G_OBJECT(pane), "pane_data"));
        if (!phd) return;
 
        gint histogram_channel = phd->histogram->histogram_channel;