[gtk+/places-sidebar: 209/212] Merge branch 'origin/master' into places-sidebar
- From: Federico Mena Quintero <federico src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+/places-sidebar: 209/212] Merge branch 'origin/master' into places-sidebar
- Date: Wed, 27 Feb 2013 19:58:19 +0000 (UTC)
commit a46976fb79dac40288727bdaa4a5a231d9edddf3
Merge: 936045e bbfc8f9
Author: Federico Mena Quintero <federico gnome org>
Date: Wed Feb 27 10:29:35 2013 -0600
Merge branch 'origin/master' into places-sidebar
NEWS | 61 +
README.in | 8 +
build/win32/vs10/Makefile.am | 10 +-
build/win32/vs10/gailutil.vcxproj | 8 +-
build/win32/vs10/gdk.vcxprojin | 16 +-
build/win32/vs10/gtk+.props | 713 +++++-----
build/win32/vs10/gtk+.sln | 12 +-
build/win32/vs10/gtk.vcxprojin | 10 +-
...ail.vcxprojin => gtk3-demo-application.vcxproj} | 104 +-
...ersin => gtk3-demo-application.vcxproj.filters} | 7 +-
build/win32/vs10/gtk3-demo.vcxproj | 7 +-
build/win32/vs10/gtk3-demo.vcxproj.filters | 3 -
...vcxproj.filtersin => gtka11y.vcxproj.filtersin} | 4 +-
.../vs10/{libgail.vcxprojin => gtka11y.vcxprojin} | 6 +-
build/win32/vs10/install.vcxproj | 4 +
build/win32/vs9/Makefile.am | 5 +-
build/win32/vs9/gailutil.vcproj | 8 +-
build/win32/vs9/gdk.vcprojin | 16 +-
build/win32/vs9/gtk+.sln | 17 +-
build/win32/vs9/gtk+.vsprops | 700 +++++-----
build/win32/vs9/gtk.vcprojin | 8 +-
...bgail.vcprojin => gtk3-demo-application.vcproj} | 96 +-
build/win32/vs9/gtk3-demo.vcproj | 5 +-
.../vs9/{libgail.vcprojin => gtka11y.vcprojin} | 6 +-
configure.ac | 2 +-
demos/gtk-demo/css_accordion.css | 2 +-
demos/gtk-demo/css_basics.css | 2 +-
demos/gtk-demo/css_multiplebgs.css | 4 +-
demos/gtk-demo/css_pixbufs.css | 22 +-
demos/gtk-demo/css_shadows.css | 4 +-
demos/gtk-demo/main.c | 97 +-
demos/gtk-demo/pixbufs.c | 36 +-
demos/pixbuf-demo/pixbuf-demo.c | 31 +-
docs/reference/gdk/gdk-docs.sgml | 6 +
docs/reference/gdk/gdk3-sections.txt | 37 +
docs/reference/gtk/gtk3-sections.txt | 20 +
gdk/Makefile.am | 8 +-
gdk/broadway/gdkeventsource.c | 10 +-
gdk/broadway/gdkwindow-broadway.c | 16 -
gdk/gdk.c | 4 +-
gdk/gdk.h | 2 +
gdk/gdk.symbols | 22 +
gdk/gdkdisplay.c | 36 +
gdk/gdkdisplayprivate.h | 6 +
gdk/gdkevents.c | 75 +-
gdk/gdkframeclock.c | 606 ++++++++
gdk/gdkframeclock.h | 111 ++
gdk/gdkframeclockidle.c | 586 ++++++++
gdk/gdkframeclockidle.h | 68 +
gdk/gdkframeclockprivate.h | 101 ++
gdk/gdkframetimings.c | 219 +++
gdk/gdkframetimings.h | 56 +
gdk/gdkinternals.h | 10 +-
gdk/gdkwindow.c | 293 +++-
gdk/gdkwindow.h | 7 +
gdk/quartz/gdkeventloop-quartz.c | 14 +-
gdk/quartz/gdkwindow-quartz.c | 12 -
gdk/wayland/gdkdevice-wayland.c | 2 +
gdk/wayland/gdkdisplay-wayland.c | 14 +-
gdk/wayland/gdkdisplay-wayland.h | 1 -
gdk/wayland/gdkeventsource.c | 6 +
gdk/wayland/gdkprivate-wayland.h | 5 +-
gdk/wayland/gdkscreen-wayland.c | 19 +-
gdk/wayland/gdkwindow-wayland.c | 65 +-
gdk/win32/gdkevents-win32.c | 25 +-
gdk/win32/gdkproperty-win32.c | 4 +-
gdk/win32/gdkwindow-win32.c | 15 -
gdk/x11/Makefile.am | 4 +-
gdk/x11/gdkdevicemanager-xi2.c | 29 +-
gdk/x11/gdkdisplay-x11.c | 251 +++-
gdk/x11/gdkeventsource.c | 12 +-
gdk/x11/gdkprivate-x11.h | 5 +-
gdk/x11/gdkproperty-x11.c | 20 +
gdk/x11/gdkscreen-x11.c | 269 +----
gdk/x11/gdkscreen-x11.h | 11 +-
gdk/x11/gdksettings.c | 17 -
gdk/x11/gdkwindow-x11.c | 374 ++++-
gdk/x11/gdkwindow-x11.h | 30 +-
gdk/x11/gdkx11window.h | 1 +
gdk/x11/xsettings-client.c | 698 +++++-----
gdk/x11/xsettings-client.h | 54 +-
gdk/x11/xsettings-common.c | 158 --
gdk/x11/xsettings-common.h | 122 --
gtk/a11y/Makefile.am | 32 +-
gtk/a11y/gtkcellaccessible.c | 2 +-
gtk/a11y/gtktextviewaccessible.c | 10 +
gtk/a11y/gtktreeviewaccessible.c | 95 +-
gtk/gtk.symbols | 11 +
gtk/gtkaccellabel.c | 8 +-
gtk/gtkapplication.c | 14 +-
gtk/gtkbox.c | 25 +-
gtk/gtkcellrenderer.c | 10 +-
gtk/gtkcellrenderer.h | 2 +-
gtk/gtkcellrendererpixbuf.c | 2 +-
gtk/gtkcellrenderertext.c | 2 +-
gtk/gtkcellrenderertoggle.c | 2 +-
gtk/gtkcolorswatch.c | 2 +-
gtk/gtkcombobox.c | 27 +
gtk/gtkcontainer.c | 92 +-
gtk/gtkcontainerprivate.h | 2 +
gtk/gtkentry.c | 49 +-
gtk/gtkfilechooserbutton.c | 39 +-
gtk/gtkfilechooserdefault.c | 21 +-
gtk/gtkfilesystem.c | 2 +-
gtk/gtkiconfactory.c | 2 +-
gtk/gtkiconhelper.c | 2 +-
gtk/gtkicontheme.c | 634 ++++++++-
gtk/gtkicontheme.h | 42 +
gtk/gtkimmodule.c | 14 +-
gtk/gtknumerableicon.c | 2 +-
gtk/gtkplug.c | 2 -
gtk/gtkradiomenuitem.c | 42 +-
gtk/gtkrecentmanager.c | 2 +-
gtk/gtkscrolledwindow.c | 36 +-
gtk/gtkstylecontext.c | 173 ++-
gtk/gtkstylecontext.h | 7 +
gtk/gtktexthandle.c | 16 +-
gtk/gtktoolbar.c | 23 +-
gtk/gtktreeview.c | 1 +
gtk/gtkuimanager.c | 1 -
gtk/gtkviewport.c | 7 +-
gtk/gtkwidget.c | 350 +++++-
gtk/gtkwidget.h | 32 +
gtk/gtkwindow.c | 13 +-
gtk/tests/filechooser.c | 271 +++-
gtk/tests/treeview-scrolling.c | 32 +-
gtk/updateiconcache.c | 23 +-
po-properties/cs.po | 1370 +++++++++---------
po-properties/el.po | 1502 ++++++++++----------
po-properties/es.po | 1480 ++++++++++----------
po-properties/pa.po | 1474 ++++++++++----------
po-properties/pl.po | 908 ++++++------
po/ca.po | 383 +++---
po/ca valencia po | 576 +++++---
po/cs.po | 385 +++---
po/de.po | 933 +++++++++---
po/el.po | 475 ++++---
po/es.po | 384 ++++--
po/et.po | 15 +-
po/ja.po | 605 +++++----
po/kk.po | 56 +-
po/lt.po | 4 +-
po/pa.po | 465 +++---
po/pl.po | 326 +++--
po/ru.po | 418 +++---
po/sl.po | 4 +-
po/sr.po | 53 +-
po/sr latin po | 53 +-
tests/Makefile.am | 16 +
tests/animated-resizing.c | 324 +++++
tests/motion-compression.c | 72 +
tests/reftests/Makefile.am | 3 +
tests/reftests/image-load-from-file.css | 3 +
tests/reftests/image-load-from-file.ref.ui | 17 +
tests/reftests/image-load-from-file.ui | 15 +
tests/testicontheme.c | 63 +-
tests/variable.c | 43 +
tests/variable.h | 23 +
tests/video-timer.c | 399 ++++++
159 files changed, 13585 insertions(+), 8008 deletions(-)
---
diff --cc gtk/gtkfilechooserdefault.c
index d97bf1a,498efd1..996c7fc
--- a/gtk/gtkfilechooserdefault.c
+++ b/gtk/gtkfilechooserdefault.c
@@@ -338,9 -385,14 +338,9 @@@ static void path_bar_clicked (GtkPathBa
gboolean child_is_hidden,
GtkFileChooserDefault *impl);
-static void add_bookmark_button_clicked_cb (GtkButton *button,
- GtkFileChooserDefault *impl);
-static void remove_bookmark_button_clicked_cb (GtkButton *button,
- GtkFileChooserDefault *impl);
-
static void update_cell_renderer_attributes (GtkFileChooserDefault *impl);
- static void load_remove_timer (GtkFileChooserDefault *impl);
+ static void load_remove_timer (GtkFileChooserDefault *impl, LoadState new_load_state);
static void browse_files_center_selected_row (GtkFileChooserDefault *impl);
static void location_button_toggled_cb (GtkToggleButton *toggle,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
