diff options
Diffstat (limited to 'gtk')
| -rw-r--r-- | gtk/Makefile.am | 2 | ||||
| -rw-r--r-- | gtk/gtk.symbols | 46 | ||||
| -rw-r--r-- | gtk/gtkfilesystem.c | 8 | ||||
| -rw-r--r-- | gtk/gtkfilesystemunix.c | 12 | ||||
| -rw-r--r-- | gtk/gtkprintbackend.h | 2 | ||||
| -rw-r--r-- | gtk/gtkrecentchooserdefault.c | 14 | ||||
| -rw-r--r-- | gtk/gtkrecentchooserdefault.h | 2 | ||||
| -rw-r--r-- | gtk/paper_names_offsets.c | 6 |
8 files changed, 64 insertions, 28 deletions
diff --git a/gtk/Makefile.am b/gtk/Makefile.am index 6b1439ec0b..7151d70318 100644 --- a/gtk/Makefile.am +++ b/gtk/Makefile.am @@ -674,7 +674,7 @@ stamp_files = \ # their own .lo rules and don't get publically installed gtk_extra_sources = \ paper_names.c \ - paper_names_offsts.c \ + paper_names_offsets.c \ gen-paper-names.c \ gtk.symbols \ gtkversion.h.in \ diff --git a/gtk/gtk.symbols b/gtk/gtk.symbols index b55a6f9a35..eb09e7da24 100644 --- a/gtk/gtk.symbols +++ b/gtk/gtk.symbols @@ -294,16 +294,29 @@ 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_preview_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_private_flags_get_type G_GNUC_CONST gtk_progress_bar_orientation_get_type G_GNUC_CONST gtk_progress_bar_style_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 @@ -321,6 +334,7 @@ gtk_submenu_direction_get_type G_GNUC_CONST gtk_submenu_placement_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_tree_model_flags_get_type G_GNUC_CONST @@ -1421,6 +1435,7 @@ gtk_file_system_get_folder gtk_file_system_get_parent gtk_file_system_get_type G_GNUC_CONST gtk_file_system_get_volume_for_path +gtk_file_system_handle_get_type G_GNUC_CONST gtk_file_system_insert_bookmark gtk_file_system_list_bookmarks gtk_file_system_list_volumes @@ -2532,6 +2547,7 @@ gtk_paper_size_get_default #if IN_HEADER(__GTK_PRINT_BACKEND_H__) #if IN_FILE(__GTK_PRINT_BACKEND_C__) #ifdef G_OS_UNIX +gtk_print_backend_error_quark gtk_print_backend_get_type G_GNUC_CONST gtk_print_backend_get_printer_list gtk_print_backend_find_printer @@ -2560,23 +2576,44 @@ gtk_print_context_create_layout #if IN_FILE(__GTK_PRINTER_C__) #ifdef G_OS_UNIX gtk_printer_get_type G_GNUC_CONST -gtk_printer_new gtk_printer_get_backend gtk_printer_get_name +gtk_printer_get_description gtk_printer_get_state_message gtk_printer_get_location gtk_printer_get_icon_name gtk_printer_get_job_count -gtk_printer_is_active gtk_printer_is_virtual #endif #endif #endif +#if IN_HEADER(__GTK_PRINT_BACKEND_H__) +#if IN_FILE(__GTK_PRINTER_C__) +#ifdef G_OS_UNIX +gtk_printer_new +gtk_printer_set_backend +gtk_printer_set_description +gtk_printer_set_has_details +gtk_printer_set_icon_name +gtk_printer_set_is_active +gtk_printer_set_is_default +gtk_printer_set_is_new +gtk_printer_set_job_count +gtk_printer_set_location +gtk_printer_set_state_message +gtk_printer_is_active +gtk_printer_is_new +gtk_printer_is_default +#endif +#endif +#endif + #if IN_HEADER(__GTK_PRINTER_OPTION_H__) #if IN_FILE(__GTK_PRINTER_OPTION_C__) #ifdef G_OS_UNIX gtk_printer_option_get_type +gtk_printer_option_has_choice gtk_printer_option_new gtk_printer_option_set gtk_printer_option_set_has_conflict @@ -2594,6 +2631,7 @@ gtk_printer_option_choices_from_array gtk_printer_option_set_get_type G_GNUC_CONST gtk_printer_option_set_new gtk_printer_option_set_add +gtk_printer_option_set_lookup gtk_printer_option_set_remove gtk_printer_option_set_foreach gtk_printer_option_set_clear_conflicts @@ -2625,6 +2663,7 @@ gtk_print_job_get_settings gtk_print_job_get_printer gtk_print_job_get_title gtk_print_job_get_status +gtk_print_job_set_status gtk_print_job_set_source_file gtk_print_job_get_surface gtk_print_job_send @@ -2693,6 +2732,7 @@ gtk_print_settings_get_length gtk_print_settings_set_length gtk_print_settings_get_int gtk_print_settings_get_int_with_default +gtk_print_settings_set_int gtk_print_settings_get_printer gtk_print_settings_set_printer gtk_print_settings_get_orientation @@ -3018,6 +3058,7 @@ gtk_recent_filter_filter gtk_recent_manager_error_quark gtk_recent_manager_get_type G_GNUC_CONST gtk_recent_manager_new +gtk_recent_manager_get_items gtk_recent_manager_get_default gtk_recent_manager_get_for_screen gtk_recent_manager_set_screen @@ -4347,6 +4388,7 @@ gtk_requisition_copy gtk_requisition_free gtk_requisition_get_type G_GNUC_CONST gtk_widget_activate +gtk_widget_is_composited gtk_widget_add_accelerator gtk_widget_add_events gtk_widget_add_mnemonic_label diff --git a/gtk/gtkfilesystem.c b/gtk/gtkfilesystem.c index 6246f7945e..4849e5d083 100644 --- a/gtk/gtkfilesystem.c +++ b/gtk/gtkfilesystem.c @@ -333,14 +333,6 @@ enum G_DEFINE_TYPE (GtkFileSystemHandle, gtk_file_system_handle, G_TYPE_OBJECT); -#if 0 -GtkFileSystemHandle * -gtk_file_system_handle_new (void) -{ - return g_object_new (GTK_TYPE_FILE_SYSTEM_HANDLE, NULL); -} -#endif - static void gtk_file_system_handle_init (GtkFileSystemHandle *handle) { diff --git a/gtk/gtkfilesystemunix.c b/gtk/gtkfilesystemunix.c index c98e9658ab..73783d7397 100644 --- a/gtk/gtkfilesystemunix.c +++ b/gtk/gtkfilesystemunix.c @@ -88,7 +88,7 @@ typedef enum { } IconType; -#define GTK_TYPE_FILE_FOLDER_UNIX (gtk_file_folder_unix_get_type ()) +#define GTK_TYPE_FILE_FOLDER_UNIX (_gtk_file_folder_unix_get_type ()) #define GTK_FILE_FOLDER_UNIX(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_FILE_FOLDER_UNIX, GtkFileFolderUnix)) #define GTK_IS_FILE_FOLDER_UNIX(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_FILE_FOLDER_UNIX)) #define GTK_FILE_FOLDER_UNIX_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_FILE_FOLDER_UNIX, GtkFileFolderUnixClass)) @@ -268,7 +268,7 @@ G_DEFINE_TYPE_WITH_CODE (GtkFileSystemUnix, gtk_file_system_unix, G_TYPE_OBJECT, /* * GtkFileFolderUnix */ -G_DEFINE_TYPE_WITH_CODE (GtkFileFolderUnix, gtk_file_folder_unix, G_TYPE_OBJECT, +G_DEFINE_TYPE_WITH_CODE (GtkFileFolderUnix, _gtk_file_folder_unix, G_TYPE_OBJECT, G_IMPLEMENT_INTERFACE (GTK_TYPE_FILE_FOLDER, gtk_file_folder_unix_iface_init)); @@ -297,7 +297,7 @@ gtk_file_system_unix_class_init (GtkFileSystemUnixClass *class) } static void -gtk_file_system_unix_iface_init (GtkFileSystemIface *iface) +gtk_file_system_unix_iface_init (GtkFileSystemIface *iface) { iface->list_volumes = gtk_file_system_unix_list_volumes; iface->get_volume_for_path = gtk_file_system_unix_get_volume_for_path; @@ -2012,7 +2012,7 @@ gtk_file_system_unix_set_bookmark_label (GtkFileSystem *file_system, } static void -gtk_file_folder_unix_class_init (GtkFileFolderUnixClass *class) +_gtk_file_folder_unix_class_init (GtkFileFolderUnixClass *class) { GObjectClass *gobject_class = G_OBJECT_CLASS (class); @@ -2028,7 +2028,7 @@ gtk_file_folder_unix_iface_init (GtkFileFolderIface *iface) } static void -gtk_file_folder_unix_init (GtkFileFolderUnix *impl) +_gtk_file_folder_unix_init (GtkFileFolderUnix *impl) { } @@ -2055,7 +2055,7 @@ gtk_file_folder_unix_finalize (GObject *object) g_free (folder_unix->filename); - G_OBJECT_CLASS (gtk_file_folder_unix_parent_class)->finalize (object); + G_OBJECT_CLASS (_gtk_file_folder_unix_parent_class)->finalize (object); } /* Creates a GtkFileInfo for "/" by stat()ing it */ diff --git a/gtk/gtkprintbackend.h b/gtk/gtkprintbackend.h index de225f9e3a..4e2a05c4b3 100644 --- a/gtk/gtkprintbackend.h +++ b/gtk/gtkprintbackend.h @@ -124,6 +124,8 @@ GList * gtk_print_backend_load_modules (void); GtkPrinter *gtk_printer_new (const char *name, GtkPrintBackend *backend, gboolean is_virtual); +void gtk_printer_set_backend (GtkPrinter *printer, + GtkPrintBackend *backend); gboolean gtk_printer_is_new (GtkPrinter *printer); void gtk_printer_set_is_new (GtkPrinter *printer, gboolean val); diff --git a/gtk/gtkrecentchooserdefault.c b/gtk/gtkrecentchooserdefault.c index 41c8accf32..ddc176ee26 100644 --- a/gtk/gtkrecentchooserdefault.c +++ b/gtk/gtkrecentchooserdefault.c @@ -287,7 +287,7 @@ static void recent_view_drag_data_get_cb (GtkWidget *widget, gpointer data); G_DEFINE_TYPE_WITH_CODE (GtkRecentChooserDefault, - gtk_recent_chooser_default, + _gtk_recent_chooser_default, GTK_TYPE_VBOX, G_IMPLEMENT_INTERFACE (GTK_TYPE_RECENT_CHOOSER, gtk_recent_chooser_iface_init)); @@ -313,7 +313,7 @@ gtk_recent_chooser_iface_init (GtkRecentChooserIface *iface) } static void -gtk_recent_chooser_default_class_init (GtkRecentChooserDefaultClass *klass) +_gtk_recent_chooser_default_class_init (GtkRecentChooserDefaultClass *klass) { GObjectClass *gobject_class = G_OBJECT_CLASS (klass); GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass); @@ -330,7 +330,7 @@ gtk_recent_chooser_default_class_init (GtkRecentChooserDefaultClass *klass) } static void -gtk_recent_chooser_default_init (GtkRecentChooserDefault *impl) +_gtk_recent_chooser_default_init (GtkRecentChooserDefault *impl) { gtk_box_set_spacing (GTK_BOX (impl), 12); @@ -373,7 +373,7 @@ gtk_recent_chooser_default_constructor (GType type, GtkWidget *scrollw; GtkCellRenderer *renderer; - object = G_OBJECT_CLASS (gtk_recent_chooser_default_parent_class)->constructor (type, n_construct_prop, construct_params); + object = G_OBJECT_CLASS (_gtk_recent_chooser_default_parent_class)->constructor (type, n_construct_prop, construct_params); impl = GTK_RECENT_CHOOSER_DEFAULT (object); @@ -642,7 +642,7 @@ gtk_recent_chooser_default_finalize (GObject *object) if (impl->tooltips) g_object_unref (impl->tooltips); - G_OBJECT_CLASS (gtk_recent_chooser_default_parent_class)->finalize (object); + G_OBJECT_CLASS (_gtk_recent_chooser_default_parent_class)->finalize (object); } /* override GtkWidget::show_all since we have internal widgets we wish to keep @@ -943,8 +943,8 @@ gtk_recent_chooser_default_map (GtkWidget *widget) { GtkRecentChooserDefault *impl = GTK_RECENT_CHOOSER_DEFAULT (widget); - if (GTK_WIDGET_CLASS (gtk_recent_chooser_default_parent_class)->map) - GTK_WIDGET_CLASS (gtk_recent_chooser_default_parent_class)->map (widget); + if (GTK_WIDGET_CLASS (_gtk_recent_chooser_default_parent_class)->map) + GTK_WIDGET_CLASS (_gtk_recent_chooser_default_parent_class)->map (widget); /* reloads everything */ reload_recent_items (impl); diff --git a/gtk/gtkrecentchooserdefault.h b/gtk/gtkrecentchooserdefault.h index 852f4014a1..71dec2a457 100644 --- a/gtk/gtkrecentchooserdefault.h +++ b/gtk/gtkrecentchooserdefault.h @@ -26,7 +26,7 @@ G_BEGIN_DECLS -#define GTK_TYPE_RECENT_CHOOSER_DEFAULT (gtk_recent_chooser_default_get_type ()) +#define GTK_TYPE_RECENT_CHOOSER_DEFAULT (_gtk_recent_chooser_default_get_type ()) #define GTK_RECENT_CHOOSER_DEFAULT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_RECENT_CHOOSER_DEFAULT, GtkRecentChooserDefault)) #define GTK_IS_RECENT_CHOOSER_DEFAULT(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_RECENT_CHOOSER_DEFAULT)) diff --git a/gtk/paper_names_offsets.c b/gtk/paper_names_offsets.c index 03f9f439cb..52a6b7bd16 100644 --- a/gtk/paper_names_offsets.c +++ b/gtk/paper_names_offsets.c @@ -331,7 +331,7 @@ N_("paper size|ROC 16k") N_("paper size|ROC 8k") #endif -const char paper_names[] = +static const char paper_names[] = "asme_f\0" "iso_2a0\0" "A0x2\0" @@ -695,7 +695,7 @@ typedef struct { int ppd_name; } PaperInfo; -const PaperInfo standard_names_offsets[] = { +static const PaperInfo standard_names_offsets[] = { { 0, 711.2, 1016, 0, -1 }, { 7, 1189, 1682, 15, -1 }, { 20, 841, 1189, 1, 1 }, @@ -862,7 +862,7 @@ const PaperInfo standard_names_offsets[] = { { 3139, 273.05, 393.7, 3146, -1 }, }; -const struct { +static const struct { int ppd_name; int standard_name; } extra_ppd_names_offsets[] = { |