Updating branch refs/heads/master
         to 96c2392333176454446853126cfdc9589be9518b (commit)
       from 12011959bcee30e48e420d064ebce90e06d737d2 (commit)

commit 96c2392333176454446853126cfdc9589be9518b
Author: Stefan Sperling <[email protected]>
Date:   Wed Sep 5 22:10:53 2012 +0200

    Tweak position of options in svn diff dialog.
    
    Swap the notice-ancestry and show-copies-as-adds tickboxes.
    The latter option won't appear with Subversion <= 1.6, and
    now the 1.6 options are grouped together on a single line.

 tvp-svn-helper/tsh-diff-dialog.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/tvp-svn-helper/tsh-diff-dialog.c b/tvp-svn-helper/tsh-diff-dialog.c
index 23d12ad..6b01978 100644
--- a/tvp-svn-helper/tsh-diff-dialog.c
+++ b/tvp-svn-helper/tsh-diff-dialog.c
@@ -201,7 +201,7 @@ tsh_diff_dialog_init (TshDiffDialog *dialog)
   gtk_widget_show (depth);
 
   dialog->notice_ancestry = notice_ancestry = gtk_check_button_new_with_label 
(_("Notice ancestry"));
-  gtk_table_attach (GTK_TABLE (table), notice_ancestry, 1, 2, 0, 1, GTK_EXPAND 
| GTK_FILL, GTK_FILL, 0, 0);
+  gtk_table_attach (GTK_TABLE (table), notice_ancestry, 1, 2, 1, 2, GTK_EXPAND 
| GTK_FILL, GTK_FILL, 0, 0);
   gtk_widget_show (notice_ancestry);
 
   dialog->no_diff_deleted = no_diff_deleted = gtk_check_button_new_with_label 
(_("Do not show differences for deleted files"));
@@ -210,7 +210,7 @@ tsh_diff_dialog_init (TshDiffDialog *dialog)
 
 #if CHECK_SVN_VERSION_S(1,7)
   dialog->show_copies_as_adds = show_copies_as_adds = 
gtk_check_button_new_with_label (_("Show copies as additions"));
-  gtk_table_attach (GTK_TABLE (table), show_copies_as_adds, 1, 2, 1, 2, 
GTK_EXPAND | GTK_FILL, GTK_FILL, 0, 0);
+  gtk_table_attach (GTK_TABLE (table), show_copies_as_adds, 1, 2, 0, 1, 
GTK_EXPAND | GTK_FILL, GTK_FILL, 0, 0);
   gtk_widget_show (show_copies_as_adds);
 #endif
 
_______________________________________________
Xfce4-commits mailing list
[email protected]
https://mail.xfce.org/mailman/listinfo/xfce4-commits

Reply via email to