[gtk+/open-with-dialog: 63/65] Merge branch 'master' into open-with-dialog

From: Cosimo Cecchi <cosimoc src gnome org>
To: commits-list gnome org
Cc:
Subject: [gtk+/open-with-dialog: 63/65] Merge branch 'master' into open-with-dialog
Date: Tue, 30 Nov 2010 16:28:41 +0000 (UTC)
commit cb916f274673322bb6bfe6ac7256d3526a15cbfa
Merge: 5f942b1 9223245
Author: Cosimo Cecchi <cosimoc gnome org>
Date:   Tue Nov 30 16:27:28 2010 +0100

    Merge branch 'master' into open-with-dialog
    
    Conflicts:
    	docs/reference/gtk/gtk3-sections.txt
    	gtk/gtk.symbols

 NEWS                                  |   47 +
 configure.ac                          |    6 +-
 demos/gtk-demo/combobox.c             |   21 +-
 docs/reference/gtk/Makefile.am        |    3 +-
 docs/reference/gtk/gtk-docs.sgml      |    8 +-
 docs/reference/gtk/gtk3-sections.txt  |  193 +-
 docs/reference/gtk/gtk3.types         |    4 +-
 docs/reference/gtk/images/switch.png  |  Bin 0 -> 1875 bytes
 docs/reference/gtk/tmpl/gtkenums.sgml |    9 -
 docs/reference/gtk/visual_index.xml   |    3 +
 docs/tools/widgets.c                  |   22 +
 gdk/Makefile.am                       |    2 +-
 gdk/abicheck.sh                       |    2 +-
 gdk/gdk.c                             |    4 +-
 gdk/gdk.symbols                       | 1332 ++++-------
 gdk/gdkdevice.c                       |  158 +-
 gdk/gdkdevice.h                       |   49 +-
 gdk/gdkdevicemanager.c                |    8 +-
 gdk/gdkdisplay.c                      |   32 +-
 gdk/gdkevents.c                       |   13 +-
 gdk/gdkinternals.h                    |    6 +
 gdk/gdkkeys.c                         |    2 +-
 gdk/gdkoffscreenwindow.c              |    4 +-
 gdk/gdkpango.c                        |    4 +-
 gdk/gdkrgba.c                         |    6 +-
 gdk/gdkrgba.h                         |    4 +-
 gdk/gdkselection.c                    |    6 +-
 gdk/gdkwindow.c                       |   34 +-
 gdk/makefile.msc                      |    2 +-
 gdk/quartz/gdkevents-quartz.c         |   35 +-
 gdk/quartz/gdkinput.c                 |   10 +-
 gdk/tests/gdk-color.c                 |   16 +-
 gdk/win32/gdkdevice-win32.c           |    4 +-
 gdk/win32/gdkdevice-wintab.c          |    2 +-
 gdk/win32/gdkevents-win32.c           |   33 +-
 gdk/x11/gdkapplaunchcontext-x11.c     |  187 +-
 gdk/x11/gdkcursor-x11.c               |    4 +-
 gdk/x11/gdkdevice-core.c              |    4 +-
 gdk/x11/gdkdevice-xi.c                |   15 +-
 gdk/x11/gdkdevice-xi2.c               |    2 +-
 gdk/x11/gdkdevicemanager-xi.c         |   15 +-
 gdk/x11/gdkdevicemanager-xi2.c        |    8 +-
 gdk/x11/gdkdisplay-x11.c              |   18 +-
 gdk/x11/gdkdnd-x11.c                  |    4 +-
 gdk/x11/gdkeventsource.c              |   30 +-
 gdk/x11/gdkkeys-x11.c                 |    3 +-
 gdk/x11/gdkscreen-x11.c               |    6 +-
 gdk/x11/gdkselection-x11.c            |    6 +-
 gdk/x11/gdkwindow-x11.c               |   14 +-
 gdk/x11/gdkxid.c                      |    8 +-
 gtk/Makefile.am                       |   10 +-
 gtk/abicheck.sh                       |    2 +-
 gtk/gtk.h                             |    4 +-
 gtk/gtk.symbols                       | 3225 ++++++++----------------
 gtk/gtkassistant.c                    |  166 +-
 gtk/gtkbox.c                          |    8 +-
 gtk/gtkbuilder.c                      |    2 +-
 gtk/gtkbutton.c                       |    4 +-
 gtk/gtkcellrenderer.c                 |    2 +-
 gtk/gtkcellrendereraccel.c            |    2 +-
 gtk/gtkcellrenderertext.c             |    4 +-
 gtk/gtkcolorsel.c                     |    2 +-
 gtk/gtkcombobox.c                     |  214 ++-
 gtk/gtkcombobox.h                     |    6 +
 gtk/gtkcomboboxtext.c                 |  101 +-
 gtk/gtkcomboboxtext.h                 |   10 +
 gtk/gtkdnd.c                          |    2 +-
 gtk/gtkentry.c                        |    2 +-
 gtk/gtkenums.h                        |    7 -
 gtk/gtkhruler.c                       |   51 -
 gtk/gtkhruler.h                       |   80 -
 gtk/gtkiconview.c                     |   45 +-
 gtk/gtkmenu.c                         |    9 +-
 gtk/gtkmenushell.c                    |   14 +-
 gtk/gtkplug-x11.c                     |    2 +-
 gtk/gtkruler.c                        |  959 -------
 gtk/gtkruler.h                        |  120 -
 gtk/gtkscalebutton.c                  |    2 +-
 gtk/gtkselection.h                    |    3 +-
 gtk/gtkspinner.c                      |  200 +-
 gtk/gtkswitch.c                       |  998 ++++++++
 gtk/gtkswitch.h                       |   95 +
 gtk/gtktooltip.c                      |    2 +-
 gtk/gtktreeview.c                     |    2 +-
 gtk/gtkvruler.c                       |   80 -
 gtk/gtkvruler.h                       |   80 -
 gtk/gtkwindow.c                       |    2 +-
 gtk/makefile.msc.in                   |    8 +-
 gtk/tests/builder.c                   |    2 -
 gtk/updateiconcache.c                 |   44 +-
 po-properties/POTFILES.in             |    4 +-
 po-properties/POTFILES.skip           |    9 -
 po-properties/ro.po                   | 4391 ++++++++++++++++-----------------
 po/POTFILES.in                        |    4 +-
 po/POTFILES.skip                      |    1 -
 po/de.po                              | 2220 +++++++++--------
 po/id.po                              | 1897 +++++++-------
 po/ro.po                              | 1826 +++++++-------
 po/sl.po                              |   10 +-
 po/th.po                              |   56 +-
 tests/Makefile.am                     |    7 +-
 tests/gtkoffscreenbox.c               |    4 +-
 tests/testgtk.c                       |   69 -
 tests/testinput.c                     |   19 +-
 tests/testmerge.c                     |   10 +
 tests/testswitch.c                    |   86 +
 106 files changed, 9007 insertions(+), 10585 deletions(-)
---
diff --cc docs/reference/gtk/gtk3-sections.txt
index 5468f78,7ae2f72..d985044
--- a/docs/reference/gtk/gtk3-sections.txt
+++ b/docs/reference/gtk/gtk3-sections.txt
@@@ -6399,29 -6391,22 +6391,76 @@@ gtk_grid_get_typ
  </SECTION>
  
  <SECTION>
- <FILE>gtkopenwithdialog</FILE>
- <TITLE>GtkOpenWithDialog</TITLE>
- GtkOpenWithDialog
- GtkOpenWithDialogMode
- gtk_open_with_dialog_new
- gtk_open_with_dialog_new_for_content_type
- gtk_open_with_dialog_get_mode
- gtk_open_with_dialog_get_selected_application
- gtk_open_with_dialog_set_show_set_as_default_button
- gtk_open_with_dialog_get_show_set_as_default_button
- gtk_open_with_dialog_set_show_other_applications
- gtk_open_with_dialog_get_show_other_applications
+ <FILE>gtkswitch</FILE>
+ GtkSwitch
+ gtk_switch_new
+ gtk_switch_set_active
+ gtk_switch_get_active
+ 
+ <SUBSECTION Standard>
+ GtkSwitchClass
+ GTK_TYPE_SWITCH
+ GTK_SWITCH
+ GTK_SWITCH_CLASS
+ GTK_IS_SWITCH
+ GTK_IS_SWITCH_CLASS
+ GTK_SWITCH_GET_CLASS
+ 
+ <SUBSECTION Private>
+ GtkSwitchPrivate
+ gtk_switch_get_type
+ </SECTION>
++
++<SECTION>
++<FILE>gtkappchooserdialog</FILE>
++<TITLE>GtkAppChooserDialog</TITLE>
++GtkAppChooserDialog
++gtk_app_chooser_dialog_new
++gtk_app_chooser_dialog_new_for_content_type
++gtk_app_chooser_dialog_get_widget
++
++<SUBSECTION Standard>
++GtkAppChooserDialogClass
++GTK_TYPE_APP_CHOOSER_DIALOG
++GTK_APP_CHOOSER_DIALOG
++GTK_APP_CHOOSER_DIALOG_CLASS
++GTK_IS_APP_CHOOSER_DIALOG
++GTK_IS_APP_CHOOSER_DIALOG_CLASS
++GTK_APP_CHOOSER_DIALOG_GET_CLASS
++
++<SUBSECTION Private>
++GtkAppChooserDialogPrivate
++gtk_app_chooser_dialog_get_type
++</SECTION>
++
++<SECTION>
++<FILE>gtkappchooserwidget</FILE>
++<TITLE>GtkAppChooserWidget</TITLE>
++GtkAppChooserWidget
++gtk_app_chooser_widget_new
++gtk_app_chooser_widget_set_show_default
++gtk_app_chooser_widget_get_show_default
++gtk_app_chooser_widget_set_show_recommended
++gtk_app_chooser_widget_get_show_recommended
++gtk_app_chooser_widget_set_show_fallback
++gtk_app_chooser_widget_get_show_fallback
++gtk_app_chooser_widget_set_show_other
++gtk_app_chooser_widget_get_show_other
++gtk_app_chooser_widget_set_show_all
++gtk_app_chooser_widget_get_show_all
++gtk_app_chooser_widget_set_default_text
++gtk_app_chooser_widget_get_default_text
 +
 +<SUBSECTION Standard>
- GtkOpenWithDialogClass
- GTK_TYPE_OPEN_WITH_DIALOG
- GTK_OPEN_WITH_DIALOG
- GTK_OPEN_WITH_DIALOG_CLASS
- GTK_IS_OPEN_WITH_DIALOG
- GTK_IS_OPEN_WITH_DIALOG_CLASS
- GTK_OPEN_WITH_DIALOG_GET_CLASS
++GtkAppChooserWidgetClass
++GTK_TYPE_APP_CHOOSER_WIDGET
++GTK_APP_CHOOSER_WIDGET
++GTK_APP_CHOOSER_WIDGET_CLASS
++GTK_IS_APP_CHOOSER_WIDGET
++GTK_IS_APP_CHOOSER_WIDGET_CLASS
++GTK_APP_CHOOSER_WIDGET_GET_CLASS
 +
 +<SUBSECTION Private>
- GtkOpenWithDialogPrivate
- gtk_open_with_dialog_get_type
++GtkAppChooserWidgetPrivate
++gtk_app_chooser_widget_get_type
 +</SECTION>
diff --cc gtk/gtk.symbols
index d815e3f,1c86e1e..e291a0c
--- a/gtk/gtk.symbols
+++ b/gtk/gtk.symbols
@@@ -245,170 -177,48 +177,66 @@@ gtk_alignment_get_type G_GNUC_CONS
  gtk_alignment_new
  gtk_alignment_set
  gtk_alignment_set_padding
- #endif
- #endif
- 
- #if IN_HEADER(__GTK_APPLICATION_H__)
- #if IN_FILE(__GTK_APPLICATION_C__)
- gtk_application_get_type G_GNUC_CONST
+ gtk_alternative_dialog_button_order
++gtk_app_chooser_dialog_new
++gtk_app_chooser_dialog_new_for_content_type
++gtk_app_chooser_dialog_get_type G_GNUC_CONST
++gtk_app_chooser_dialog_get_widget
++gtk_app_chooser_widget_new
++gtk_app_chooser_widget_get_show_all
++gtk_app_chooser_widget_get_default_text
++gtk_app_chooser_widget_get_show_default
++gtk_app_chooser_widget_get_show_fallback
++gtk_app_chooser_widget_get_show_other
++gtk_app_chooser_widget_get_show_recommended
++gtk_app_chooser_widget_get_type G_GNUC_CONST
++gtk_app_chooser_widget_set_default_text
++gtk_app_chooser_widget_set_show_all
++gtk_app_chooser_widget_set_show_default
++gtk_app_chooser_widget_set_show_fallback
++gtk_app_chooser_widget_set_show_other
++gtk_app_chooser_widget_set_show_recommended
  gtk_application_add_window
- gtk_application_new
+ gtk_application_get_type G_GNUC_CONST
  gtk_application_get_windows
+ gtk_application_new
  gtk_application_remove_window
- #endif
- #endif
- 
- #if IN_HEADER(__GTK_ASSISTANT_H__)
- #if IN_FILE(__GTK_ASSISTANT_C__)
+ gtk_arrow_get_type G_GNUC_CONST
+ gtk_arrow_new
+ gtk_arrow_placement_get_type G_GNUC_CONST
+ gtk_arrow_set
+ gtk_arrow_type_get_type G_GNUC_CONST
+ gtk_aspect_frame_get_type G_GNUC_CONST
+ gtk_aspect_frame_new
+ gtk_aspect_frame_set
+ gtk_assistant_add_action_widget
+ gtk_assistant_append_page
+ gtk_assistant_commit
+ gtk_assistant_get_current_page
+ gtk_assistant_get_n_pages
+ gtk_assistant_get_nth_page
+ gtk_assistant_get_page_complete
+ gtk_assistant_get_page_header_image
+ gtk_assistant_get_page_side_image
+ gtk_assistant_get_page_title
+ gtk_assistant_get_page_type
  gtk_assistant_get_type G_GNUC_CONST
+ gtk_assistant_insert_page
  gtk_assistant_new
  gtk_assistant_next_page
+ gtk_assistant_page_type_get_type G_GNUC_CONST
+ gtk_assistant_prepend_page
  gtk_assistant_previous_page
- gtk_assistant_get_current_page
+ gtk_assistant_remove_action_widget
  gtk_assistant_set_current_page
- gtk_assistant_get_n_pages
- gtk_assistant_get_nth_page
- gtk_assistant_prepend_page
- gtk_assistant_append_page
- gtk_assistant_insert_page
  gtk_assistant_set_forward_page_func
- gtk_assistant_set_page_type
- gtk_assistant_get_page_type
- gtk_assistant_set_page_title
- gtk_assistant_get_page_title
+ gtk_assistant_set_page_complete
  gtk_assistant_set_page_header_image
- gtk_assistant_get_page_header_image
  gtk_assistant_set_page_side_image
- gtk_assistant_get_page_side_image
- gtk_assistant_set_page_complete
- gtk_assistant_get_page_complete
- gtk_assistant_add_action_widget
- gtk_assistant_remove_action_widget
+ gtk_assistant_set_page_title
+ gtk_assistant_set_page_type
  gtk_assistant_update_buttons_state
- gtk_assistant_commit
- #endif
- #endif
- 
- #if IN_HEADER(__GTK_TYPE_BUILTINS_H__)
- #if IN_FILE(__GTK_TYPE_BUILTINS_C__)
- gtk_align_get_type G_GNUC_CONST
- gtk_pack_direction_get_type G_GNUC_CONST
- gtk_ui_manager_item_type_get_type G_GNUC_CONST
- gtk_spin_button_update_policy_get_type G_GNUC_CONST
- gtk_notebook_tab_get_type G_GNUC_CONST
- gtk_number_up_layout_get_type G_GNUC_CONST
- gtk_arrow_type_get_type G_GNUC_CONST
- gtk_arrow_placement_get_type G_GNUC_CONST
- gtk_assistant_page_type_get_type G_GNUC_CONST
  gtk_attach_options_get_type G_GNUC_CONST
- gtk_builder_error_get_type G_GNUC_CONST
- gtk_buttons_type_get_type G_GNUC_CONST
- gtk_calendar_display_options_get_type G_GNUC_CONST
- gtk_cell_renderer_mode_get_type G_GNUC_CONST
- gtk_cell_renderer_state_get_type G_GNUC_CONST
- gtk_cell_renderer_accel_mode_get_type
- gtk_corner_type_get_type G_GNUC_CONST
- gtk_debug_flag_get_type G_GNUC_CONST
- gtk_delete_type_get_type G_GNUC_CONST
- gtk_dest_defaults_get_type G_GNUC_CONST
- gtk_drag_result_get_type G_GNUC_CONST
- gtk_dialog_flags_get_type G_GNUC_CONST
- gtk_direction_type_get_type G_GNUC_CONST
- gtk_entry_icon_position_get_type G_GNUC_CONST
- gtk_expander_style_get_type G_GNUC_CONST
- gtk_file_chooser_action_get_type G_GNUC_CONST
- gtk_file_chooser_confirmation_get_type G_GNUC_CONST
- gtk_file_filter_flags_get_type G_GNUC_CONST
- gtk_icon_view_drop_position_get_type G_GNUC_CONST
- gtk_sensitivity_type_get_type G_GNUC_CONST
- gtk_window_type_get_type G_GNUC_CONST
- gtk_wrap_mode_get_type G_GNUC_CONST
- gtk_widget_help_type_get_type G_GNUC_CONST
- gtk_window_position_get_type G_GNUC_CONST
- gtk_tree_view_column_sizing_get_type G_GNUC_CONST
- gtk_tree_view_drop_position_get_type G_GNUC_CONST
- gtk_button_box_style_get_type G_GNUC_CONST
- gtk_icon_lookup_flags_get_type G_GNUC_CONST
- gtk_image_type_get_type G_GNUC_CONST
- gtk_im_preedit_style_get_type G_GNUC_CONST
- gtk_im_status_style_get_type G_GNUC_CONST
- gtk_justification_get_type G_GNUC_CONST
- gtk_license_get_type G_GNUC_CONST
- gtk_menu_direction_type_get_type G_GNUC_CONST
- gtk_message_type_get_type G_GNUC_CONST
- gtk_metric_type_get_type G_GNUC_CONST
- gtk_movement_step_get_type G_GNUC_CONST
- gtk_orientation_get_type G_GNUC_CONST
- gtk_pack_type_get_type G_GNUC_CONST
- gtk_page_orientation_get_type G_GNUC_CONST
- gtk_print_operation_result_get_type G_GNUC_CONST
- gtk_print_pages_get_type G_GNUC_CONST
- gtk_print_quality_get_type G_GNUC_CONST
- gtk_print_status_get_type G_GNUC_CONST
- gtk_page_set_get_type G_GNUC_CONST
- gtk_path_priority_type_get_type G_GNUC_CONST
- gtk_path_type_get_type G_GNUC_CONST
- gtk_policy_type_get_type G_GNUC_CONST
- gtk_position_type_get_type G_GNUC_CONST
- gtk_print_duplex_get_type G_GNUC_CONST
- gtk_print_error_get_type G_GNUC_CONST
- gtk_recent_filter_flags_get_type G_GNUC_CONST
- gtk_print_operation_action_get_type G_GNUC_CONST
- gtk_rc_flags_get_type G_GNUC_CONST
- gtk_rc_token_type_get_type G_GNUC_CONST
- gtk_recent_chooser_error_get_type G_GNUC_CONST
- gtk_recent_manager_error_get_type G_GNUC_CONST
- gtk_recent_sort_type_get_type G_GNUC_CONST
- gtk_unit_get_type G_GNUC_CONST
- gtk_relief_style_get_type G_GNUC_CONST
- gtk_resize_mode_get_type G_GNUC_CONST
- gtk_response_type_get_type G_GNUC_CONST
- gtk_scroll_step_get_type G_GNUC_CONST
- gtk_scroll_type_get_type G_GNUC_CONST
- gtk_selection_mode_get_type G_GNUC_CONST
- gtk_shadow_type_get_type G_GNUC_CONST
- gtk_size_group_mode_get_type G_GNUC_CONST
- gtk_size_request_mode_get_type G_GNUC_CONST
- gtk_sort_type_get_type G_GNUC_CONST
- gtk_spin_type_get_type G_GNUC_CONST
- gtk_state_type_get_type G_GNUC_CONST
- gtk_target_flags_get_type G_GNUC_CONST
- gtk_text_direction_get_type G_GNUC_CONST
- gtk_text_buffer_target_info_get_type G_GNUC_CONST
- gtk_text_search_flags_get_type G_GNUC_CONST
- gtk_text_window_type_get_type G_GNUC_CONST
- gtk_tool_palette_drag_targets_get_type G_GNUC_CONST
- gtk_tree_model_flags_get_type G_GNUC_CONST
- gtk_tree_view_grid_lines_get_type G_GNUC_CONST
- gtk_update_type_get_type G_GNUC_CONST
- gtk_accel_flags_get_type G_GNUC_CONST
- gtk_icon_size_get_type G_GNUC_CONST
- gtk_file_chooser_error_get_type G_GNUC_CONST
- gtk_icon_theme_error_get_type G_GNUC_CONST
- gtk_toolbar_space_style_get_type G_GNUC_CONST
- gtk_toolbar_style_get_type G_GNUC_CONST
- #endif
- #endif
- 
- #if IN_HEADER(__GTK_ARROW_H__)
- #if IN_FILE(__GTK_ARROW_C__)
- gtk_arrow_get_type G_GNUC_CONST
- gtk_arrow_new
- gtk_arrow_set
- #endif
- #endif
- 
- #if IN_HEADER(__GTK_ASPECT_FRAME_H__)
- #if IN_FILE(__GTK_ASPECT_FRAME_C__)
- gtk_aspect_frame_get_type G_GNUC_CONST
- gtk_aspect_frame_new
- gtk_aspect_frame_set
- #endif
- #endif
- 
- #if IN_HEADER(__GTK_BINDINGS_H__)
- #if IN_FILE(__GTK_BINDINGS_C__)
- gtk_binding_entry_skip
  gtk_binding_entry_add_signal
  gtk_binding_entry_add_signall
  gtk_binding_entry_remove
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]