diff -Nru auto-multiple-choice-1.0.3/AMC-perl/AMC/Gui/Association.glade auto-multiple-choice-1.0.4/AMC-perl/AMC/Gui/Association.glade
--- auto-multiple-choice-1.0.3/AMC-perl/AMC/Gui/Association.glade	2011-12-11 13:40:50.000000000 +0000
+++ auto-multiple-choice-1.0.4/AMC-perl/AMC/Gui/Association.glade	2012-03-10 12:32:30.000000000 +0000
@@ -40,7 +40,7 @@
                   </packing>
                 </child>
                 <child>
-                  <widget class="GtkScrolledWindow" id="scrolledwindow2">
+                  <widget class="GtkScrolledWindow" id="scrolled_tableau">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="hscrollbar_policy">GTK_POLICY_NEVER</property>
diff -Nru auto-multiple-choice-1.0.3/AMC-perl/AMC/Gui/Association.pm auto-multiple-choice-1.0.4/AMC-perl/AMC/Gui/Association.pm
--- auto-multiple-choice-1.0.3/AMC-perl/AMC/Gui/Association.pm	2011-12-11 13:41:45.000000000 +0000
+++ auto-multiple-choice-1.0.4/AMC-perl/AMC/Gui/Association.pm	2012-03-10 12:32:30.000000000 +0000
@@ -133,7 +133,7 @@
 
     $self->{'gui'}=Gtk2::GladeXML->new($glade_xml,undef,'auto-multiple-choice');
 
-    for my $k (qw/tableau titre photo associes_cb copies_tree bouton_effacer bouton_inconnu/) {
+    for my $k (qw/tableau titre photo associes_cb copies_tree bouton_effacer bouton_inconnu scrolled_tableau/) {
 	$self->{$k}=$self->{'gui'}->get_widget($k);
     }
 
@@ -172,9 +172,6 @@
 	}
     }
 
-    $self->{'tableau'}->size_request;
-    $self->{'tableau'}->set_size_request(-1,100);
-
     # vue arborescente
 
     my ($copies_store,$renderer,$column);
@@ -242,6 +239,8 @@
     $self->image_suivante();
     $self->maj_couleurs_liste();
 
+    $self->{'scrolled_tableau'}->set_policy('automatic','automatic');
+
     return($self);
 }
 
diff -Nru auto-multiple-choice-1.0.3/ChangeLog auto-multiple-choice-1.0.4/ChangeLog
--- auto-multiple-choice-1.0.3/ChangeLog	2011-12-17 20:41:06.000000000 +0000
+++ auto-multiple-choice-1.0.4/ChangeLog	2012-03-10 12:38:59.000000000 +0000
@@ -1,3 +1,9 @@
+1.0.4 (2012-03-10)
+
+  * Bug fix with manual association window scrollbars
+
+  * rsvg is now rsvg-convert
+
 1.0.3 (2011-12-17)
 
   * Bug fix with problems on Ubuntu 11.10+Unity
diff -Nru auto-multiple-choice-1.0.3/debian/changelog auto-multiple-choice-1.0.4/debian/changelog
--- auto-multiple-choice-1.0.3/debian/changelog	2011-12-17 20:55:46.000000000 +0000
+++ auto-multiple-choice-1.0.4/debian/changelog	2012-03-10 12:40:30.000000000 +0000
@@ -1,5 +1,5 @@
-auto-multiple-choice (1.0.3-1) unstable; urgency=low
+auto-multiple-choice (1.0.4-1) unstable; urgency=low
   
   * auto debian changelog; see ChangeLog for valuable information.
 
- -- Alexis Bienvenüe <pado@passoire.fr>  Sat, 17 Dec 2011 21:55:45 +0100
+ -- Alexis Bienvenüe <pado@passoire.fr>  Sat, 10 Mar 2012 13:40:30 +0100
diff -Nru auto-multiple-choice-1.0.3/debian/control auto-multiple-choice-1.0.4/debian/control
--- auto-multiple-choice-1.0.3/debian/control	2011-12-11 12:58:04.000000000 +0000
+++ auto-multiple-choice-1.0.4/debian/control	2012-03-10 12:37:57.000000000 +0000
@@ -19,7 +19,7 @@
   ${perl:Depends}, libfile-spec-perl,
   libgtk2-perl, librsvg2-common,
   libxml-simple-perl, libxml-writer-perl,
-  libgtk2-gladexml-perl, libcompress-zlib-perl,
+  libgtk2-gladexml-perl, libio-compress-perl,
   libgraphics-magick-perl, libarchive-zip-perl,
   texlive-latex-base, latex-xcolor, texlive-generic-recommended,
   texlive-latex-extra, texlive-fonts-extra,
diff -Nru auto-multiple-choice-1.0.3/doc/Makefile auto-multiple-choice-1.0.4/doc/Makefile
--- auto-multiple-choice-1.0.3/doc/Makefile	2011-12-11 12:54:24.000000000 +0000
+++ auto-multiple-choice-1.0.4/doc/Makefile	2012-03-10 12:29:51.000000000 +0000
@@ -40,10 +40,10 @@
 	rm -f *~
 
 html/images/callouts/%.png: img_src/callouts/%.svg
-	rsvg -w 12 -h 12 $< $@
+	rsvg-convert -w 12 -h 12 $< -o $@
 
 html/images/%.png: img_src/%.svg
-	rsvg -w 24 -h 24 $< $@
+	rsvg-convert -w 24 -h 24 $< -o $@
 
 %.tex: %.xml
 	dblatex -t tex --xslt-opts="--nonet" --xslt-opts="--catalogs" $(DBLATEX_OPT) $< -o $@
diff -Nru auto-multiple-choice-1.0.3/Makefile auto-multiple-choice-1.0.4/Makefile
--- auto-multiple-choice-1.0.3/Makefile	2011-12-11 12:58:05.000000000 +0000
+++ auto-multiple-choice-1.0.4/Makefile	2012-03-10 12:29:30.000000000 +0000
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2008-2011 Alexis Bienvenue <paamc@passoire.fr>
+# Copyright (C) 2008-2012 Alexis Bienvenue <paamc@passoire.fr>
 #
 # This file is part of Auto-Multiple-Choice
 #
@@ -152,7 +152,7 @@
 	convert -density 300 $< $*-%03d.ppm
 
 %.png: %.svg
-	rsvg -w 32 -h 32 $< $@
+	rsvg-convert -w 32 -h 32 $< -o $@
 
 %.xpm: %.png
 	pngtopnm $< | ppmtoxpm > $@
diff -Nru auto-multiple-choice-1.0.3/Makefile.versions auto-multiple-choice-1.0.4/Makefile.versions
--- auto-multiple-choice-1.0.3/Makefile.versions	2011-12-17 20:55:45.000000000 +0000
+++ auto-multiple-choice-1.0.4/Makefile.versions	2012-03-10 12:40:30.000000000 +0000
@@ -18,5 +18,5 @@
 # along with Auto-Multiple-Choice.  If not, see
 # <http://www.gnu.org/licenses/>.
 
-PACKAGE_V_DEB=1.0.3
-PACKAGE_V_SVN=704
+PACKAGE_V_DEB=1.0.4
+PACKAGE_V_SVN=880