[glade3/offscreen-gtk3: 76/78] Merge branch 'master' into offscreen-gtk3

[Tristan Van Berkom <tvb src gnome org>]

commit a84bfad013b5d4e12ea6c5dc1a191071fa40f101
Merge: 5a713f9 e56a1f6
Author: Tristan Van Berkom <tristan van berkom gmail com>
Date:   Wed Dec 22 18:07:18 2010 +0900

    Merge branch 'master' into offscreen-gtk3
    
    Conflicts:
    	ChangeLog
    	gladeui/Makefile.am
    	gladeui/glade-widget.c

 ChangeLog                         |  207 ++
 doc/Makefile.am                   |    2 +-
 gladeui/Makefile.am               |   60 +-
 gladeui/glade-app.c               |   87 +-
 gladeui/glade-app.h               |    5 +-
 gladeui/glade-base-editor.c       |   56 +-
 gladeui/glade-command.c           |    9 +-
 gladeui/glade-design-view.c       |   77 +-
 gladeui/glade-editor-property.c   |   20 +-
 gladeui/glade-editor-table.c      |   74 +-
 gladeui/glade-editor-table.h      |    3 -
 gladeui/glade-editor.c            |    4 +
 gladeui/glade-inspector.c         |   38 +-
 gladeui/glade-marshallers.list    |    1 +
 gladeui/glade-palette.c           |   15 +-
 gladeui/glade-previewer.c         |  333 +++
 gladeui/glade-project.c           |  520 +++--
 gladeui/glade-project.h           |   10 +-
 gladeui/glade-property-class.c    |    2 +-
 gladeui/glade-property.c          |    7 +-
 gladeui/glade-utils.c             |  132 +-
 gladeui/glade-utils.h             |    4 +-
 gladeui/glade-widget-adaptor.c    |    3 +
 gladeui/glade-widget.c            |  293 ++-
 gladeui/glade-widget.h            |   11 +-
 plugins/gtk+/Makefile.am          |   11 +-
 plugins/gtk+/glade-column-types.c |   24 +-
 plugins/gtk+/glade-column-types.h |    2 +
 plugins/gtk+/glade-gtk.c          |  354 ++-
 plugins/gtk+/gtk+.xml.in          |   11 +-
 po/LINGUAS                        |    1 +
 po/ar.po                          |    2 +-
 po/ast.po                         | 1507 ++++++------
 po/bg.po                          |    2 +-
 po/ca.po                          |   13 +-
 po/ca valencia po                 | 3133 ++++++++++++------------
 po/cs.po                          |    2 +-
 po/da.po                          |    2 +-
 po/de.po                          |    2 +-
 po/el.po                          |    2 +-
 po/en shaw po                     |    4 +-
 po/en_GB.po                       |    2 +-
 po/eo.po                          |    2 +-
 po/es.po                          | 1131 +++++-----
 po/et.po                          |  890 ++++----
 po/eu.po                          |    2 +-
 po/fi.po                          |    2 +-
 po/fr.po                          |    2 +-
 po/gl.po                          |  962 ++++----
 po/he.po                          | 2997 +++++++++++------------
 po/hu.po                          |    2 +-
 po/hy.po                          |    2 +-
 po/id.po                          |    2 +-
 po/it.po                          |    2 +-
 po/ja.po                          | 2967 ++++++++++-------------
 po/ko.po                          |    2 +-
 po/lt.po                          |    2 +-
 po/lv.po                          |    2 +-
 po/mai.po                         |    2 +-
 po/ml.po                          |    2 +-
 po/nb.po                          |    2 +-
 po/or.po                          |    2 +-
 po/pl.po                          |    2 +-
 po/pt.po                          |    2 +-
 po/pt_BR.po                       |    2 +-
 po/ro.po                          |    2 +-
 po/ru.po                          |    2 +-
 po/sl.po                          |  999 ++++----
 po/sr.po                          |    2 +-
 po/sr latin po                    |    2 +-
 po/sv.po                          |    2 +-
 po/te.po                          |    2 +-
 po/th.po                          |    2 +-
 po/tr.po                          |    2 +-
 po/ug.po                          | 4881 +++++++++++++++++++++++++++++++++++++
 po/uk.po                          |    2 +-
 po/vi.po                          |    2 +-
 po/zh_CN.po                       |    2 +-
 po/zh_HK.po                       | 2713 +++++++++------------
 po/zh_TW.po                       | 2750 +++++++++------------
 src/Makefile.am                   |    8 +-
 src/glade-window.c                |  243 ++-
 src/main.c                        |    5 +-
 83 files changed, 16327 insertions(+), 11324 deletions(-)
---
diff --cc gladeui/Makefile.am
index 3a5a861,62a45b8..2d2858c
--- a/gladeui/Makefile.am
+++ b/gladeui/Makefile.am
@@@ -14,8 -46,8 +46,8 @@@ BUILT_SOURCES = glade-marshallers.c gla
  
  EXTRA_DIST = glade-marshallers.list gladeui.rc.in icon-naming-spec.c glade-previewer.rc.in
  
--# The glade-3 core library
- libgladeui_3_la_SOURCES = \
++# The glade core library
+ libgladeui_2_la_SOURCES = \
  	glade-widget-adaptor.c \
  	glade-debug.c \
  	glade-project.c \
@@@ -71,13 -100,16 +100,16 @@@ libgladeui_2_la_CPPFLAGS =  
  	$(IGE_MAC_BUNDLE_FLAG) \
  	$(IGE_MAC_CFLAGS)  \
  	$(WARN_CFLAGS)      \
+ 	$(AM_CPPFLAGS)
+ 
 -libgladeui_1_la_CFLAGS =    \
++libgladeui_2_la_CFLAGS =    \
  	$(AM_CFLAGS)
  
- libgladeui_3_la_LDFLAGS = -version-info $(GLADE_CURRENT):$(GLADE_REVISION):$(GLADE_AGE) $(AM_LDFLAGS)
- libgladeui_3_la_LIBADD = $(GTK_LIBS) $(IGE_MAC_LIBS)
+ libgladeui_2_la_LDFLAGS = -version-info $(GLADE_CURRENT):$(GLADE_REVISION):$(GLADE_AGE) $(AM_LDFLAGS)
+ libgladeui_2_la_LIBADD = $(GTK_LIBS) $(IGE_MAC_LIBS)
  
  
- libgladeuiincludedir=$(includedir)/libgladeui-3.0/gladeui
+ libgladeuiincludedir=$(includedir)/libgladeui-2.0/gladeui
  libgladeuiinclude_HEADERS = \
  	glade.h \
  	glade-debug.h \
diff --cc gladeui/glade-widget.c
index f2c7552,30e52ee..6291849
--- a/gladeui/glade-widget.c
+++ b/gladeui/glade-widget.c
@@@ -63,6 -63,11 +63,9 @@@ static void         glade_widget_set_ad
  							GladeWidgetAdaptor    *adaptor);
  static void         glade_widget_set_properties        (GladeWidget           *widget,
  							GList                 *properties);
 -static gboolean     glade_window_is_embedded           (GtkWindow             *window);
 -static gboolean     glade_widget_embed                 (GladeWidget           *widget);
+ static void         glade_widget_set_object            (GladeWidget           *gwidget, 
+ 							GObject               *new_object, 
+ 							gboolean               destroy);
  
  enum
  {
diff --cc src/glade-window.c
index 8ab4a98,144daf4..7c5cac4
--- a/src/glade-window.c
+++ b/src/glade-window.c
@@@ -3423,7 -3494,20 +3470,19 @@@ glade_window_class_init (GladeWindowCla
  	object_class->finalize = glade_window_finalize;
  
  	widget_class->configure_event    = glade_window_configure_event;
 -	widget_class->window_state_event = glade_window_state_event;
  
+ 	gtk_rc_parse_string ("style \"short_progress\"\n"
+ 			     " { \n"
+ 			     "    GtkProgressBar::min-horizontal-bar-height = 1\n"
+ 			     "    GtkProgressBar::min-horizontal-bar-width = 1\n"
+ 			     "    GtkProgressBar::yspacing = 0\n"
+ 			     "    GtkProgressBar::xspacing = 4\n"
+ 			     "    xthickness = 0\n"
+ 			     "    ythickness = 0\n"
+ 			     " }\n"
+ 			     "\n"
+ 			     "widget \"*.glade-tab-label-progress\" style \"short_progress\"");
+ 
  	g_type_class_add_private (klass, sizeof (GladeWindowPrivate));
  }