[Xfce4-commits] <thunar-vcs-plugin:master> Fixed compiler warnings.

[Peter de Ridder]

Updating branch refs/heads/master
         to 2c85c20ae365f8778d270ed23a818031db4bc6a7 (commit)
       from 6ebd289040691012a010eb23be09c91e591e1a10 (commit)

commit 2c85c20ae365f8778d270ed23a818031db4bc6a7
Author: Peter de Ridder <peter at xfce.org>
Date:   Mon Aug 2 22:21:26 2010 +0200

    Fixed compiler warnings.
    
    Fixed possible uninitialized value.
    Fixed mismatching prototype if function in header file.

 tvp-git-helper/tgh-cell-renderer-graph.c |    9 ++++++---
 tvp-svn-helper/tsh-status-dialog.h       |   12 ++++++------
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/tvp-git-helper/tgh-cell-renderer-graph.c b/tvp-git-helper/tgh-cell-renderer-graph.c
index 147da86..d018a4f 100644
--- a/tvp-git-helper/tgh-cell-renderer-graph.c
+++ b/tvp-git-helper/tgh-cell-renderer-graph.c
@@ -281,11 +281,16 @@ tgh_cell_renderer_graph_render (GtkCellRenderer *cell, GdkDrawable *window, GtkW
       state = GTK_STATE_NORMAL;
 
     x_offset += cell_area->x + cell->xpad;
+    x2_offset = x_offset + width - cell->xpad * 2;
     y_offset = background_area->y;
     height = background_area->height;
 
     if (rtl)
-      x_offset += width - cell->xpad * 2;
+    {
+      gint swap = x_offset;
+      x_offset = x2_offset;
+      x2_offset = swap;
+    }
 
     cr = gdk_cairo_create (window);
     cairo_set_line_width (cr, 1);
@@ -305,7 +310,6 @@ tgh_cell_renderer_graph_render (GtkCellRenderer *cell, GdkDrawable *window, GtkW
 
       x2_offset = tgh_graph_node_length (graph_iter->data);
       x2_offset = renderer->spacing + renderer->spacing * x2_offset + x2_offset;
-      x2_offset = x2_offset;
       x2_offset = ((rtl ?  (1.0 - cell->xalign) : cell->xalign) * (cell_area->width - x2_offset)) + (rtl ? x2_offset : 0);
       if (x2_offset < 0)
         x2_offset = 0;
@@ -341,7 +345,6 @@ tgh_cell_renderer_graph_render (GtkCellRenderer *cell, GdkDrawable *window, GtkW
 
       x2_offset = tgh_graph_node_length (graph_iter->data);
       x2_offset = renderer->spacing + renderer->spacing * x2_offset + x2_offset;
-      x2_offset = x2_offset;
       x2_offset = ((rtl ?  (1.0 - cell->xalign) : cell->xalign) * (cell_area->width - x2_offset)) + (rtl ? x2_offset : 0);
       if (x2_offset < 0)
         x2_offset = 0;
diff --git a/tvp-svn-helper/tsh-status-dialog.h b/tvp-svn-helper/tsh-status-dialog.h
index 19450fa..3569cb1 100644
--- a/tvp-svn-helper/tsh-status-dialog.h
+++ b/tvp-svn-helper/tsh-status-dialog.h
@@ -48,12 +48,12 @@ void       tsh_status_dialog_add      (TshStatusDialog *dialog,
                                        const char *repo_prop);
 void       tsh_status_dialog_done     (TshStatusDialog *dialog);
 
-gboolean   tsh_status_dialog_get_depth            (TshStatusDialog *dialog);
-gboolean   tsh_status_dialog_get_show_unmodified  (TshStatusDialog *dialog);
-gboolean   tsh_status_dialog_get_show_unversioned (TshStatusDialog *dialog);
-gboolean   tsh_status_dialog_get_check_reposetory (TshStatusDialog *dialog);
-gboolean   tsh_status_dialog_get_show_ignore      (TshStatusDialog *dialog);
-gboolean   tsh_status_dialog_get_hide_externals   (TshStatusDialog *dialog);
+svn_depth_t tsh_status_dialog_get_depth            (TshStatusDialog *dialog);
+gboolean    tsh_status_dialog_get_show_unmodified  (TshStatusDialog *dialog);
+gboolean    tsh_status_dialog_get_show_unversioned (TshStatusDialog *dialog);
+gboolean    tsh_status_dialog_get_check_reposetory (TshStatusDialog *dialog);
+gboolean    tsh_status_dialog_get_show_ignore      (TshStatusDialog *dialog);
+gboolean    tsh_status_dialog_get_hide_externals   (TshStatusDialog *dialog);
 
 G_END_DECLS;