[gtksourceview/wip/fix-completion-sizing: 1/2] completion sizing: remove completion container

[Sébastien Wilmet <swilmet src gnome org>]

commit 97cfb74923653bb96ad7039fde3e36cf494744a0
Author: Sébastien Wilmet <swilmet gnome org>
Date:   Sat May 31 23:42:26 2014 +0200

    completion sizing: remove completion container
    
    The completion container is too buggy. It will be replaced by "normal"
    code to do the sizing, instead of creating a custom container.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=720823

 docs/reference/Makefile.am                   |    1 -
 gtksourceview/Makefile.am                    |    2 -
 gtksourceview/gtksourcecompletion.c          |    7 -
 gtksourceview/gtksourcecompletion.ui         |    3 +-
 gtksourceview/gtksourcecompletioncontainer.c |  369 --------------------------
 gtksourceview/gtksourcecompletioncontainer.h |   61 -----
 po/POTFILES.in                               |    1 -
 7 files changed, 2 insertions(+), 442 deletions(-)
---
diff --git a/docs/reference/Makefile.am b/docs/reference/Makefile.am
index 1987d7f..9e49e93 100644
--- a/docs/reference/Makefile.am
+++ b/docs/reference/Makefile.am
@@ -22,7 +22,6 @@ CFILE_GLOB = $(top_srcdir)/gtksourceview/*.c
 IGNORE_HFILES =                                        \
        config.h                                \
        gtksourcebuffer-private.h               \
-       gtksourcecompletioncontainer.h          \
        gtksourcecompletionmodel.h              \
        gtksourcecompletion-private.h           \
        gtksourcecompletionwordsbuffer.h        \
diff --git a/gtksourceview/Makefile.am b/gtksourceview/Makefile.am
index 0d98a71..67c52c1 100644
--- a/gtksourceview/Makefile.am
+++ b/gtksourceview/Makefile.am
@@ -51,7 +51,6 @@ libgtksourceview_headers =                    \
 
 libgtksourceview_private_headers = \
        gtksourcebuffer-private.h               \
-       gtksourcecompletioncontainer.h          \
        gtksourcecompletionmodel.h              \
        gtksourcecompletion-private.h           \
        gtksourcecontextengine.h                \
@@ -72,7 +71,6 @@ libgtksourceview_private_headers = \
        gtktextregion.h
 
 libgtksourceview_private_c_files = \
-       gtksourcecompletioncontainer.c  \
        gtksourcecompletionmodel.c      \
        gtksourcecontextengine.c        \
        gtksourceengine.c               \
diff --git a/gtksourceview/gtksourcecompletion.c b/gtksourceview/gtksourcecompletion.c
index 61e7aea..17d80bc 100644
--- a/gtksourceview/gtksourcecompletion.c
+++ b/gtksourceview/gtksourcecompletion.c
@@ -86,7 +86,6 @@
 #include "gtksourcecompletioninfo.h"
 #include "gtksourcecompletionproposal.h"
 #include "gtksourcecompletionprovider.h"
-#include "gtksourcecompletioncontainer.h"
 #include "gtksourcebuffer.h"
 #include "gtksourceview.h"
 #include "gtksourceview-marshal.h"
@@ -2106,14 +2105,9 @@ gtk_source_completion_constructed (GObject *object)
        GtkSourceCompletion *completion = GTK_SOURCE_COMPLETION (object);
        GError *error = NULL;
        GtkBuilder *builder = gtk_builder_new ();
-       GtkSourceCompletionContainer *container = _gtk_source_completion_container_new ();
-       g_object_ref_sink (container);
 
        gtk_builder_set_translation_domain (builder, GETTEXT_PACKAGE);
 
-       /* GtkSourceCompletionContainer is a private type. */
-       gtk_builder_expose_object (builder, "completion_container", G_OBJECT (container));
-
        gtk_builder_add_from_resource (builder,
                                       "/org/gnome/gtksourceview/ui/gtksourcecompletion.ui",
                                       &error);
@@ -2129,7 +2123,6 @@ gtk_source_completion_constructed (GObject *object)
        connect_style_context (completion);
 
        g_object_unref (builder);
-       g_object_unref (container);
 
        G_OBJECT_CLASS (gtk_source_completion_parent_class)->constructed (object);
 }
diff --git a/gtksourceview/gtksourcecompletion.ui b/gtksourceview/gtksourcecompletion.ui
index 8df3b91..0c75533 100644
--- a/gtksourceview/gtksourcecompletion.ui
+++ b/gtksourceview/gtksourcecompletion.ui
@@ -44,9 +44,10 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
         <property name="visible">True</property>
         <property name="orientation">vertical</property>
         <child>
-          <object class="GtkSourceCompletionContainer" id="completion_container">
+          <object class="GtkScrolledWindow" id="scrolled_window">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
+            <property name="expand">True</property>
             <child>
               <object class="GtkTreeView" id="tree_view_proposals">
                 <property name="visible">True</property>
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 6a69647..607ea46 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -121,7 +121,6 @@ data/styles/tango.xml
 gtksourceview/completion-providers/words/gtksourcecompletionwords.c
 gtksourceview/gtksourcebuffer.c
 gtksourceview/gtksourcecompletion.c
-gtksourceview/gtksourcecompletioncontainer.c
 gtksourceview/gtksourcecompletioncontext.c
 gtksourceview/gtksourcecompletioninfo.c
 gtksourceview/gtksourcecompletionitem.c