[gtk+] Fix abi check after recent merges
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+] Fix abi check after recent merges
- Date: Sun, 5 Dec 2010 17:19:05 +0000 (UTC)
commit d5df33c75f8a5be6ecf194e48d0f2ac174a3afb0
Author: Matthias Clasen <mclasen redhat com>
Date: Sun Dec 5 12:18:30 2010 -0500
Fix abi check after recent merges
gtk/gtk.symbols | 181 +++++++++++++++++++++++++++++++++
gtk/gtk9slice.c | 34 +++---
gtk/gtk9slice.h | 40 ++++----
gtk/gtkanimationdescription.c | 26 +++---
gtk/gtkanimationdescription.h | 22 ++--
gtk/gtkappchooserdialog.c | 16 ++--
gtk/gtkappchooseronline.c | 31 +++---
gtk/gtkappchooseronline.h | 24 ++--
gtk/gtkappchooseronlinepk.c | 4 +-
gtk/gtkassistant.c | 10 +-
gtk/gtkcssprovider.c | 10 +-
gtk/gtkspinner.c | 8 +-
gtk/gtkstylecontext.c | 42 ++++----
gtk/gtkthemingengine.c | 4 +-
gtk/gtktimeline.c | 222 ++++++++++++++++++++--------------------
gtk/gtktimeline.h | 56 +++++-----
gtk/gtkwidget.c | 4 +-
17 files changed, 457 insertions(+), 277 deletions(-)
---
diff --git a/gtk/gtk.symbols b/gtk/gtk.symbols
index e1d9de2..7d444bb 100644
--- a/gtk/gtk.symbols
+++ b/gtk/gtk.symbols
@@ -265,6 +265,7 @@ gtk_border_copy
gtk_border_free
gtk_border_get_type G_GNUC_CONST
gtk_border_new G_GNUC_MALLOC
+gtk_border_style_get_type G_GNUC_CONST
gtk_box_get_homogeneous
gtk_box_get_spacing
gtk_box_get_type G_GNUC_CONST
@@ -592,6 +593,7 @@ gtk_container_get_focus_chain
gtk_container_get_focus_child
gtk_container_get_focus_hadjustment
gtk_container_get_focus_vadjustment
+gtk_container_get_path_for_child
gtk_container_get_resize_mode
gtk_container_get_type G_GNUC_CONST
gtk_container_propagate_draw
@@ -606,6 +608,15 @@ gtk_container_set_reallocate_redraws
gtk_container_set_resize_mode
gtk_container_unset_focus_chain
gtk_corner_type_get_type G_GNUC_CONST
+gtk_css_provider_error_get_type
+gtk_css_provider_error_quark
+gtk_css_provider_get_default
+gtk_css_provider_get_named
+gtk_css_provider_get_type
+gtk_css_provider_load_from_data
+gtk_css_provider_load_from_file
+gtk_css_provider_load_from_path
+gtk_css_provider_new
gtk_custom_paper_unix_dialog_get_type G_GNUC_CONST
gtk_debug_flag_get_type G_GNUC_CONST
gtk_decorated_window_calculate_frame_size
@@ -616,6 +627,13 @@ gtk_delete_type_get_type G_GNUC_CONST
gtk_dest_defaults_get_type G_GNUC_CONST
gtk_device_grab_add
gtk_device_grab_remove
+gtk_gradient_add_color_stop
+gtk_gradient_get_type
+gtk_gradient_new_linear
+gtk_gradient_new_radial
+gtk_gradient_ref
+gtk_gradient_resolve
+gtk_gradient_unref
gtk_dialog_add_action_widget
gtk_dialog_add_button
gtk_dialog_add_buttons G_GNUC_NULL_TERMINATED
@@ -1033,6 +1051,7 @@ gtk_icon_info_get_filename
gtk_icon_info_get_type G_GNUC_CONST
gtk_icon_info_load_icon
gtk_icon_info_load_symbolic
+gtk_icon_info_load_symbolic_for_context
gtk_icon_info_load_symbolic_for_style
gtk_icon_info_new_for_pixbuf
gtk_icon_info_set_raw_coordinates
@@ -1248,6 +1267,7 @@ gtk_invisible_get_type G_GNUC_CONST
gtk_invisible_new
gtk_invisible_new_for_screen
gtk_invisible_set_screen
+gtk_junction_sides_get_type G_GNUC_CONST
gtk_justification_get_type G_GNUC_CONST
gtk_key_snooper_install
gtk_key_snooper_remove
@@ -1430,6 +1450,13 @@ gtk_misc_get_padding
gtk_misc_get_type G_GNUC_CONST
gtk_misc_set_alignment
gtk_misc_set_padding
+gtk_modifier_style_get_type
+gtk_modifier_style_map_color
+gtk_modifier_style_new
+gtk_modifier_style_set_background_color
+gtk_modifier_style_set_color
+gtk_modifier_style_set_color_property
+gtk_modifier_style_set_font
gtk_mount_operation_get_parent
gtk_mount_operation_get_screen
gtk_mount_operation_get_type G_GNUC_CONST
@@ -2057,7 +2084,23 @@ gtk_recent_manager_new
gtk_recent_manager_purge_items
gtk_recent_manager_remove_item
gtk_recent_sort_type_get_type G_GNUC_CONST
+gtk_region_flags_get_type G_GNUC_CONST
gtk_relief_style_get_type G_GNUC_CONST
+gtk_render_activity
+gtk_render_arrow
+gtk_render_background
+gtk_render_check
+gtk_render_expander
+gtk_render_extension
+gtk_render_focus
+gtk_render_frame
+gtk_render_frame_gap
+gtk_render_handle
+gtk_render_icon_pixbuf
+gtk_render_layout
+gtk_render_line
+gtk_render_option
+gtk_render_slider
gtk_requisition_copy
gtk_requisition_free
gtk_requisition_get_type G_GNUC_CONST
@@ -2223,6 +2266,7 @@ gtk_spinner_new
gtk_spinner_start
gtk_spinner_stop
gtk_spin_type_get_type G_GNUC_CONST
+gtk_state_flags_get_type G_GNUC_CONST
gtk_state_type_get_type G_GNUC_CONST
gtk_statusbar_get_context_id
gtk_statusbar_get_message_area
@@ -2280,17 +2324,94 @@ gtk_switch_new
gtk_switch_set_active
gtk_style_apply_default_background
gtk_style_attach
+gtk_style_context_add_class
+gtk_style_context_add_provider
+gtk_style_context_add_provider_for_screen
+gtk_style_context_add_region
+gtk_style_context_get
+gtk_style_context_get_background_color
+gtk_style_context_get_border
+gtk_style_context_get_border_color
+gtk_style_context_get_color
+gtk_style_context_get_direction
+gtk_style_context_get_junction_sides
+gtk_style_context_get_margin
+gtk_style_context_get_padding
+gtk_style_context_get_path
+gtk_style_context_get_property
+gtk_style_context_get_screen
+gtk_style_context_get_state
+gtk_style_context_get_style
+gtk_style_context_get_style_property
+gtk_style_context_get_style_valist
+gtk_style_context_get_type
+gtk_style_context_get_valist
+gtk_style_context_has_class
+gtk_style_context_has_region
+gtk_style_context_invalidate
+gtk_style_context_list_classes
+gtk_style_context_list_regions
+gtk_style_context_lookup_color
+gtk_style_context_lookup_icon_set
+gtk_style_context_new
+gtk_style_context_notify_state_change
+gtk_style_context_pop_animatable_region
+gtk_style_context_push_animatable_region
+gtk_style_context_remove_class
+gtk_style_context_remove_provider
+gtk_style_context_remove_provider_for_screen
+gtk_style_context_remove_region
+gtk_style_context_reset_widgets
+gtk_style_context_restore
+gtk_style_context_save
+gtk_style_context_set_background
+gtk_style_context_set_direction
+gtk_style_context_set_junction_sides
+gtk_style_context_set_path
+gtk_style_context_set_screen
+gtk_style_context_set_state
+gtk_style_context_state_is_running
gtk_style_copy
gtk_style_detach
gtk_style_get
gtk_style_get_style_property
gtk_style_get_type G_GNUC_CONST
gtk_style_get_valist
+gtk_style_has_context
gtk_style_lookup_color
gtk_style_lookup_icon_set
gtk_style_new
+gtk_style_properties_clear
+gtk_style_properties_get
+gtk_style_properties_get_property
+gtk_style_properties_get_style
+gtk_style_properties_get_type
+gtk_style_properties_get_valist
+gtk_style_properties_lookup_color
+gtk_style_properties_lookup_property
+gtk_style_properties_map_color
+gtk_style_properties_merge
+gtk_style_properties_new
+gtk_style_properties_register_property
+gtk_style_properties_set
+gtk_style_properties_set_property
+gtk_style_properties_set_valist
+gtk_style_properties_unset_property
+gtk_style_provider_get_icon_factory
+gtk_style_provider_get_style
+gtk_style_provider_get_style_property
+gtk_style_provider_get_type
gtk_style_render_icon
gtk_style_set_background
+gtk_symbolic_color_get_type
+gtk_symbolic_color_new_alpha
+gtk_symbolic_color_new_literal
+gtk_symbolic_color_new_mix
+gtk_symbolic_color_new_name
+gtk_symbolic_color_new_shade
+gtk_symbolic_color_ref
+gtk_symbolic_color_resolve
+gtk_symbolic_color_unref
gtk_table_attach
gtk_table_attach_defaults
gtk_table_get_col_spacing
@@ -2664,6 +2785,31 @@ gtk_text_window_type_get_type G_GNUC_CONST
gtk_theme_engine_create_rc_style
gtk_theme_engine_get
gtk_theme_engine_get_type G_GNUC_CONST
+gtk_theming_engine_get
+gtk_theming_engine_get_background_color
+gtk_theming_engine_get_border
+gtk_theming_engine_get_border_color
+gtk_theming_engine_get_color
+gtk_theming_engine_get_direction
+gtk_theming_engine_get_junction_sides
+gtk_theming_engine_get_margin
+gtk_theming_engine_get_padding
+gtk_theming_engine_get_path
+gtk_theming_engine_get_property
+gtk_theming_engine_get_screen
+gtk_theming_engine_get_state
+gtk_theming_engine_get_style
+gtk_theming_engine_get_style_property
+gtk_theming_engine_get_style_valist
+gtk_theming_engine_get_type
+gtk_theming_engine_get_valist
+gtk_theming_engine_has_class
+gtk_theming_engine_has_region
+gtk_theming_engine_load
+gtk_theming_engine_lookup_color
+gtk_theming_engine_register_property
+gtk_theming_engine_state_is_running
+gtk_theming_module_get_type
gtk_toggle_action_get_active
gtk_toggle_action_get_draw_as_radio
gtk_toggle_action_get_type G_GNUC_CONST
@@ -3214,6 +3360,7 @@ gtk_widget_get_no_show_all
gtk_widget_get_pango_context
gtk_widget_get_parent
gtk_widget_get_parent_window
+gtk_widget_get_path
gtk_widget_get_pointer
gtk_widget_get_preferred_height
gtk_widget_get_preferred_height_for_width
@@ -3230,7 +3377,9 @@ gtk_widget_get_sensitive
gtk_widget_get_settings
gtk_widget_get_size_request
gtk_widget_get_state
+gtk_widget_get_state_flags
gtk_widget_get_style
+gtk_widget_get_style_context
gtk_widget_get_support_multidevice
gtk_widget_get_tooltip_markup
gtk_widget_get_tooltip_text
@@ -3277,9 +3426,38 @@ gtk_widget_modify_text
gtk_widget_new
gtk_widget_override_background_color
gtk_widget_override_color
+gtk_widget_override_cursor
gtk_widget_override_font
gtk_widget_override_symbolic_color
gtk_widget_path
+gtk_widget_path_append_type
+gtk_widget_path_copy
+gtk_widget_path_free
+gtk_widget_path_get_type G_GNUC_CONST
+gtk_widget_path_get_widget_type
+gtk_widget_path_has_parent
+gtk_widget_path_is_type
+gtk_widget_path_iter_add_class
+gtk_widget_path_iter_add_region
+gtk_widget_path_iter_clear_classes
+gtk_widget_path_iter_clear_regions
+gtk_widget_path_iter_get_name
+gtk_widget_path_iter_get_widget_type
+gtk_widget_path_iter_has_class
+gtk_widget_path_iter_has_name
+gtk_widget_path_iter_has_qclass
+gtk_widget_path_iter_has_qname
+gtk_widget_path_iter_has_qregion
+gtk_widget_path_iter_has_region
+gtk_widget_path_iter_list_classes
+gtk_widget_path_iter_list_regions
+gtk_widget_path_iter_remove_class
+gtk_widget_path_iter_remove_region
+gtk_widget_path_iter_set_name
+gtk_widget_path_iter_set_widget_type
+gtk_widget_path_length
+gtk_widget_path_new
+gtk_widget_path_prepend_type
gtk_widget_pop_composite_child
gtk_widget_push_composite_child
gtk_widget_queue_compute_expand
@@ -3297,6 +3475,7 @@ gtk_widget_render_icon_pixbuf
gtk_widget_reparent
gtk_widget_reset_rc_styles
gtk_widget_reset_shapes
+gtk_widget_reset_style
gtk_widget_send_expose
gtk_widget_send_focus_change
gtk_widget_set_accel_path
@@ -3332,6 +3511,7 @@ gtk_widget_set_redraw_on_allocate
gtk_widget_set_sensitive
gtk_widget_set_size_request
gtk_widget_set_state
+gtk_widget_set_state_flags
gtk_widget_set_style
gtk_widget_set_support_multidevice
gtk_widget_set_tooltip_markup
@@ -3359,6 +3539,7 @@ gtk_widget_trigger_tooltip_query
gtk_widget_unmap
gtk_widget_unparent
gtk_widget_unrealize
+gtk_widget_unset_state_flags
#ifdef GDK_WINDOWING_WIN32
gtk_win32_embed_widget_get_type G_GNUC_CONST
#endif
diff --git a/gtk/gtk9slice.c b/gtk/gtk9slice.c
index c3e824b..1f2e517 100644
--- a/gtk/gtk9slice.c
+++ b/gtk/gtk9slice.c
@@ -44,18 +44,18 @@ struct Gtk9Slice
gint ref_count;
};
-G_DEFINE_BOXED_TYPE (Gtk9Slice, gtk_9slice,
- gtk_9slice_ref, gtk_9slice_unref)
+G_DEFINE_BOXED_TYPE (Gtk9Slice, _gtk_9slice,
+ _gtk_9slice_ref, _gtk_9slice_unref)
Gtk9Slice *
-gtk_9slice_new (GdkPixbuf *pixbuf,
- gdouble distance_top,
- gdouble distance_bottom,
- gdouble distance_left,
- gdouble distance_right,
- GtkSliceSideModifier horizontal_modifier,
- GtkSliceSideModifier vertical_modifier)
+_gtk_9slice_new (GdkPixbuf *pixbuf,
+ gdouble distance_top,
+ gdouble distance_bottom,
+ gdouble distance_left,
+ gdouble distance_right,
+ GtkSliceSideModifier horizontal_modifier,
+ GtkSliceSideModifier vertical_modifier)
{
Gtk9Slice *slice;
cairo_surface_t *surface;
@@ -264,12 +264,12 @@ render_corner (cairo_t *cr,
}
void
-gtk_9slice_render (Gtk9Slice *slice,
- cairo_t *cr,
- gdouble x,
- gdouble y,
- gdouble width,
- gdouble height)
+_gtk_9slice_render (Gtk9Slice *slice,
+ cairo_t *cr,
+ gdouble x,
+ gdouble y,
+ gdouble width,
+ gdouble height)
{
int img_width, img_height;
cairo_surface_t *surface;
@@ -347,7 +347,7 @@ gtk_9slice_render (Gtk9Slice *slice,
}
Gtk9Slice *
-gtk_9slice_ref (Gtk9Slice *slice)
+_gtk_9slice_ref (Gtk9Slice *slice)
{
g_return_val_if_fail (slice != NULL, NULL);
@@ -356,7 +356,7 @@ gtk_9slice_ref (Gtk9Slice *slice)
}
void
-gtk_9slice_unref (Gtk9Slice *slice)
+_gtk_9slice_unref (Gtk9Slice *slice)
{
g_return_if_fail (slice != NULL);
diff --git a/gtk/gtk9slice.h b/gtk/gtk9slice.h
index 10e3df0..72b5efd 100644
--- a/gtk/gtk9slice.h
+++ b/gtk/gtk9slice.h
@@ -27,32 +27,32 @@ G_BEGIN_DECLS
/* Dummy typedefs */
typedef struct Gtk9Slice Gtk9Slice;
-#define GTK_TYPE_9SLICE (gtk_9slice_get_type ())
+#define GTK_TYPE_9SLICE (_gtk_9slice_get_type ())
typedef enum {
GTK_SLICE_REPEAT,
GTK_SLICE_STRETCH
} GtkSliceSideModifier;
-GType gtk_9slice_get_type (void) G_GNUC_CONST;
-
-Gtk9Slice * gtk_9slice_new (GdkPixbuf *pixbuf,
- gdouble distance_top,
- gdouble distance_bottom,
- gdouble distance_left,
- gdouble distance_right,
- GtkSliceSideModifier horizontal_modifier,
- GtkSliceSideModifier vertical_modifier);
-
-Gtk9Slice * gtk_9slice_ref (Gtk9Slice *slice);
-void gtk_9slice_unref (Gtk9Slice *slice);
-
-void gtk_9slice_render (Gtk9Slice *slice,
- cairo_t *cr,
- gdouble x,
- gdouble y,
- gdouble width,
- gdouble height);
+GType _gtk_9slice_get_type (void) G_GNUC_CONST;
+
+Gtk9Slice * _gtk_9slice_new (GdkPixbuf *pixbuf,
+ gdouble distance_top,
+ gdouble distance_bottom,
+ gdouble distance_left,
+ gdouble distance_right,
+ GtkSliceSideModifier horizontal_modifier,
+ GtkSliceSideModifier vertical_modifier);
+
+Gtk9Slice * _gtk_9slice_ref (Gtk9Slice *slice);
+void _gtk_9slice_unref (Gtk9Slice *slice);
+
+void _gtk_9slice_render (Gtk9Slice *slice,
+ cairo_t *cr,
+ gdouble x,
+ gdouble y,
+ gdouble width,
+ gdouble height);
G_END_DECLS
diff --git a/gtk/gtkanimationdescription.c b/gtk/gtkanimationdescription.c
index 785018a..f46ab4b 100644
--- a/gtk/gtkanimationdescription.c
+++ b/gtk/gtkanimationdescription.c
@@ -30,9 +30,9 @@ struct GtkAnimationDescription
};
GtkAnimationDescription *
-gtk_animation_description_new (gdouble duration,
- GtkTimelineProgressType progress_type,
- gboolean loop)
+_gtk_animation_description_new (gdouble duration,
+ GtkTimelineProgressType progress_type,
+ gboolean loop)
{
GtkAnimationDescription *desc;
@@ -46,32 +46,32 @@ gtk_animation_description_new (gdouble duration,
}
gdouble
-gtk_animation_description_get_duration (GtkAnimationDescription *desc)
+_gtk_animation_description_get_duration (GtkAnimationDescription *desc)
{
return desc->duration;
}
GtkTimelineProgressType
-gtk_animation_description_get_progress_type (GtkAnimationDescription *desc)
+_gtk_animation_description_get_progress_type (GtkAnimationDescription *desc)
{
return desc->progress_type;
}
gboolean
-gtk_animation_description_get_loop (GtkAnimationDescription *desc)
+_gtk_animation_description_get_loop (GtkAnimationDescription *desc)
{
return (desc->loop != 0);
}
GtkAnimationDescription *
-gtk_animation_description_ref (GtkAnimationDescription *desc)
+_gtk_animation_description_ref (GtkAnimationDescription *desc)
{
desc->ref_count++;
return desc;
}
void
-gtk_animation_description_unref (GtkAnimationDescription *desc)
+_gtk_animation_description_unref (GtkAnimationDescription *desc)
{
desc->ref_count--;
@@ -80,7 +80,7 @@ gtk_animation_description_unref (GtkAnimationDescription *desc)
}
GtkAnimationDescription *
-gtk_animation_description_from_string (const gchar *str)
+_gtk_animation_description_from_string (const gchar *str)
{
gchar timing_function[16] = { 0, };
gchar duration_unit[3] = { 0, };
@@ -120,18 +120,18 @@ gtk_animation_description_from_string (const gchar *str)
return NULL;
}
- return gtk_animation_description_new ((gdouble) duration, progress_type, loop);
+ return _gtk_animation_description_new ((gdouble) duration, progress_type, loop);
}
GType
-gtk_animation_description_get_type (void)
+_gtk_animation_description_get_type (void)
{
static GType type = 0;
if (G_UNLIKELY (!type))
type = g_boxed_type_register_static (I_("GtkAnimationDescription"),
- (GBoxedCopyFunc) gtk_animation_description_ref,
- (GBoxedFreeFunc) gtk_animation_description_unref);
+ (GBoxedCopyFunc) _gtk_animation_description_ref,
+ (GBoxedFreeFunc) _gtk_animation_description_unref);
return type;
}
diff --git a/gtk/gtkanimationdescription.h b/gtk/gtkanimationdescription.h
index 34fc8fc..7bff674 100644
--- a/gtk/gtkanimationdescription.h
+++ b/gtk/gtkanimationdescription.h
@@ -27,22 +27,22 @@ G_BEGIN_DECLS
/* Dummy typedefs */
typedef struct GtkAnimationDescription GtkAnimationDescription;
-#define GTK_TYPE_ANIMATION_DESCRIPTION (gtk_animation_description_get_type ())
+#define GTK_TYPE_ANIMATION_DESCRIPTION (_gtk_animation_description_get_type ())
-GType gtk_animation_description_get_type (void) G_GNUC_CONST;
+GType _gtk_animation_description_get_type (void) G_GNUC_CONST;
-GtkAnimationDescription * gtk_animation_description_new (gdouble duration,
- GtkTimelineProgressType progress_type,
- gboolean loop);
+GtkAnimationDescription * _gtk_animation_description_new (gdouble duration,
+ GtkTimelineProgressType progress_type,
+ gboolean loop);
-gdouble gtk_animation_description_get_duration (GtkAnimationDescription *desc);
-GtkTimelineProgressType gtk_animation_description_get_progress_type (GtkAnimationDescription *desc);
-gboolean gtk_animation_description_get_loop (GtkAnimationDescription *desc);
+gdouble _gtk_animation_description_get_duration (GtkAnimationDescription *desc);
+GtkTimelineProgressType _gtk_animation_description_get_progress_type (GtkAnimationDescription *desc);
+gboolean _gtk_animation_description_get_loop (GtkAnimationDescription *desc);
-GtkAnimationDescription * gtk_animation_description_ref (GtkAnimationDescription *desc);
-void gtk_animation_description_unref (GtkAnimationDescription *desc);
+GtkAnimationDescription * _gtk_animation_description_ref (GtkAnimationDescription *desc);
+void _gtk_animation_description_unref (GtkAnimationDescription *desc);
-GtkAnimationDescription * gtk_animation_description_from_string (const gchar *str);
+GtkAnimationDescription * _gtk_animation_description_from_string (const gchar *str);
G_END_DECLS
diff --git a/gtk/gtkappchooserdialog.c b/gtk/gtkappchooserdialog.c
index 83cf7e0..60532bb 100644
--- a/gtk/gtkappchooserdialog.c
+++ b/gtk/gtkappchooserdialog.c
@@ -108,7 +108,7 @@ search_for_mimetype_ready_cb (GObject *source,
GtkAppChooserDialog *self = user_data;
GError *error = NULL;
- gtk_app_chooser_online_search_for_mimetype_finish (online, res, &error);
+ _gtk_app_chooser_online_search_for_mimetype_finish (online, res, &error);
if (error != NULL)
{
@@ -128,11 +128,11 @@ online_button_clicked_cb (GtkButton *b,
{
GtkAppChooserDialog *self = user_data;
- gtk_app_chooser_online_search_for_mimetype_async (self->priv->online,
- self->priv->content_type,
- GTK_WINDOW (self),
- search_for_mimetype_ready_cb,
- self);
+ _gtk_app_chooser_online_search_for_mimetype_async (self->priv->online,
+ self->priv->content_type,
+ GTK_WINDOW (self),
+ search_for_mimetype_ready_cb,
+ self);
}
static void
@@ -142,7 +142,7 @@ app_chooser_online_get_default_ready_cb (GObject *source,
{
GtkAppChooserDialog *self = user_data;
- self->priv->online = gtk_app_chooser_online_get_default_finish (source, res);
+ self->priv->online = _gtk_app_chooser_online_get_default_finish (source, res);
if (self->priv->online != NULL)
{
@@ -164,7 +164,7 @@ app_chooser_online_get_default_ready_cb (GObject *source,
static void
ensure_online_button (GtkAppChooserDialog *self)
{
- gtk_app_chooser_online_get_default_async (app_chooser_online_get_default_ready_cb, self);
+ _gtk_app_chooser_online_get_default_async (app_chooser_online_get_default_ready_cb, self);
}
/* An application is valid if:
diff --git a/gtk/gtkappchooseronline.c b/gtk/gtkappchooseronline.c
index 71267ca..deda4b3 100644
--- a/gtk/gtkappchooseronline.c
+++ b/gtk/gtkappchooseronline.c
@@ -30,20 +30,19 @@
#include <gio/gio.h>
-#define gtk_app_chooser_online_get_type _gtk_app_chooser_online_get_type
static void gtk_app_chooser_online_default_init (GtkAppChooserOnlineInterface *iface);
-G_DEFINE_INTERFACE_WITH_CODE (GtkAppChooserOnline, gtk_app_chooser_online, G_TYPE_OBJECT,
+G_DEFINE_INTERFACE_WITH_CODE (GtkAppChooserOnline, _gtk_app_chooser_online, G_TYPE_OBJECT,
g_type_interface_add_prerequisite (g_define_type_id, G_TYPE_ASYNC_INITABLE);)
static void
-gtk_app_chooser_online_default_init (GtkAppChooserOnlineInterface *iface)
+_gtk_app_chooser_online_default_init (GtkAppChooserOnlineInterface *iface)
{
/* do nothing */
}
GtkAppChooserOnline *
-gtk_app_chooser_online_get_default_finish (GObject *source,
- GAsyncResult *result)
+_gtk_app_chooser_online_get_default_finish (GObject *source,
+ GAsyncResult *result)
{
GtkAppChooserOnline *retval;
@@ -51,11 +50,11 @@ gtk_app_chooser_online_get_default_finish (GObject *source,
result, NULL));
return retval;
-}
+}
void
-gtk_app_chooser_online_get_default_async (GAsyncReadyCallback callback,
- gpointer user_data)
+_gtk_app_chooser_online_get_default_async (GAsyncReadyCallback callback,
+ gpointer user_data)
{
GIOExtensionPoint *ep;
GIOExtension *extension;
@@ -76,11 +75,11 @@ gtk_app_chooser_online_get_default_async (GAsyncReadyCallback callback,
}
void
-gtk_app_chooser_online_search_for_mimetype_async (GtkAppChooserOnline *self,
- const gchar *content_type,
- GtkWindow *parent,
- GAsyncReadyCallback callback,
- gpointer user_data)
+_gtk_app_chooser_online_search_for_mimetype_async (GtkAppChooserOnline *self,
+ const gchar *content_type,
+ GtkWindow *parent,
+ GAsyncReadyCallback callback,
+ gpointer user_data)
{
GtkAppChooserOnlineInterface *iface;
@@ -92,9 +91,9 @@ gtk_app_chooser_online_search_for_mimetype_async (GtkAppChooserOnline *self,
}
gboolean
-gtk_app_chooser_online_search_for_mimetype_finish (GtkAppChooserOnline *self,
- GAsyncResult *res,
- GError **error)
+_gtk_app_chooser_online_search_for_mimetype_finish (GtkAppChooserOnline *self,
+ GAsyncResult *res,
+ GError **error)
{
GtkAppChooserOnlineInterface *iface;
diff --git a/gtk/gtkappchooseronline.h b/gtk/gtkappchooseronline.h
index d0eca3b..a8316c1 100644
--- a/gtk/gtkappchooseronline.h
+++ b/gtk/gtkappchooseronline.h
@@ -54,20 +54,20 @@ struct _GtkAppChooserOnlineInterface {
GError **error);
};
-GType _gtk_app_chooser_online_get_type (void) G_GNUC_CONST;
+GType _gtk_app_chooser_online_get_type (void) G_GNUC_CONST;
-void gtk_app_chooser_online_get_default_async (GAsyncReadyCallback callback,
- gpointer user_data);
-GtkAppChooserOnline * gtk_app_chooser_online_get_default_finish (GObject *source,
+void _gtk_app_chooser_online_get_default_async (GAsyncReadyCallback callback,
+ gpointer user_data);
+GtkAppChooserOnline * _gtk_app_chooser_online_get_default_finish (GObject *source,
GAsyncResult *result);
-void gtk_app_chooser_online_search_for_mimetype_async (GtkAppChooserOnline *self,
- const gchar *content_type,
- GtkWindow *parent,
- GAsyncReadyCallback callback,
- gpointer user_data);
-gboolean gtk_app_chooser_online_search_for_mimetype_finish (GtkAppChooserOnline *self,
- GAsyncResult *res,
- GError **error);
+void _gtk_app_chooser_online_search_for_mimetype_async (GtkAppChooserOnline *self,
+ const gchar *content_type,
+ GtkWindow *parent,
+ GAsyncReadyCallback callback,
+ gpointer user_data);
+gboolean _gtk_app_chooser_online_search_for_mimetype_finish (GtkAppChooserOnline *self,
+ GAsyncResult *res,
+ GError **error);
#endif /* __GTK_APP_CHOOSER_ONLINE_H__ */
diff --git a/gtk/gtkappchooseronlinepk.c b/gtk/gtkappchooseronlinepk.c
index c498546..4b6df0e 100644
--- a/gtk/gtkappchooseronlinepk.c
+++ b/gtk/gtkappchooseronlinepk.c
@@ -134,7 +134,7 @@ pk_search_mime_async (GtkAppChooserOnline *obj,
self->priv->result = g_simple_async_result_new (G_OBJECT (self),
callback, user_data,
- gtk_app_chooser_online_search_for_mimetype_async);
+ _gtk_app_chooser_online_search_for_mimetype_async);
#ifdef GDK_WINDOWING_X11
window = gtk_widget_get_window (GTK_WIDGET (parent));
@@ -243,7 +243,7 @@ app_chooser_online_pk_init_async (GAsyncInitable *init,
self->priv->init_result = g_simple_async_result_new (G_OBJECT (self),
callback, user_data,
- gtk_app_chooser_online_get_default_async);
+ _gtk_app_chooser_online_get_default_async);
self->priv->watch_id =
g_bus_watch_name (G_BUS_TYPE_SESSION,
diff --git a/gtk/gtkassistant.c b/gtk/gtkassistant.c
index c3baf9c..2b0ac71 100644
--- a/gtk/gtkassistant.c
+++ b/gtk/gtkassistant.c
@@ -2478,7 +2478,7 @@ gtk_assistant_get_accessible (GtkWidget *widget)
typedef struct _GtkAssistantAccessible GtkAssistantAccessible;
typedef struct _GtkAssistantAccessibleClass GtkAssistantAccessibleClass;
-ATK_DEFINE_TYPE (GtkAssistantAccessible, gtk_assistant_accessible, GTK_TYPE_ASSISTANT);
+ATK_DEFINE_TYPE (GtkAssistantAccessible, _gtk_assistant_accessible, GTK_TYPE_ASSISTANT);
static gint
gtk_assistant_accessible_get_n_children (AtkObject *accessible)
@@ -2537,7 +2537,7 @@ gtk_assistant_accessible_ref_child (AtkObject *accessible,
}
static void
-gtk_assistant_accessible_class_init (GtkAssistantAccessibleClass *klass)
+_gtk_assistant_accessible_class_init (GtkAssistantAccessibleClass *klass)
{
AtkObjectClass *atk_class = ATK_OBJECT_CLASS (klass);
@@ -2546,7 +2546,7 @@ gtk_assistant_accessible_class_init (GtkAssistantAccessibleClass *klass)
}
static void
-gtk_assistant_accessible_init (GtkAssistantAccessible *self)
+_gtk_assistant_accessible_init (GtkAssistantAccessible *self)
{
}
@@ -2561,7 +2561,7 @@ G_DEFINE_TYPE (GtkAssistantAccessibleFactory,
static GType
gtk_assistant_accessible_factory_get_accessible_type (void)
{
- return gtk_assistant_accessible_get_type ();
+ return _gtk_assistant_accessible_get_type ();
}
static AtkObject*
@@ -2569,7 +2569,7 @@ gtk_assistant_accessible_factory_create_accessible (GObject *obj)
{
AtkObject *accessible;
- accessible = g_object_new (gtk_assistant_accessible_get_type (), NULL);
+ accessible = g_object_new (_gtk_assistant_accessible_get_type (), NULL);
atk_object_initialize (accessible, obj);
return accessible;
diff --git a/gtk/gtkcssprovider.c b/gtk/gtkcssprovider.c
index 5ab102a..b417234 100644
--- a/gtk/gtkcssprovider.c
+++ b/gtk/gtkcssprovider.c
@@ -2621,10 +2621,10 @@ slice_parse_str (GtkCssProvider *css_provider,
return NULL;
}
- slice = gtk_9slice_new (pixbuf,
- distance_top, distance_bottom,
- distance_left, distance_right,
- mods[0], mods[1]);
+ slice = _gtk_9slice_new (pixbuf,
+ distance_top, distance_bottom,
+ distance_left, distance_right,
+ mods[0], mods[1]);
g_object_unref (pixbuf);
return slice;
@@ -2796,7 +2796,7 @@ css_provider_parse_value (GtkCssProvider *css_provider,
{
GtkAnimationDescription *desc;
- desc = gtk_animation_description_from_string (value_str);
+ desc = _gtk_animation_description_from_string (value_str);
if (desc)
g_value_take_boxed (value, desc);
diff --git a/gtk/gtkspinner.c b/gtk/gtkspinner.c
index 65bf7e2..78c6b99 100644
--- a/gtk/gtkspinner.c
+++ b/gtk/gtkspinner.c
@@ -345,7 +345,7 @@ typedef AtkObjectFactory GtkSpinnerAccessibleFactory;
typedef AtkObjectFactoryClass GtkSpinnerAccessibleFactoryClass;
G_DEFINE_TYPE (GtkSpinnerAccessibleFactory,
- gtk_spinner_accessible_factory,
+ _gtk_spinner_accessible_factory,
ATK_TYPE_OBJECT_FACTORY);
static GType
@@ -366,14 +366,14 @@ gtk_spinner_accessible_factory_create_accessible (GObject *obj)
}
static void
-gtk_spinner_accessible_factory_class_init (AtkObjectFactoryClass *klass)
+_gtk_spinner_accessible_factory_class_init (AtkObjectFactoryClass *klass)
{
klass->create_accessible = gtk_spinner_accessible_factory_create_accessible;
klass->get_accessible_type = gtk_spinner_accessible_factory_get_accessible_type;
}
static void
-gtk_spinner_accessible_factory_init (AtkObjectFactory *factory)
+_gtk_spinner_accessible_factory_init (AtkObjectFactory *factory)
{
}
@@ -402,7 +402,7 @@ gtk_spinner_get_accessible (GtkWidget *widget)
if (g_type_is_a (derived_atk_type, GTK_TYPE_ACCESSIBLE))
atk_registry_set_factory_type (registry,
GTK_TYPE_SPINNER,
- gtk_spinner_accessible_factory_get_type ());
+ _gtk_spinner_accessible_factory_get_type ());
first_time = FALSE;
}
diff --git a/gtk/gtkstylecontext.c b/gtk/gtkstylecontext.c
index b8d8c99..bc604d8 100644
--- a/gtk/gtkstylecontext.c
+++ b/gtk/gtkstylecontext.c
@@ -495,7 +495,7 @@ enum {
LAST_SIGNAL
};
-guint signals[LAST_SIGNAL] = { 0 };
+static guint signals[LAST_SIGNAL] = { 0 };
static GQuark provider_list_quark = 0;
@@ -842,19 +842,19 @@ animation_info_new (GtkStyleContext *context,
info = g_slice_new0 (AnimationInfo);
info->rectangles = g_array_new (FALSE, FALSE, sizeof (cairo_rectangle_int_t));
- info->timeline = gtk_timeline_new (duration);
+ info->timeline = _gtk_timeline_new (duration);
info->window = g_object_ref (window);
info->state = state;
info->target_value = target_value;
info->region_id = region_id;
- gtk_timeline_set_progress_type (info->timeline, progress_type);
- gtk_timeline_set_loop (info->timeline, loop);
+ _gtk_timeline_set_progress_type (info->timeline, progress_type);
+ _gtk_timeline_set_loop (info->timeline, loop);
if (!loop && !target_value)
{
- gtk_timeline_set_direction (info->timeline, GTK_TIMELINE_DIRECTION_BACKWARD);
- gtk_timeline_rewind (info->timeline);
+ _gtk_timeline_set_direction (info->timeline, GTK_TIMELINE_DIRECTION_BACKWARD);
+ _gtk_timeline_rewind (info->timeline);
}
g_signal_connect (info->timeline, "frame",
@@ -862,7 +862,7 @@ animation_info_new (GtkStyleContext *context,
g_signal_connect (info->timeline, "finished",
G_CALLBACK (timeline_finished_cb), context);
- gtk_timeline_start (info->timeline);
+ _gtk_timeline_start (info->timeline);
return info;
}
@@ -1076,7 +1076,7 @@ build_icon_factories (GtkStyleContext *context,
}
}
-GtkWidgetPath *
+static GtkWidgetPath *
create_query_path (GtkStyleContext *context)
{
GtkStyleContextPrivate *priv;
@@ -1628,7 +1628,7 @@ gtk_style_context_state_is_running (GtkStyleContext *context,
context_has_animatable_region (context, info->region_id))
{
if (progress)
- *progress = gtk_timeline_get_progress (info->timeline);
+ *progress = _gtk_timeline_get_progress (info->timeline);
return TRUE;
}
@@ -2855,9 +2855,9 @@ gtk_style_context_notify_state_change (GtkStyleContext *context,
if (!desc)
return;
- if (gtk_animation_description_get_duration (desc) == 0)
+ if (_gtk_animation_description_get_duration (desc) == 0)
{
- gtk_animation_description_unref (desc);
+ _gtk_animation_description_unref (desc);
return;
}
@@ -2867,37 +2867,37 @@ gtk_style_context_notify_state_change (GtkStyleContext *context,
info->target_value != state_value)
{
/* Target values are the opposite */
- if (!gtk_timeline_get_loop (info->timeline))
+ if (!_gtk_timeline_get_loop (info->timeline))
{
/* Reverse the animation */
- if (gtk_timeline_get_direction (info->timeline) == GTK_TIMELINE_DIRECTION_FORWARD)
- gtk_timeline_set_direction (info->timeline, GTK_TIMELINE_DIRECTION_BACKWARD);
+ if (_gtk_timeline_get_direction (info->timeline) == GTK_TIMELINE_DIRECTION_FORWARD)
+ _gtk_timeline_set_direction (info->timeline, GTK_TIMELINE_DIRECTION_BACKWARD);
else
- gtk_timeline_set_direction (info->timeline, GTK_TIMELINE_DIRECTION_FORWARD);
+ _gtk_timeline_set_direction (info->timeline, GTK_TIMELINE_DIRECTION_FORWARD);
info->target_value = state_value;
}
else
{
/* Take it out of its looping state */
- gtk_timeline_set_loop (info->timeline, FALSE);
+ _gtk_timeline_set_loop (info->timeline, FALSE);
}
}
else if (!info &&
- (!gtk_animation_description_get_loop (desc) ||
+ (!_gtk_animation_description_get_loop (desc) ||
state_value))
{
info = animation_info_new (context, region_id,
- gtk_animation_description_get_duration (desc),
- gtk_animation_description_get_progress_type (desc),
- gtk_animation_description_get_loop (desc),
+ _gtk_animation_description_get_duration (desc),
+ _gtk_animation_description_get_progress_type (desc),
+ _gtk_animation_description_get_loop (desc),
state, state_value, window);
priv->animations = g_slist_prepend (priv->animations, info);
priv->animations_invalidated = TRUE;
}
- gtk_animation_description_unref (desc);
+ _gtk_animation_description_unref (desc);
}
/**
diff --git a/gtk/gtkthemingengine.c b/gtk/gtkthemingengine.c
index e254161..88ba166 100644
--- a/gtk/gtkthemingengine.c
+++ b/gtk/gtkthemingengine.c
@@ -1971,8 +1971,8 @@ gtk_theming_engine_render_frame (GtkThemingEngine *engine,
if (slice)
{
- gtk_9slice_render (slice, cr, x, y, width, height);
- gtk_9slice_unref (slice);
+ _gtk_9slice_render (slice, cr, x, y, width, height);
+ _gtk_9slice_unref (slice);
}
else if (border_style != GTK_BORDER_STYLE_NONE)
render_frame_internal (engine, cr,
diff --git a/gtk/gtktimeline.c b/gtk/gtktimeline.c
index 348011c..5550e7d 100644
--- a/gtk/gtktimeline.c
+++ b/gtk/gtktimeline.c
@@ -76,94 +76,94 @@ static void gtk_timeline_get_property (GObject *object,
guint prop_id,
GValue *value,
GParamSpec *pspec);
-static void gtk_timeline_finalize (GObject *object);
+static void _gtk_timeline_finalize (GObject *object);
-G_DEFINE_TYPE (GtkTimeline, gtk_timeline, G_TYPE_OBJECT)
+G_DEFINE_TYPE (GtkTimeline, _gtk_timeline, G_TYPE_OBJECT)
static void
-gtk_timeline_class_init (GtkTimelineClass *klass)
+_gtk_timeline_class_init (GtkTimelineClass *klass)
{
GObjectClass *object_class = G_OBJECT_CLASS (klass);
object_class->set_property = gtk_timeline_set_property;
object_class->get_property = gtk_timeline_get_property;
- object_class->finalize = gtk_timeline_finalize;
+ object_class->finalize = _gtk_timeline_finalize;
g_object_class_install_property (object_class,
- PROP_FPS,
- g_param_spec_uint ("fps",
- "FPS",
- "Frames per second for the timeline",
- 1, G_MAXUINT,
- DEFAULT_FPS,
- G_PARAM_READWRITE));
+ PROP_FPS,
+ g_param_spec_uint ("fps",
+ "FPS",
+ "Frames per second for the timeline",
+ 1, G_MAXUINT,
+ DEFAULT_FPS,
+ G_PARAM_READWRITE));
g_object_class_install_property (object_class,
- PROP_DURATION,
- g_param_spec_uint ("duration",
- "Animation Duration",
- "Animation Duration",
- 0, G_MAXUINT,
- 0,
- G_PARAM_READWRITE));
+ PROP_DURATION,
+ g_param_spec_uint ("duration",
+ "Animation Duration",
+ "Animation Duration",
+ 0, G_MAXUINT,
+ 0,
+ G_PARAM_READWRITE));
g_object_class_install_property (object_class,
- PROP_LOOP,
- g_param_spec_boolean ("loop",
- "Loop",
- "Whether the timeline loops or not",
- FALSE,
- G_PARAM_READWRITE));
+ PROP_LOOP,
+ g_param_spec_boolean ("loop",
+ "Loop",
+ "Whether the timeline loops or not",
+ FALSE,
+ G_PARAM_READWRITE));
g_object_class_install_property (object_class,
- PROP_SCREEN,
- g_param_spec_object ("screen",
- "Screen",
- "Screen to get the settings from",
- GDK_TYPE_SCREEN,
- G_PARAM_READWRITE));
+ PROP_SCREEN,
+ g_param_spec_object ("screen",
+ "Screen",
+ "Screen to get the settings from",
+ GDK_TYPE_SCREEN,
+ G_PARAM_READWRITE));
signals[STARTED] =
g_signal_new ("started",
- G_TYPE_FROM_CLASS (object_class),
- G_SIGNAL_RUN_LAST,
- G_STRUCT_OFFSET (GtkTimelineClass, started),
- NULL, NULL,
- g_cclosure_marshal_VOID__VOID,
- G_TYPE_NONE, 0);
+ G_TYPE_FROM_CLASS (object_class),
+ G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET (GtkTimelineClass, started),
+ NULL, NULL,
+ g_cclosure_marshal_VOID__VOID,
+ G_TYPE_NONE, 0);
signals[PAUSED] =
g_signal_new ("paused",
- G_TYPE_FROM_CLASS (object_class),
- G_SIGNAL_RUN_LAST,
- G_STRUCT_OFFSET (GtkTimelineClass, paused),
- NULL, NULL,
- g_cclosure_marshal_VOID__VOID,
- G_TYPE_NONE, 0);
+ G_TYPE_FROM_CLASS (object_class),
+ G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET (GtkTimelineClass, paused),
+ NULL, NULL,
+ g_cclosure_marshal_VOID__VOID,
+ G_TYPE_NONE, 0);
signals[FINISHED] =
g_signal_new ("finished",
- G_TYPE_FROM_CLASS (object_class),
- G_SIGNAL_RUN_LAST,
- G_STRUCT_OFFSET (GtkTimelineClass, finished),
- NULL, NULL,
- g_cclosure_marshal_VOID__VOID,
- G_TYPE_NONE, 0);
+ G_TYPE_FROM_CLASS (object_class),
+ G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET (GtkTimelineClass, finished),
+ NULL, NULL,
+ g_cclosure_marshal_VOID__VOID,
+ G_TYPE_NONE, 0);
signals[FRAME] =
g_signal_new ("frame",
- G_TYPE_FROM_CLASS (object_class),
- G_SIGNAL_RUN_LAST,
- G_STRUCT_OFFSET (GtkTimelineClass, frame),
- NULL, NULL,
- g_cclosure_marshal_VOID__DOUBLE,
- G_TYPE_NONE, 1,
- G_TYPE_DOUBLE);
+ G_TYPE_FROM_CLASS (object_class),
+ G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET (GtkTimelineClass, frame),
+ NULL, NULL,
+ g_cclosure_marshal_VOID__DOUBLE,
+ G_TYPE_NONE, 1,
+ G_TYPE_DOUBLE);
g_type_class_add_private (klass, sizeof (GtkTimelinePriv));
}
static void
-gtk_timeline_init (GtkTimeline *timeline)
+_gtk_timeline_init (GtkTimeline *timeline)
{
GtkTimelinePriv *priv;
@@ -194,20 +194,20 @@ gtk_timeline_set_property (GObject *object,
switch (prop_id)
{
case PROP_FPS:
- gtk_timeline_set_fps (timeline, g_value_get_uint (value));
+ _gtk_timeline_set_fps (timeline, g_value_get_uint (value));
break;
case PROP_DURATION:
- gtk_timeline_set_duration (timeline, g_value_get_uint (value));
+ _gtk_timeline_set_duration (timeline, g_value_get_uint (value));
break;
case PROP_LOOP:
- gtk_timeline_set_loop (timeline, g_value_get_boolean (value));
+ _gtk_timeline_set_loop (timeline, g_value_get_boolean (value));
break;
case PROP_DIRECTION:
- gtk_timeline_set_direction (timeline, g_value_get_enum (value));
+ _gtk_timeline_set_direction (timeline, g_value_get_enum (value));
break;
case PROP_SCREEN:
- gtk_timeline_set_screen (timeline,
- GDK_SCREEN (g_value_get_object (value)));
+ _gtk_timeline_set_screen (timeline,
+ GDK_SCREEN (g_value_get_object (value)));
break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
@@ -249,7 +249,7 @@ gtk_timeline_get_property (GObject *object,
}
static void
-gtk_timeline_finalize (GObject *object)
+_gtk_timeline_finalize (GObject *object)
{
GtkTimelinePriv *priv;
GtkTimeline *timeline;
@@ -266,10 +266,10 @@ gtk_timeline_finalize (GObject *object)
if (priv->timer)
g_timer_destroy (priv->timer);
- G_OBJECT_CLASS (gtk_timeline_parent_class)->finalize (object);
+ G_OBJECT_CLASS (_gtk_timeline_parent_class)->finalize (object);
}
-gdouble
+static gdouble
calculate_progress (gdouble linear_progress,
GtkTimelineProgressType progress_type)
{
@@ -324,9 +324,9 @@ gtk_timeline_run_frame (GtkTimeline *timeline)
progress = priv->last_progress;
if (priv->direction == GTK_TIMELINE_DIRECTION_BACKWARD)
- progress -= delta_progress;
+ progress -= delta_progress;
else
- progress += delta_progress;
+ progress += delta_progress;
priv->last_progress = progress;
@@ -343,18 +343,18 @@ gtk_timeline_run_frame (GtkTimeline *timeline)
(priv->direction == GTK_TIMELINE_DIRECTION_BACKWARD && progress == 0.0))
{
if (!priv->loop)
- {
- if (priv->source_id)
- {
- g_source_remove (priv->source_id);
- priv->source_id = 0;
- }
+ {
+ if (priv->source_id)
+ {
+ g_source_remove (priv->source_id);
+ priv->source_id = 0;
+ }
g_timer_stop (priv->timer);
- g_signal_emit (timeline, signals [FINISHED], 0);
- return FALSE;
- }
+ g_signal_emit (timeline, signals [FINISHED], 0);
+ return FALSE;
+ }
else
- gtk_timeline_rewind (timeline);
+ _gtk_timeline_rewind (timeline);
}
return TRUE;
@@ -369,21 +369,21 @@ gtk_timeline_run_frame (GtkTimeline *timeline)
* Return Value: the newly created #GtkTimeline
**/
GtkTimeline *
-gtk_timeline_new (guint duration)
+_gtk_timeline_new (guint duration)
{
return g_object_new (GTK_TYPE_TIMELINE,
- "duration", duration,
- NULL);
+ "duration", duration,
+ NULL);
}
GtkTimeline *
-gtk_timeline_new_for_screen (guint duration,
- GdkScreen *screen)
+_gtk_timeline_new_for_screen (guint duration,
+ GdkScreen *screen)
{
return g_object_new (GTK_TYPE_TIMELINE,
- "duration", duration,
- "screen", screen,
- NULL);
+ "duration", duration,
+ "screen", screen,
+ NULL);
}
/**
@@ -393,7 +393,7 @@ gtk_timeline_new_for_screen (guint duration,
* Runs the timeline from the current frame.
**/
void
-gtk_timeline_start (GtkTimeline *timeline)
+_gtk_timeline_start (GtkTimeline *timeline)
{
GtkTimelinePriv *priv;
GtkSettings *settings;
@@ -440,7 +440,7 @@ gtk_timeline_start (GtkTimeline *timeline)
* Pauses the timeline.
**/
void
-gtk_timeline_pause (GtkTimeline *timeline)
+_gtk_timeline_pause (GtkTimeline *timeline)
{
GtkTimelinePriv *priv;
@@ -464,7 +464,7 @@ gtk_timeline_pause (GtkTimeline *timeline)
* Rewinds the timeline.
**/
void
-gtk_timeline_rewind (GtkTimeline *timeline)
+_gtk_timeline_rewind (GtkTimeline *timeline)
{
GtkTimelinePriv *priv;
@@ -472,7 +472,7 @@ gtk_timeline_rewind (GtkTimeline *timeline)
priv = timeline->priv;
- if (gtk_timeline_get_direction(timeline) != GTK_TIMELINE_DIRECTION_FORWARD)
+ if (_gtk_timeline_get_direction (timeline) != GTK_TIMELINE_DIRECTION_FORWARD)
priv->progress = priv->last_progress = 1.;
else
priv->progress = priv->last_progress = 0.;
@@ -496,7 +496,7 @@ gtk_timeline_rewind (GtkTimeline *timeline)
* Return Value: %TRUE if the timeline is running
**/
gboolean
-gtk_timeline_is_running (GtkTimeline *timeline)
+_gtk_timeline_is_running (GtkTimeline *timeline)
{
GtkTimelinePriv *priv;
@@ -516,7 +516,7 @@ gtk_timeline_is_running (GtkTimeline *timeline)
* Return Value: frames per second
**/
guint
-gtk_timeline_get_fps (GtkTimeline *timeline)
+_gtk_timeline_get_fps (GtkTimeline *timeline)
{
GtkTimelinePriv *priv;
@@ -535,7 +535,7 @@ gtk_timeline_get_fps (GtkTimeline *timeline)
* the timeline will play.
**/
void
-gtk_timeline_set_fps (GtkTimeline *timeline,
+_gtk_timeline_set_fps (GtkTimeline *timeline,
guint fps)
{
GtkTimelinePriv *priv;
@@ -547,12 +547,12 @@ gtk_timeline_set_fps (GtkTimeline *timeline,
priv->fps = fps;
- if (gtk_timeline_is_running (timeline))
+ if (_gtk_timeline_is_running (timeline))
{
g_source_remove (priv->source_id);
priv->source_id = gdk_threads_add_timeout (FRAME_INTERVAL (priv->fps),
- (GSourceFunc) gtk_timeline_run_frame,
- timeline);
+ (GSourceFunc) gtk_timeline_run_frame,
+ timeline);
}
g_object_notify (G_OBJECT (timeline), "fps");
@@ -568,7 +568,7 @@ gtk_timeline_set_fps (GtkTimeline *timeline,
* Return Value: %TRUE if the timeline loops
**/
gboolean
-gtk_timeline_get_loop (GtkTimeline *timeline)
+_gtk_timeline_get_loop (GtkTimeline *timeline)
{
GtkTimelinePriv *priv;
@@ -587,8 +587,8 @@ gtk_timeline_get_loop (GtkTimeline *timeline)
* when it has reached the end.
**/
void
-gtk_timeline_set_loop (GtkTimeline *timeline,
- gboolean loop)
+_gtk_timeline_set_loop (GtkTimeline *timeline,
+ gboolean loop)
{
GtkTimelinePriv *priv;
@@ -604,8 +604,8 @@ gtk_timeline_set_loop (GtkTimeline *timeline,
}
void
-gtk_timeline_set_duration (GtkTimeline *timeline,
- guint duration)
+_gtk_timeline_set_duration (GtkTimeline *timeline,
+ guint duration)
{
GtkTimelinePriv *priv;
@@ -621,7 +621,7 @@ gtk_timeline_set_duration (GtkTimeline *timeline,
}
guint
-gtk_timeline_get_duration (GtkTimeline *timeline)
+_gtk_timeline_get_duration (GtkTimeline *timeline)
{
GtkTimelinePriv *priv;
@@ -640,8 +640,8 @@ gtk_timeline_get_duration (GtkTimeline *timeline)
* Sets the direction of the timeline.
**/
void
-gtk_timeline_set_direction (GtkTimeline *timeline,
- GtkTimelineDirection direction)
+_gtk_timeline_set_direction (GtkTimeline *timeline,
+ GtkTimelineDirection direction)
{
GtkTimelinePriv *priv;
@@ -660,7 +660,7 @@ gtk_timeline_set_direction (GtkTimeline *timeline,
* Return Value: direction
**/
GtkTimelineDirection
-gtk_timeline_get_direction (GtkTimeline *timeline)
+_gtk_timeline_get_direction (GtkTimeline *timeline)
{
GtkTimelinePriv *priv;
@@ -671,8 +671,8 @@ gtk_timeline_get_direction (GtkTimeline *timeline)
}
void
-gtk_timeline_set_screen (GtkTimeline *timeline,
- GdkScreen *screen)
+_gtk_timeline_set_screen (GtkTimeline *timeline,
+ GdkScreen *screen)
{
GtkTimelinePriv *priv;
@@ -690,7 +690,7 @@ gtk_timeline_set_screen (GtkTimeline *timeline,
}
GdkScreen *
-gtk_timeline_get_screen (GtkTimeline *timeline)
+_gtk_timeline_get_screen (GtkTimeline *timeline)
{
GtkTimelinePriv *priv;
@@ -701,7 +701,7 @@ gtk_timeline_get_screen (GtkTimeline *timeline)
}
gdouble
-gtk_timeline_get_progress (GtkTimeline *timeline)
+_gtk_timeline_get_progress (GtkTimeline *timeline)
{
GtkTimelinePriv *priv;
@@ -712,7 +712,7 @@ gtk_timeline_get_progress (GtkTimeline *timeline)
}
GtkTimelineProgressType
-gtk_timeline_get_progress_type (GtkTimeline *timeline)
+_gtk_timeline_get_progress_type (GtkTimeline *timeline)
{
GtkTimelinePriv *priv;
@@ -723,8 +723,8 @@ gtk_timeline_get_progress_type (GtkTimeline *timeline)
}
void
-gtk_timeline_set_progress_type (GtkTimeline *timeline,
- GtkTimelineProgressType progress_type)
+_gtk_timeline_set_progress_type (GtkTimeline *timeline,
+ GtkTimelineProgressType progress_type)
{
GtkTimelinePriv *priv;
diff --git a/gtk/gtktimeline.h b/gtk/gtktimeline.h
index d9a6ae5..0b0aee1 100644
--- a/gtk/gtktimeline.h
+++ b/gtk/gtktimeline.h
@@ -26,7 +26,7 @@
G_BEGIN_DECLS
-#define GTK_TYPE_TIMELINE (gtk_timeline_get_type ())
+#define GTK_TYPE_TIMELINE (_gtk_timeline_get_type ())
#define GTK_TIMELINE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_TIMELINE, GtkTimeline))
#define GTK_TIMELINE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_TIMELINE, GtkTimelineClass))
#define GTK_IS_TIMELINE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_TIMELINE))
@@ -73,43 +73,43 @@ struct GtkTimelineClass
};
-GType gtk_timeline_get_type (void) G_GNUC_CONST;
+GType _gtk_timeline_get_type (void) G_GNUC_CONST;
-GtkTimeline *gtk_timeline_new (guint duration);
-GtkTimeline *gtk_timeline_new_for_screen (guint duration,
- GdkScreen *screen);
+GtkTimeline * _gtk_timeline_new (guint duration);
+GtkTimeline * _gtk_timeline_new_for_screen (guint duration,
+ GdkScreen *screen);
-void gtk_timeline_start (GtkTimeline *timeline);
-void gtk_timeline_pause (GtkTimeline *timeline);
-void gtk_timeline_rewind (GtkTimeline *timeline);
+void _gtk_timeline_start (GtkTimeline *timeline);
+void _gtk_timeline_pause (GtkTimeline *timeline);
+void _gtk_timeline_rewind (GtkTimeline *timeline);
-gboolean gtk_timeline_is_running (GtkTimeline *timeline);
+gboolean _gtk_timeline_is_running (GtkTimeline *timeline);
-guint gtk_timeline_get_fps (GtkTimeline *timeline);
-void gtk_timeline_set_fps (GtkTimeline *timeline,
- guint fps);
+guint _gtk_timeline_get_fps (GtkTimeline *timeline);
+void _gtk_timeline_set_fps (GtkTimeline *timeline,
+ guint fps);
-gboolean gtk_timeline_get_loop (GtkTimeline *timeline);
-void gtk_timeline_set_loop (GtkTimeline *timeline,
- gboolean loop);
+gboolean _gtk_timeline_get_loop (GtkTimeline *timeline);
+void _gtk_timeline_set_loop (GtkTimeline *timeline,
+ gboolean loop);
-guint gtk_timeline_get_duration (GtkTimeline *timeline);
-void gtk_timeline_set_duration (GtkTimeline *timeline,
- guint duration);
+guint _gtk_timeline_get_duration (GtkTimeline *timeline);
+void _gtk_timeline_set_duration (GtkTimeline *timeline,
+ guint duration);
-GdkScreen *gtk_timeline_get_screen (GtkTimeline *timeline);
-void gtk_timeline_set_screen (GtkTimeline *timeline,
- GdkScreen *screen);
+GdkScreen * _gtk_timeline_get_screen (GtkTimeline *timeline);
+void _gtk_timeline_set_screen (GtkTimeline *timeline,
+ GdkScreen *screen);
-GtkTimelineDirection gtk_timeline_get_direction (GtkTimeline *timeline);
-void gtk_timeline_set_direction (GtkTimeline *timeline,
- GtkTimelineDirection direction);
+GtkTimelineDirection _gtk_timeline_get_direction (GtkTimeline *timeline);
+void _gtk_timeline_set_direction (GtkTimeline *timeline,
+ GtkTimelineDirection direction);
-gdouble gtk_timeline_get_progress (GtkTimeline *timeline);
+gdouble _gtk_timeline_get_progress (GtkTimeline *timeline);
-GtkTimelineProgressType gtk_timeline_get_progress_type (GtkTimeline *timeline);
-void gtk_timeline_set_progress_type (GtkTimeline *timeline,
- GtkTimelineProgressType progress_type);
+GtkTimelineProgressType _gtk_timeline_get_progress_type (GtkTimeline *timeline);
+void _gtk_timeline_set_progress_type (GtkTimeline *timeline,
+ GtkTimelineProgressType progress_type);
G_END_DECLS
diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c
index 196a2c5..c0df69b 100644
--- a/gtk/gtkwidget.c
+++ b/gtk/gtkwidget.c
@@ -4097,10 +4097,10 @@ _gtk_widget_start_state_transitions (GtkWidget *widget)
if (animation_desc)
{
- if (gtk_animation_description_get_loop (animation_desc))
+ if (_gtk_animation_description_get_loop (animation_desc))
_gtk_widget_notify_state_change (widget, flag, TRUE);
- gtk_animation_description_unref (animation_desc);
+ _gtk_animation_description_unref (animation_desc);
}
flag >>= 1;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
