[libsendmail-milter-perl] 08/20: Merge commit 'upstream/0.51'

[Hilko Bengen]

This is an automated email from the git hooks/post-receive script.

bengen pushed a commit to annotated tag debian/1.0-1
in repository libsendmail-milter-perl.

commit ababa1bee28e3bc7879c20909ba5d701827f8632
Merge: 8cd545e c46a09d
Author: Hilko Bengen <bengen at debian.org>
Date:   Thu Dec 3 10:32:43 2009 +0100

    Merge commit 'upstream/0.51'
    
    Conflicts:
    	bin/regcompare.pl
    	bin/regview.pl

 Changes                                |   27 +
 MANIFEST                               |    4 +
 META.yml                               |    2 +-
 Makefile.PL                            |    5 +
 bin/regcompare.pl                      |  448 ++++++++++--
 bin/regmultidiff.pl                    |   10 +-
 bin/regscope.pl                        | 1200 ++++++++++++++++++++++++++++++++
 bin/regview.pl                         |  340 ++++++---
 lib/Parse/Win32Registry.pm             |   64 +-
 lib/Parse/Win32Registry/Base.pm        |   21 +-
 lib/Parse/Win32Registry/Key.pm         |    5 +-
 lib/Parse/Win32Registry/Win95/Key.pm   |   14 +
 lib/Parse/Win32Registry/Win95/Value.pm |   10 +
 lib/Parse/Win32Registry/WinNT/Key.pm   |   32 +
 lib/Parse/Win32Registry/WinNT/Value.pm |   14 +
 t/iterator.t                           |  253 +++++++
 t/use.t                                |    2 +-
 t/win95_iter_tests.rf                  |  Bin 0 -> 655 bytes
 t/winnt_iter_tests.rf                  |  Bin 0 -> 5376 bytes
 19 files changed, 2280 insertions(+), 171 deletions(-)

diff --cc bin/regcompare.pl
index 8e2c883,05452b5..35534f4
--- a/bin/regcompare.pl
+++ b/bin/regcompare.pl
@@@ -1026,18 -1264,84 +1264,100 @@@ sub find_change 
      }
  }
  
+ sub get_location {
+     my @start_keys;
+     my @start_values;
+     my ($keys_ref, $values_ref);
+     my ($model, $iter) = $tree_selection->get_selected;
+     if (defined $model && defined $iter) {
+         my $icon = $model->get($iter, TREECOL_ICON);
+         if ($icon eq 'gtk-directory') {
+             # Item is a key
+             $keys_ref = $model->get($iter, TREECOL_ITEMS);
+         }
+         else {
+             # Item is a value
+             $values_ref = $model->get($iter, TREECOL_ITEMS);
+ 
+             # Find parent key
+             $iter = $model->iter_parent($iter);
+             return if !defined $iter;
+ 
+             $keys_ref = $model->get($iter, TREECOL_ITEMS);
+         }
+         return ($keys_ref, $values_ref);
+     }
+     else {
+         return ($keys_ref, $values_ref);
+     }
+ }
+ 
+ sub add_bookmark {
+     my ($keys_ref, $values_ref) = get_location;
+     if (defined $keys_ref) {
+         my $any_key = (grep { defined } @$keys_ref)[0];
+         my $key_path = $any_key->get_path;
+         my $key_name = $any_key->get_name;
+ 
+         # Remove root key name to get subkey path
+         my $subkey_path = (split(/\\/, $key_path, 2))[1];
+         return if !defined $subkey_path;
+ 
+         my $bookmark_name;
+         my $location;
+         my $icon;
+         if (defined $values_ref) {
+             my $any_value = (grep { defined } @$values_ref)[0];
+             my $value_name = $any_value->get_name;
+             $location = [$subkey_path, $value_name];
+             $value_name = '(Default)' if $value_name eq '';
+             $bookmark_name = "$value_name [$key_name]";
+             $icon = 'gtk-file';
+         }
+         else {
+             $bookmark_name = $key_name;
+             $location = [$subkey_path];
+             $icon = 'gtk-directory';
+         }
+         my $display_name = $bookmark_name;
+         $display_name =~ s/_/__/g;
+         $action_group2->add_actions([
+             [$action_name, $icon, $display_name, undef, undef, \&go_to_bookmark],
+         ], $location);
+         $uimanager->add_ui($bookmarks_merge_id, '/MenuBar/BookmarksMenu', $action_name, $action_name, 'menuitem', FALSE);
+         $action_name++;
+         if (my $iter = $bookmark_store->append) {
+             $bookmark_store->set($iter,
+                 BMCOL_NAME, $bookmark_name,
+                 BMCOL_LOCATION, $location,
+                 BMCOL_ICON, $icon,
+             );
+         }
+     }
+ }
+ 
+ sub edit_bookmarks {
+     $bookmarks_dialog->show_all;
+ }
+ 
+ sub go_to_bookmark {
+     my ($menuitem, $location) = @_;
+     my ($subkey_path, $value_name) = @$location;
+     go_to_subkey_and_value($subkey_path, $value_name);
+ }
++
 +__END__
 +
 +=head1 NAME
 +
 +regcompare - GTK2 Registry Compare for the Parse::Win32Registry module
 +
 +=head1 SYNOPSIS
 +
 +regview [ <filenames> ]
 +
 +=head1 SEE ALSO
 +
 +L<Parse::Win32Registry>
 +
 +=cut
diff --cc bin/regview.pl
index f38930e,a5374ba..49ea08b
--- a/bin/regview.pl
+++ b/bin/regview.pl
@@@ -957,28 -1123,7 +1123,22 @@@ sub view_report 
          }
          $iter = $bookmark_store->iter_next($iter);
      }
+ 
+     $report_dialog->show_all;
  }
  
 +__END__
 +
 +=head1 NAME
 +
 +regview - GTK2 Registry Viewer for the Parse::Win32Registry module
 +
 +=head1 SYNOPSIS
 +
- regview [-d] <filename>
- 
- =over 4
- 
- =item -d or --debuga
- 
- enable debugging mode
- 
- =back
++regview <filename>
 +
 +=head1 SEE ALSO
 +
 +L<Parse::Win32Registry>
 +
 +=cut

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/libsendmail-milter-perl.git