[Xfce4-commits] <thunar-vcs-plugin:thunarx-2> * tvp-git-helper/tgh-clone.c: Fixed a memory leak. * tvp-git-helper/tgh-log-dialog.c: Removed expander column. * tvp-svn-helper/tsh-log-dialog.c: Changed "File" to "Path". * tvp-svn-helper/tsh-properties-dialog.c: Swapped signal emit and tree clear order.

[Peter de Ridder]

Updating branch refs/heads/thunarx-2
         to 06d7670fea400a2856d9c6beb510c5d3e7d02f45 (commit)
       from 8f4ba0b888e20c4045f1d252c531c093e8a7b690 (commit)

commit 06d7670fea400a2856d9c6beb510c5d3e7d02f45
Author: Peter de Ridder <peter at xfce.org>
Date:   Sun Oct 25 00:49:36 2009 +0200

    * tvp-git-helper/tgh-clone.c: Fixed a memory leak.
    * tvp-git-helper/tgh-log-dialog.c: Removed expander column.
    * tvp-svn-helper/tsh-log-dialog.c: Changed "File" to "Path".
    * tvp-svn-helper/tsh-properties-dialog.c: Swapped signal emit and tree
      clear order.

 tvp-git-helper/tgh-clone.c             |    5 ++++-
 tvp-git-helper/tgh-log-dialog.c        |    4 +---
 tvp-svn-helper/tsh-log-dialog.c        |    2 +-
 tvp-svn-helper/tsh-properties-dialog.c |    8 ++++----
 4 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/tvp-git-helper/tgh-clone.c b/tvp-git-helper/tgh-clone.c
index 945ce8a..76ccfd5 100644
--- a/tvp-git-helper/tgh-clone.c
+++ b/tvp-git-helper/tgh-clone.c
@@ -71,7 +71,7 @@ static gboolean clone_spawn (GtkWidget *dialog, gchar *repository, gchar *path,
   GIOChannel *chan_err;
   TghOutputParser *parser;
   gchar **argv;
-  struct exit_args *args = g_new(struct exit_args, 1);
+  struct exit_args *args;
 
   argv = g_new(gchar*, 6);
 
@@ -84,11 +84,14 @@ static gboolean clone_spawn (GtkWidget *dialog, gchar *repository, gchar *path,
 
   if(!g_spawn_async_with_pipes(NULL, argv, NULL, G_SPAWN_DO_NOT_REAP_CHILD | G_SPAWN_SEARCH_PATH, NULL, NULL, pid, NULL, NULL, &fd_err, &error))
   {
+    g_free (argv);
     return FALSE;
   }
+  g_free (argv);
 
   parser = tgh_error_parser_new(GTK_WIDGET(dialog));
 
+  args = g_new(struct exit_args, 1);
   args->parser = parser;
   args->dialog = dialog;
 
diff --git a/tvp-git-helper/tgh-log-dialog.c b/tvp-git-helper/tgh-log-dialog.c
index 62e4bd3..f7938c9 100644
--- a/tvp-git-helper/tgh-log-dialog.c
+++ b/tvp-git-helper/tgh-log-dialog.c
@@ -106,7 +106,6 @@ tgh_log_dialog_init (TghLogDialog *dialog)
   GtkWidget *vpane;
   GtkCellRenderer *renderer;
   GtkTreeModel *model;
-  gint n_columns;
 
   pane = gtk_vpaned_new ();
 
@@ -191,11 +190,10 @@ tgh_log_dialog_init (TghLogDialog *dialog)
       NULL);
 
   renderer = gtk_cell_renderer_text_new ();
-  n_columns = gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (file_view),
+  gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (file_view),
       -1, _("File"),
       renderer, "text",
       FILE_COLUMN_FILE, NULL);
-  gtk_tree_view_set_expander_column (GTK_TREE_VIEW (file_view), gtk_tree_view_get_column (GTK_TREE_VIEW (file_view), n_columns - 1));
 
   model = GTK_TREE_MODEL (gtk_list_store_new (FILE_COLUMN_COUNT, G_TYPE_STRING, G_TYPE_INT, G_TYPE_STRING));
 
diff --git a/tvp-svn-helper/tsh-log-dialog.c b/tvp-svn-helper/tsh-log-dialog.c
index 62f5d0c..6878f94 100644
--- a/tvp-svn-helper/tsh-log-dialog.c
+++ b/tvp-svn-helper/tsh-log-dialog.c
@@ -183,7 +183,7 @@ tsh_log_dialog_init (TshLogDialog *dialog)
 	
   renderer = gtk_cell_renderer_text_new ();
   n_columns = gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (file_view),
-                                                           -1, _("File"),
+                                                           -1, _("Path"),
                                                            renderer, "text",
                                                            FILE_COLUMN_FILE, NULL);
   gtk_tree_view_set_expander_column (GTK_TREE_VIEW (file_view), gtk_tree_view_get_column (GTK_TREE_VIEW (file_view), n_columns - 1));
diff --git a/tvp-svn-helper/tsh-properties-dialog.c b/tvp-svn-helper/tsh-properties-dialog.c
index 3f456c8..f61642e 100644
--- a/tvp-svn-helper/tsh-properties-dialog.c
+++ b/tvp-svn-helper/tsh-properties-dialog.c
@@ -552,11 +552,11 @@ set_clicked (GtkButton *button, gpointer user_data)
 	
 	gtk_widget_hide (dialog->close);
 	gtk_widget_show (dialog->cancel);
-
-  g_signal_emit (dialog, signals[SIGNAL_SET], 0);
   
 	model = gtk_tree_view_get_model (GTK_TREE_VIEW (dialog->tree_view));
   gtk_list_store_clear (GTK_LIST_STORE (model));
+
+  g_signal_emit (dialog, signals[SIGNAL_SET], 0);
 }
 
 static void
@@ -567,10 +567,10 @@ delete_clicked (GtkButton *button, gpointer user_data)
 	
 	gtk_widget_hide (dialog->close);
 	gtk_widget_show (dialog->cancel);
-
-  g_signal_emit (dialog, signals[SIGNAL_DELETE], 0);
   
 	model = gtk_tree_view_get_model (GTK_TREE_VIEW (dialog->tree_view));
   gtk_list_store_clear (GTK_LIST_STORE (model));
+
+  g_signal_emit (dialog, signals[SIGNAL_DELETE], 0);
 }