[glade3/offscreen: 15/15] Merge branch 'master' into offscreen

[Tristan Van Berkom <tvb src gnome org>]

commit 8359c868acee1f46036f07d7b8813f0173a66a01
Merge: 53797de 928784b
Author: Tristan Van Berkom <tristan van berkom gmail com>
Date:   Sat Oct 9 15:11:18 2010 +0900

    Merge branch 'master' into offscreen
    
    Conflicts:
    	gladeui/glade-named-icon-chooser-dialog.c

 .gitignore                                |   36 +
 ChangeLog                                 |    5 +
 configure.ac                              |   33 +-
 data/.gitignore                           |    3 +
 doc/.gitignore                            |    1 +
 gladeui/.gitignore                        |    3 +
 gladeui/glade-inspector.c                 |    4 +
 gladeui/glade-named-icon-chooser-dialog.c |    3 +
 help/.gitignore                           |    8 +
 m4/.gitignore                             |    9 +
 plugins/.gitignore                        |    3 +
 plugins/gtk+/.gitignore                   |    7 +
 plugins/python/.gitignore                 |    5 +
 po/.gitignore                             |    8 +
 po/LINGUAS                                |    2 +
 po/ast.po                                 | 4977 ++++++++++++++++++++++++++++
 po/cs.po                                  | 1325 +++-----
 po/hy.po                                  |   87 +-
 po/it.po                                  | 3114 ++++++++++---------
 po/ja.po                                  |  973 +++---
 po/pl.po                                  | 4839 +++++++++++++++-------------
 po/ro.po                                  | 5008 +++++++++++++++++++++++++++++
 po/sl.po                                  | 2547 +++++++---------
 src/.gitignore                            |    8 +
 24 files changed, 16501 insertions(+), 6507 deletions(-)
---
diff --cc gladeui/glade-named-icon-chooser-dialog.c
index d347950,fb49aaa..6942221
--- a/gladeui/glade-named-icon-chooser-dialog.c
+++ b/gladeui/glade-named-icon-chooser-dialog.c
@@@ -1365,7 -1365,9 +1365,10 @@@ glade_named_icon_chooser_dialog_init (G
  	gtk_window_set_title (GTK_WINDOW (dialog), _("Named Icon Chooser"));
  	
  	gtk_window_set_default_size (GTK_WINDOW (dialog), 610, 480);
 +
+ #if !GTK_CHECK_VERSION (2, 21, 8)
+ 	gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE);	
+ #endif
  	content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog));
  	gtk_container_set_border_width (GTK_CONTAINER (content_area), 12);
  	gtk_box_set_spacing (GTK_BOX (content_area), 12);