[gtk+/places-sidebar: 327/328] Merge gtk-3-2 branch to update to a current version
- From: Federico Mena Quintero <federico src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+/places-sidebar: 327/328] Merge gtk-3-2 branch to update to a current version
- Date: Fri, 25 Nov 2011 20:43:44 +0000 (UTC)
commit d9f49216f63efa137468d0cc75d8563b271ee2e1
Merge: 6a2ffad 32c08de
Author: Federico Mena Quintero <federico gnome org>
Date: Fri Nov 25 12:25:19 2011 -0600
Merge gtk-3-2 branch to update to a current version
NEWS | 200 +
configure.ac | 15 +-
docs/reference/gtk/gtk3-sections.txt | 55 +-
docs/reference/gtk/gtk3.types | 3 +
gdk/broadway/gdkdisplaymanager-broadway.c | 14 -
gdk/gdkcairo.c | 4 +
gdk/gdkdisplay.c | 7 +-
gdk/gdkdisplaymanager.c | 3 +
gdk/gdkkeys.c | 127 +
gdk/gdkkeys.h | 18 -
gdk/gdkkeysprivate.h | 5 +
gdk/gdkpango.c | 5 +-
gdk/gdkscreen.c | 9 +-
gdk/quartz/GdkQuartzNSWindow.c | 5 +
gdk/quartz/gdkdevice-core-quartz.c | 5 -
gdk/quartz/gdkdisplaymanager-quartz.c | 14 -
gdk/quartz/gdkeventloop-quartz.c | 58 +-
gdk/quartz/gdkevents-quartz.c | 135 +-
gdk/quartz/gdkkeys-quartz.c | 137 +-
gdk/quartz/gdkwindow-quartz.c | 12 +-
gdk/wayland/gdkdisplaymanager-wayland.c | 127 -
gdk/win32/gdkdisplaymanager-win32.c | 14 -
gdk/x11/gdkapplaunchcontext-x11.c | 12 +-
gdk/x11/gdkdisplay-x11.c | 4 +-
gdk/x11/gdkdisplaymanager-x11.c | 2 +
gdk/x11/gdkkeys-x11.c | 148 +-
gdk/x11/gdkprivate-x11.h | 2 +
gtk/Makefile.am | 15 +-
gtk/a11y/gtktreeviewaccessible.c | 31 +-
gtk/gtk.h | 1 +
gtk/gtk.symbols | 22 +-
gtk/gtkaboutdialog.c | 2 +-
gtk/gtkaccelgroup.c | 71 +-
gtk/gtkaccelmap.c | 10 +-
gtk/gtkappchooser.c | 14 +
gtk/gtkappchooserbutton.c | 172 +-
gtk/gtkappchooserbutton.h | 3 +
gtk/gtkappchooserdialog.c | 3 +
gtk/gtkappchooserwidget.c | 47 +-
gtk/gtkapplication.c | 3 +
gtk/gtkassistant.c | 11 +-
gtk/gtkbindings.c | 2 +-
gtk/gtkbox.c | 38 +-
gtk/gtkbutton.c | 7 +-
gtk/gtkcellarea.c | 26 +-
gtk/gtkcelllayout.c | 2 +-
gtk/gtkcellrendereraccel.c | 38 +-
gtk/gtkcheckbutton.c | 5 +-
gtk/gtkcheckmenuitem.c | 7 +-
gtk/gtkcolorsel.c | 3 +-
gtk/gtkcombobox.c | 89 +-
gtk/gtkcontainer.c | 30 +-
gtk/gtkcontainerprivate.h | 1 +
gtk/gtkcssprovider.c | 35 +-
gtk/gtkdialog.c | 10 +-
gtk/gtkdialog.h | 2 +-
gtk/gtkdnd-quartz.c | 123 +-
gtk/gtkentry.c | 33 +-
gtk/gtkfilechooserbutton.c | 13 +-
gtk/gtkfilechooserdefault.c | 17 +-
gtk/gtkfilechooserdialog.c | 2 +-
gtk/gtkfontbutton.c | 549 ++-
gtk/gtkfontchooser.c | 1291 +----
gtk/gtkfontchooser.h | 126 +-
gtk/gtkfontchooserdialog.c | 192 +-
gtk/gtkfontchooserdialog.h | 9 -
gtk/gtkfontchooserprivate.h | 37 +
gtk/gtkfontchooserutils.c | 174 +
gtk/gtkfontchooserutils.h | 54 +
gtk/gtkfontchooserwidget.c | 1300 +++++
gtk/gtkfontchooserwidget.h | 71 +
gtk/gtkgrid.c | 13 +-
gtk/gtkiconcache.c | 30 +-
gtk/gtkiconfactory.c | 3 +-
gtk/gtkicontheme.c | 6 +-
gtk/gtkiconview.c | 98 +-
gtk/gtkimagemenuitem.c | 15 +-
gtk/gtkimcontextsimple.c | 2 +-
gtk/gtkimmulticontext.c | 2 +-
gtk/gtkkeyhash.c | 35 +-
gtk/gtklabel.c | 23 +-
gtk/gtklinkbutton.c | 13 +-
gtk/gtkliststore.c | 32 +-
gtk/gtkmain.c | 65 +
gtk/gtkmenu.c | 14 +-
gtk/gtkmenuitem.c | 16 +-
gtk/gtkmessagedialog.c | 34 +-
gtk/gtkmodules.c | 4 +-
gtk/gtkmountoperation-x11.c | 1 +
gtk/gtkmountoperation.c | 3 +-
gtk/gtknotebook.c | 14 +-
gtk/gtkpaned.c | 6 +-
gtk/gtkprintcontext.c | 2 +-
gtk/gtkprintoperation.c | 26 +-
gtk/gtkprintunixdialog.c | 2 +
gtk/gtkprivate.h | 44 +-
gtk/gtkprogressbar.c | 4 +-
gtk/gtkquartz.c | 91 +
gtk/gtkradiobutton.c | 2 +-
gtk/gtkradiomenuitem.c | 11 +-
gtk/gtkradiotoolbutton.c | 26 +-
gtk/gtkrc.c | 10 +-
gtk/gtkrc.key.mac | 135 +-
gtk/gtkrecentchooserdefault.c | 4 +-
gtk/gtkrecentchooserdialog.c | 4 +-
gtk/gtkrecentmanager.c | 4 +-
gtk/gtksearchenginetracker.c | 487 +-
gtk/gtkselection.c | 3 +-
gtk/gtksettings.c | 2 +-
gtk/gtkstatusicon.c | 8 +-
gtk/gtkstock.c | 22 +-
gtk/gtkstyle.c | 10 +-
gtk/gtkstyleproperty.c | 42 +-
gtk/gtksymboliccolor.c | 6 +-
gtk/gtktextbuffer.c | 8 +-
gtk/gtktextview.c | 27 +-
gtk/gtktogglebutton.c | 5 +-
gtk/gtktoolbar.c | 64 +-
gtk/gtktoolbutton.c | 6 +-
gtk/gtktreemodel.c | 4 +-
gtk/gtktreemodelfilter.c | 416 ++-
gtk/gtktreestore.c | 20 +-
gtk/gtktreeview.c | 158 +-
gtk/gtktreeviewcolumn.c | 30 +-
gtk/gtkviewport.c | 8 +-
gtk/gtkwidget.c | 67 +-
gtk/gtkwindow.c | 9 +-
gtk/tests/filtermodel.c | 1766 ++++++-
gtk/tests/grid.c | 6 +-
gtk/updateiconcache.c | 8 +-
po-properties/POTFILES.in | 1 +
po-properties/POTFILES.skip | 2 +
po-properties/as.po | 3928 +++++++--------
po-properties/ast.po | 5129 ++++++++++--------
po-properties/bg.po | 871 ++--
po-properties/ca.po | 3183 ++++++------
po-properties/ca valencia po | 2425 +++++----
po-properties/cs.po | 3205 ++++++------
po-properties/da.po | 3193 ++++++------
po-properties/de.po | 770 ++--
po-properties/en_GB.po | 3172 ++++++------
po-properties/es.po | 778 ++--
po-properties/eu.po | 3801 +++++++------
po-properties/fr.po | 267 +-
po-properties/gl.po | 781 ++--
po-properties/hu.po | 3160 ++++++------
po-properties/it.po | 5667 +++++++++++---------
po-properties/ko.po | 405 +-
po-properties/lt.po | 421 +-
po-properties/lv.po | 3706 ++++---------
po-properties/or.po | 5440 +++++++++++--------
po-properties/pa.po | 765 ++--
po-properties/pl.po | 3183 ++++++------
po-properties/pt.po | 280 +-
po-properties/pt_BR.po | 444 +-
po-properties/ru.po | 810 ++--
po-properties/sl.po | 2099 ++++----
po-properties/sr.po | 3197 ++++++------
po-properties/sr latin po | 3195 ++++++------
po-properties/sv.po | 3217 ++++++-----
po-properties/ta.po | 5391 +++++++++++--------
po-properties/zh_CN.po | 3206 ++++++------
po/POTFILES.in | 1 +
po/POTFILES.skip | 2 +
po/as.po | 2573 ++-------
po/be.po | 97 +-
po/bg.po | 548 +-
po/ca.po | 1308 +++--
po/ca valencia po | 939 ++--
po/cs.po | 1052 ++--
po/da.po | 1051 ++--
po/de.po | 823 ++--
po/en_GB.po | 1050 ++--
po/eo.po | 887 ++--
po/es.po | 347 +-
po/eu.po | 1503 +++---
po/fr.po | 1219 ++---
po/gl.po | 554 +-
po/hu.po | 1083 +++--
po/it.po | 783 ++--
po/ja.po | 2132 +++-----
po/ko.po | 183 +-
po/lt.po | 210 +-
po/lv.po | 858 ++--
po/nb.po | 75 +-
po/nl.po | 2137 +++-----
po/pa.po | 570 +-
po/pl.po | 791 ++--
po/pt.po | 83 +-
po/pt_BR.po | 214 +-
po/ru.po | 981 ++--
po/sl.po | 1294 ++----
po/sr.po | 605 ++--
po/sr latin po | 605 ++--
po/sv.po | 483 +-
po/ta.po | 2484 +++++----
po/te.po | 3085 +++++------
po/vi.po | 1211 +++--
po/zh_CN.po | 1050 ++--
tests/Makefile.am | 2 +
tests/a11y/iconview.txt | 4 +-
tests/css/parser/declarations-valid-26.css | 1 +
tests/css/parser/declarations-valid-26.ref.css | 4 +
tests/prop-editor.c | 63 +
tests/reftests/Makefile.am | 3 +
tests/reftests/background-color-transparent.css | 4 +
tests/reftests/background-color-transparent.ref.ui | 46 +
tests/reftests/background-color-transparent.ui | 46 +
tests/reftests/unresolvable.css | 2 +-
tests/testappchooser.c | 10 +-
tests/testappchooserbutton.c | 5 +-
tests/testfontchooser.c | 42 +-
tests/testfontchooserdialog.c | 69 +-
tests/testtoolbar.c | 6 +
tests/widget-factory.ui | 253 +-
215 files changed, 63526 insertions(+), 57804 deletions(-)
---
diff --cc gtk/gtkfilechooserbutton.c
index eb38f7d,45116df..5c5b95f
--- a/gtk/gtkfilechooserbutton.c
+++ b/gtk/gtkfilechooserbutton.c
@@@ -477,14 -477,12 +477,15 @@@ gtk_file_chooser_button_init (GtkFileCh
gtk_widget_push_composite_child ();
+ /* Bookmarks manager */
+ priv->bookmarks_manager = _gtk_bookmarks_manager_new (bookmarks_changed_cb, button);
+
/* Button */
priv->button = gtk_button_new ();
- g_signal_connect (priv->button, "clicked", G_CALLBACK (button_clicked_cb),
- button);
- gtk_container_add (GTK_CONTAINER (button), priv->button);
+ g_signal_connect (priv->button, "clicked",
+ G_CALLBACK (button_clicked_cb), button);
+ gtk_box_pack_start (GTK_BOX (button), priv->button, TRUE, TRUE, 0);
+ gtk_widget_set_halign (priv->button, GTK_ALIGN_FILL);
gtk_widget_show (priv->button);
box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 4);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
