Merge branch 'matthiasc/for-master' into 'master'

Matthiasc/for master

See merge request GNOME/gtk!2149

demos/gtk-demo/messages.txt

@@ -259,7 +259,7 @@
 259|GTK+ and friends|GTKtoolkit|#java bindings version 4.0.16 released: http://article.gmane.org/gmane.comp.gnome.bindings.java/1796 #gtk|1276885917|0||0|0
 260|GTK+ and friends|GTKtoolkit|RT @cwiiis: MxIconTheme and MxIcon respect system's icon theme (and changes) now in #mx master :) Made possible by @thosw's XSettings work|1276883019|0||0|0
 261|GTK+ and friends|GTKtoolkit|#javascript mailing list just created. Discuss its usage in GObject libraries: GTK+, Glib ... http://ur1.ca/08lwz by @jwendell #gtk|1276842639|0||0|0
-262|GTK+ and friends|GTKtoolkit|Note fot Win32 users: XP theming is back in 2.90.3 . Please test. #gtk|1276829697|0||0|0
+262|GTK+ and friends|GTKtoolkit|Note for Win32 users: XP theming is back in 2.90.3 . Please test. #gtk|1276829697|0||0|0
 263|GTK+ and friends|GTKtoolkit|GTK+ 2.90.3 (unstable) released: http://mail.gnome.org/archives/gtk-devel-list/2010-June/msg00137.html #gtk|1276829633|0||0|0
 264|GTK+ and friends|GTKtoolkit|GLib 2.25.9 (unstable) released: http://ur1.ca/08hrl WARNING: API changes in GDBus, GSettings and GApplication #gtk|1276829581|0||0|0
 265|scaroo|scaroo|RT @scaroo: #SeedKit does RGBA window with css shadows and stuff : http://dl.dropbox.com/u/5746554/seedkit-does-rgba.png|1276734086|0|GTKtoolkit|0|1

docs/reference/gtk/migrating-3to4.md

@@ -638,7 +638,7 @@ nodes.
 
 If you are using a #GtkDrawingArea for custom drawing, you need to switch
 to using gtk_drawing_area_set_draw_func() to set a draw function instead
-of connnecting a handler to the #GtkWidget::draw signal.
+of connecting a handler to the #GtkWidget::draw signal.
 
 ### Stop using APIs to query GdkSurfaces
 

gtk/gtkfilechoosernative.c

@@ -38,7 +38,6 @@
 #include "gtkstylecontext.h"
 #include "gtkheaderbar.h"
 #include "gtklabel.h"
-#include "gtkfilechooserentry.h"
 #include "gtkfilefilterprivate.h"
 
 /**

gtk/gtkfilechoosernativeportal.c

@@ -39,7 +39,6 @@
 #include "gtkheaderbar.h"
 #include "gtklabel.h"
 #include "gtkmain.h"
-#include "gtkfilechooserentry.h"
 #include "gtkfilefilterprivate.h"
 #include "gtkwindowprivate.h"
 

gtk/gtkfilechoosernativequartz.c

@@ -38,7 +38,6 @@
 #include "gtkstylecontext.h"
 #include "gtkheaderbar.h"
 #include "gtklabel.h"
-#include "gtkfilechooserentry.h"
 #include "gtkfilefilterprivate.h"
 
 #include "quartz/gdkquartz.h"

gtk/gtkfilechoosernativewin32.c

@@ -44,7 +44,6 @@
 #include "gtkstylecontext.h"
 #include "gtkheaderbar.h"
 #include "gtklabel.h"
-#include "gtkfilechooserentry.h"
 #include "gtkfilefilterprivate.h"
 #include "gtknative.h"
 

gtk/gtknativedialog.c

@@ -37,7 +37,6 @@
 #include "gtkstylecontext.h"
 #include "gtkheaderbar.h"
 #include "gtklabel.h"
-#include "gtkfilechooserentry.h"
 
 /**
  * SECTION:gtknativedialog

gtk/gtksearchentry.c

@@ -49,17 +49,14 @@
  * @Short_description: An entry which shows a search icon
  * @Title: GtkSearchEntry
  *
- * #GtkSearchEntry is a subclass of #GtkEntry that has been
+ * #GtkSearchEntry is an entry widget that has been tailored for use
- * tailored for use as a search entry.
+ * as a search entry. The main aPI for interacting with a GtkSearchEntry
+ * as entry is the #GtkEditable interface.
  *
  * It will show an inactive symbolic “find” icon when the search
  * entry is empty, and a symbolic “clear” icon when there is text.
  * Clicking on the “clear” icon will empty the search entry.
  *
- * Note that the search/clear icon is shown using a secondary
- * icon, and thus does not work if you are using the secondary
- * icon position for some other purpose.
- *
  * To make filtering appear more reactive, it is a good idea to
  * not react to every change in the entry text immediately, but
  * only after a short delay. To support this, #GtkSearchEntry

gtk/gtkstringfilter.c

@@ -484,7 +484,7 @@ gtk_string_filter_get_match_mode (GtkStringFilter *self)
  * @self: a #GtkStringFilter
  * @mode: the new match mode
  *
- * Sets the match mode fot the filter.
+ * Sets the match mode for the filter.
  */
 void
 gtk_string_filter_set_match_mode (GtkStringFilter *self,

gtk/inspector/visual.ui

@@ -290,10 +290,14 @@
                                     <property name="valign">baseline</property>
                                     <property name="hexpand">1</property>
                                     <signal name="notify::selected" handler="direction_changed"/>
-                                    <items>
+                                    <property name="model">
-                                      <item translatable="yes">Left-to-Right</item>
+                                      <object class="GtkStringList">
-                                      <item translatable="yes">Right-to-Left</item>
+                                        <items>
-                                    </items>
+                                          <item translatable="yes">Left-to-Right</item>
+                                          <item translatable="yes">Right-to-Left</item>
+                                        </items>
+                                      </object>
+                                    </property>
                                   </object>
                                 </child>
                               </object>