diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2010-04-30 17:56:50 -0400 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2010-04-30 17:56:50 -0400 |
| commit | db76c77b819b1b31e19609bb1b30c85f22b5b482 (patch) | |
| tree | a8a219c1c86e717e4144e4d07dcef7dfee17cd2c /gtk/gtkfilechooser.c | |
| parent | 6ea712fe0968e770f23d865f9bab10266efc06fc (diff) | |
| parent | 3833ef5c35b9dd9ca13bb9a61e6e322cc62fe369 (diff) | |
| download | gtk+-db76c77b819b1b31e19609bb1b30c85f22b5b482.tar.gz | |
Merge branch 'native-layout-incubator'
Conflicts:
configure.in
docs/reference/gtk/tmpl/gtkaction.sgml
docs/reference/gtk/tmpl/gtkbuilder.sgml
gdk/directfb/gdkkeys-directfb.c
gdk/gdk.symbols
gdk/x11/gdkwindow-x11.c
gtk/gtkalignment.c
gtk/gtkbox.c
gtk/gtkbutton.c
gtk/gtkcelleditable.c
gtk/gtkfilechooser.c
gtk/gtkframe.c
gtk/gtkinvisible.c
gtk/gtklabel.c
gtk/gtkscrolledwindow.c
gtk/gtksearchenginetracker.c
gtk/gtktextview.c
gtk/gtktoolbutton.c
gtk/gtktooltip.c
gtk/gtkviewport.c
gtk/gtkwidget.c
gtk/gtkwindow.c
po-properties/ca@valencia.po
po-properties/es.po
po-properties/kn.po
po-properties/mr.po
po/ca.po
po/ca@valencia.po
po/el.po
po/es.po
po/gl.po
po/id.po
po/kn.po
po/lv.po
po/mr.po
po/th.po
Diffstat (limited to 'gtk/gtkfilechooser.c')
| -rw-r--r-- | gtk/gtkfilechooser.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/gtk/gtkfilechooser.c b/gtk/gtkfilechooser.c index 85f972f064..7341b63974 100644 --- a/gtk/gtkfilechooser.c +++ b/gtk/gtkfilechooser.c @@ -323,7 +323,7 @@ * </variablelist> * <note> * You can create your own bindings for the - * GtkFileChooserDefault::location-popup signal with custom + * #GtkFileChooserDefault::location-popup signal with custom * <parameter>path</parameter> strings, and have a crude form * of easily-to-type bookmarks. For example, say you access * the path <filename>/home/username/misc</filename> very @@ -504,7 +504,11 @@ * </listitem> * </varlistentry> * <varlistentry> +<<<<<<< HEAD * <term><parameter>bookmark_indes</parameter> :</term> +======= + * <term><parameter>bookmark_index</parameter> :</term> +>>>>>>> native-layout-incubator * <listitem> * <simpara> * index of the bookmark to switch to; the indices start at 0. |