rpms/gtkhtml3/devel gtkhtml-3.23.4-deprecated-gtk-type.patch, NONE, 1.1 gtkhtml3.spec, 1.125, 1.126
Matthew Barnes (mbarnes)
fedora-extras-commits at redhat.com
Thu Jul 10 13:45:20 UTC 2008
- Previous message (by thread): rpms/bluez-utils/F-9 bluez-utils.spec,1.103,1.104
- Next message (by thread): rpms/sagator/devel import.log, NONE, 1.1 .cvsignore, 1.2, 1.3 sagator.spec, 1.1, 1.2 sources, 1.2, 1.3
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: mbarnes
Update of /cvs/pkgs/rpms/gtkhtml3/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15049
Modified Files:
gtkhtml3.spec
Added Files:
gtkhtml-3.23.4-deprecated-gtk-type.patch
Log Message:
* Thu Jul 10 2008 Matthew Barnes <mbarnes at redhat.com> - 3.23.4-2.fc10
- Add patch for GNOME bug #538703 (load dictionaries on-demand).
- Add patch for GNOME bug #539289 (stop using GtkType already!).
gtkhtml-3.23.4-deprecated-gtk-type.patch:
--- NEW FILE gtkhtml-3.23.4-deprecated-gtk-type.patch ---
diff -up gtkhtml-3.23.4/components/html-editor/engine.h.deprecated-gtk-type gtkhtml-3.23.4/components/html-editor/engine.h
--- gtkhtml-3.23.4/components/html-editor/engine.h.deprecated-gtk-type 2008-06-15 23:19:53.000000000 -0400
+++ gtkhtml-3.23.4/components/html-editor/engine.h 2008-07-10 09:40:42.000000000 -0400
@@ -34,10 +34,10 @@ typedef struct _EditorEngine EditorEngin
#include "gtkhtml.h"
#define EDITOR_ENGINE_TYPE (editor_engine_get_type ())
-#define EDITOR_ENGINE(o) (GTK_CHECK_CAST ((o), EDITOR_ENGINE_TYPE, EditorEngine))
-#define EDITOR_ENGINE_CLASS(k) (GTK_CHECK_CLASS_CAST((k), EDITOR_ENGINE_TYPE, EditorEngineClass))
-#define IS_EDITOR_ENGINE(o) (GTK_CHECK_TYPE ((o), EDITOR_ENGINE_TYPE))
-#define IS_EDITOR_ENGINE_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), EDITOR_ENGINE_TYPE))
+#define EDITOR_ENGINE(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), EDITOR_ENGINE_TYPE, EditorEngine))
+#define EDITOR_ENGINE_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), EDITOR_ENGINE_TYPE, EditorEngineClass))
+#define IS_EDITOR_ENGINE(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), EDITOR_ENGINE_TYPE))
+#define IS_EDITOR_ENGINE_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), EDITOR_ENGINE_TYPE))
struct _EditorEngine {
BonoboObject parent;
@@ -52,7 +52,7 @@ typedef struct {
POA_GNOME_GtkHTML_Editor_Engine__epv epv;
} EditorEngineClass;
-GtkType editor_engine_get_type (void);
+GType editor_engine_get_type (void);
EditorEngine *editor_engine_new (GtkHTMLControlData *cd);
POA_GNOME_GtkHTML_Editor_Engine__epv *editor_engine_get_epv (void);
diff -up gtkhtml-3.23.4/components/html-editor/gi-color-combo.h.deprecated-gtk-type gtkhtml-3.23.4/components/html-editor/gi-color-combo.h
--- gtkhtml-3.23.4/components/html-editor/gi-color-combo.h.deprecated-gtk-type 2008-06-15 23:19:53.000000000 -0400
+++ gtkhtml-3.23.4/components/html-editor/gi-color-combo.h 2008-07-10 09:40:42.000000000 -0400
@@ -65,7 +65,7 @@ typedef struct {
#define GI_COLOR_COMBO_CLASS(k) (G_TYPE_CHECK_CLASS_CAST(k), GI_COLOR_COMBO_TYPE)
#define IS_GI_COLOR_COMBO(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), GI_COLOR_COMBO_TYPE))
-GtkType gi_color_combo_get_type (void);
+GType gi_color_combo_get_type (void);
GtkWidget *gi_color_combo_new (GdkPixbuf *icon,
char const *no_color_label,
GdkColor *default_color,
diff -up gtkhtml-3.23.4/components/html-editor/gi-color-palette.h.deprecated-gtk-type gtkhtml-3.23.4/components/html-editor/gi-color-palette.h
--- gtkhtml-3.23.4/components/html-editor/gi-color-palette.h.deprecated-gtk-type 2008-06-15 23:19:53.000000000 -0400
+++ gtkhtml-3.23.4/components/html-editor/gi-color-palette.h 2008-07-10 09:40:42.000000000 -0400
@@ -86,7 +86,7 @@ typedef struct {
#define COLOR_PALETTE_CLASS(k) (G_TYPE_CHECK_CLASS_CAST(k), COLOR_PALETTE_TYPE)
#define IS_COLOR_PALETTE(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), COLOR_PALETTE_TYPE))
-GtkType color_palette_get_type (void);
+GType color_palette_get_type (void);
GtkWidget *color_palette_new (const char *no_color_label,
GdkColor *default_color,
diff -up gtkhtml-3.23.4/components/html-editor/gi-combo-box.h.deprecated-gtk-type gtkhtml-3.23.4/components/html-editor/gi-combo-box.h
--- gtkhtml-3.23.4/components/html-editor/gi-combo-box.h.deprecated-gtk-type 2008-06-15 23:19:53.000000000 -0400
+++ gtkhtml-3.23.4/components/html-editor/gi-combo-box.h 2008-07-10 09:40:42.000000000 -0400
@@ -60,7 +60,7 @@ struct _GiComboBoxClass {
void (*post_pop_hide) (GiComboBox *cbox);
};
-GtkType gi_combo_box_get_type (void);
+GType gi_combo_box_get_type (void);
void gi_combo_box_construct (GiComboBox *combo_box,
GtkWidget *display_widget,
GtkWidget *optional_pop_down_widget);
diff -up gtkhtml-3.23.4/components/html-editor/htmlsourceview.c.deprecated-gtk-type gtkhtml-3.23.4/components/html-editor/htmlsourceview.c
--- gtkhtml-3.23.4/components/html-editor/htmlsourceview.c.deprecated-gtk-type 2008-06-15 23:19:53.000000000 -0400
+++ gtkhtml-3.23.4/components/html-editor/htmlsourceview.c 2008-07-10 09:40:42.000000000 -0400
@@ -238,7 +238,7 @@ html_source_view_class_init (HTMLSourceV
klass->update = html_source_view_real_update;
}
-GtkType
+GType
html_source_view_get_type (void)
{
static GType view_type = 0;
diff -up gtkhtml-3.23.4/components/html-editor/htmlsourceview.h.deprecated-gtk-type gtkhtml-3.23.4/components/html-editor/htmlsourceview.h
--- gtkhtml-3.23.4/components/html-editor/htmlsourceview.h.deprecated-gtk-type 2008-06-15 23:19:53.000000000 -0400
+++ gtkhtml-3.23.4/components/html-editor/htmlsourceview.h 2008-07-10 09:40:42.000000000 -0400
@@ -27,9 +27,9 @@
#include "gtkhtml.h"
#define HTML_TYPE_SOURCE_VIEW (html_source_view_get_type ())
-#define HTML_SOURCE_VIEW(w) (GTK_CHECK_CAST ((w), HTML_TYPE_SOURCE_VIEW, HTMLSourceView))
-#define HTML_SOURCE_VIEW_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), HTML_TYPE_SOURCE_VIEW, HTMLSourceViewClass))
-#define HTML_IS_SOURCE_VIEW(w) (GTK_CHECK_TYPE ((w), HTML_TYPE_SOURCE_VIEW))
+#define HTML_SOURCE_VIEW(w) (G_TYPE_CHECK_INSTANCE_CAST ((w), HTML_TYPE_SOURCE_VIEW, HTMLSourceView))
+#define HTML_SOURCE_VIEW_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), HTML_TYPE_SOURCE_VIEW, HTMLSourceViewClass))
+#define HTML_IS_SOURCE_VIEW(w) (G_TYPE_CHECK_INSTANCE_TYPE ((w), HTML_TYPE_SOURCE_VIEW))
typedef struct _HTMLSourceViewPrivate HTMLSourceViewPrivate;
typedef struct _HTMLSourceViewClass HTMLSourceViewClass;
@@ -47,7 +47,7 @@ struct _HTMLSourceViewClass {
void (*update)(HTMLSourceView *);
};
-GtkType html_source_view_get_type (void);
+GType html_source_view_get_type (void);
GtkWidget * html_source_view_new (void);
void html_source_view_set_timeout (HTMLSourceView *view, guint timeout);
diff -up gtkhtml-3.23.4/components/html-editor/html-stream-mem.h.deprecated-gtk-type gtkhtml-3.23.4/components/html-editor/html-stream-mem.h
--- gtkhtml-3.23.4/components/html-editor/html-stream-mem.h.deprecated-gtk-type 2008-06-15 23:19:53.000000000 -0400
+++ gtkhtml-3.23.4/components/html-editor/html-stream-mem.h 2008-07-10 09:40:42.000000000 -0400
@@ -15,10 +15,10 @@ typedef struct _HTMLStreamMem HTMLS
typedef struct _HTMLStreamMemClass HTMLStreamMemClass;
#define HTML_STREAM_MEM_TYPE (html_stream_mem_get_type ())
-#define HTML_STREAM_MEM(o) (GTK_CHECK_CAST ((o), HTML_STREAM_MEM_TYPE, HTMLStreamMem))
-#define HTML_STREAM_MEM_CLASS(k) (GTK_CHECK_CLASS_CAST((k), HTML_STREAM_MEM_TYPE, HTMLStreamMemClass))
-#define HTML_IS_STREAM_MEM(o) (GTK_CHECK_TYPE ((o), HTML_STREAM_MEM_TYPE))
-#define HTML_IS_STREAM_MEM_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), HTML_STREAM_MEM_TYPE))
+#define HTML_STREAM_MEM(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), HTML_STREAM_MEM_TYPE, HTMLStreamMem))
+#define HTML_STREAM_MEM_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), HTML_STREAM_MEM_TYPE, HTMLStreamMemClass))
+#define HTML_IS_STREAM_MEM(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), HTML_STREAM_MEM_TYPE))
+#define HTML_IS_STREAM_MEM_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), HTML_STREAM_MEM_TYPE))
struct _HTMLStreamMem {
BonoboObject bonobo_object;
@@ -31,7 +31,7 @@ struct _HTMLStreamMemClass {
POA_Bonobo_Stream__epv epv;
};
-GtkType html_stream_mem_get_type (void);
+GType html_stream_mem_get_type (void);
BonoboObject *html_stream_mem_create (GtkHTMLStream *html_stream);
HTMLStreamMem *html_stream_mem_constuct (HTMLStreamMem *bhtml, GtkHTMLStream *html_stream);
diff -up gtkhtml-3.23.4/gtkhtml/gtkhtml-embedded.h.deprecated-gtk-type gtkhtml-3.23.4/gtkhtml/gtkhtml-embedded.h
--- gtkhtml-3.23.4/gtkhtml/gtkhtml-embedded.h.deprecated-gtk-type 2008-06-15 23:19:58.000000000 -0400
+++ gtkhtml-3.23.4/gtkhtml/gtkhtml-embedded.h 2008-07-10 09:40:42.000000000 -0400
@@ -28,9 +28,9 @@
#include "gtkhtml-types.h"
#define GTK_TYPE_HTML_EMBEDDED (gtk_html_embedded_get_type ())
-#define GTK_HTML_EMBEDDED(obj) GTK_CHECK_CAST (obj, GTK_TYPE_HTML_EMBEDDED, GtkHTMLEmbedded)
-#define GTK_HTML_EMBEDDED_CLASS(klass) GTK_CHECK_CLASS_CAST (klass, GTK_TYPE_HTML_EMBEDDED, GtkHTMLEmbeddedClass)
-#define GTK_IS_HTML_EMBEDDED(obj) GTK_CHECK_TYPE (obj, GTK_TYPE_HTML_EMBEDDED)
+#define GTK_HTML_EMBEDDED(obj) G_TYPE_CHECK_INSTANCE_CAST (obj, GTK_TYPE_HTML_EMBEDDED, GtkHTMLEmbedded)
+#define GTK_HTML_EMBEDDED_CLASS(klass) G_TYPE_CHECK_CLASS_CAST (klass, GTK_TYPE_HTML_EMBEDDED, GtkHTMLEmbeddedClass)
+#define GTK_IS_HTML_EMBEDDED(obj) G_TYPE_CHECK_INSTANCE_TYPE (obj, GTK_TYPE_HTML_EMBEDDED)
struct _GtkHTMLEmbedded {
GtkBin bin;
diff -up gtkhtml-3.23.4/gtkhtml/gtkhtml-properties.h.deprecated-gtk-type gtkhtml-3.23.4/gtkhtml/gtkhtml-properties.h
--- gtkhtml-3.23.4/gtkhtml/gtkhtml-properties.h.deprecated-gtk-type 2008-06-15 23:19:59.000000000 -0400
+++ gtkhtml-3.23.4/gtkhtml/gtkhtml-properties.h 2008-07-10 09:40:42.000000000 -0400
@@ -62,7 +62,7 @@ void gtk_html_class_
#define GTK_TYPE_HTML_CURSOR_SKIP (gtk_html_cursor_skip_get_type ())
#define GTK_TYPE_HTML_COMMAND (gtk_html_command_get_type ())
-GtkType gtk_html_cursor_skip_get_type (void);
-GtkType gtk_html_command_get_type (void);
+GType gtk_html_cursor_skip_get_type (void);
+GType gtk_html_command_get_type (void);
#endif
diff -up gtkhtml-3.23.4/gtkhtml/htmlframe.c.deprecated-gtk-type gtkhtml-3.23.4/gtkhtml/htmlframe.c
--- gtkhtml-3.23.4/gtkhtml/htmlframe.c.deprecated-gtk-type 2008-06-15 23:19:58.000000000 -0400
+++ gtkhtml-3.23.4/gtkhtml/htmlframe.c 2008-07-10 09:40:42.000000000 -0400
@@ -511,10 +511,10 @@ html_frame_init (HTMLFrame *frame,
* proxied like url_requested is.
*/
gtk_signal_connect (GTK_OBJECT (new_html), "on_url",
- GTK_SIGNAL_FUNC (frame_on_url),
+ G_CALLBACK (frame_on_url),
(gpointer)frame);
gtk_signal_connect (GTK_OBJECT (new_html), "link_clicked",
- GTK_SIGNAL_FUNC (frame_link_clicked),
+ G_CALLBACK (frame_link_clicked),
(gpointer)frame);
#endif
g_signal_connect (new_html, "size_changed", G_CALLBACK (frame_size_changed), frame);
@@ -527,7 +527,7 @@ html_frame_init (HTMLFrame *frame,
/*
gtk_signal_connect (GTK_OBJECT (html), "button_press_event",
- GTK_SIGNAL_FUNC (frame_button_press_event), frame);
+ G_CALLBACK (frame_button_press_event), frame);
*/
gtk_widget_set_size_request (scrolled_window, width, height);
diff -up gtkhtml-3.23.4/gtkhtml/htmliframe.c.deprecated-gtk-type gtkhtml-3.23.4/gtkhtml/htmliframe.c
--- gtkhtml-3.23.4/gtkhtml/htmliframe.c.deprecated-gtk-type 2008-06-15 23:19:58.000000000 -0400
+++ gtkhtml-3.23.4/gtkhtml/htmliframe.c 2008-07-10 09:40:42.000000000 -0400
@@ -646,10 +646,10 @@ html_iframe_init (HTMLIFrame *iframe,
* proxied like url_requested is.
*/
gtk_signal_connect (GTK_OBJECT (new_html), "on_url",
- GTK_SIGNAL_FUNC (iframe_on_url),
+ G_CALLBACK (iframe_on_url),
(gpointer)iframe);
gtk_signal_connect (GTK_OBJECT (new_html), "link_clicked",
- GTK_SIGNAL_FUNC (iframe_link_clicked),
+ G_CALLBACK (iframe_link_clicked),
(gpointer)iframe);
#endif
g_signal_connect (new_html, "size_changed", G_CALLBACK (iframe_size_changed), iframe);
@@ -658,7 +658,7 @@ html_iframe_init (HTMLIFrame *iframe,
/*
gtk_signal_connect (GTK_OBJECT (html), "button_press_event",
- GTK_SIGNAL_FUNC (iframe_button_press_event), iframe);
+ G_CALLBACK (iframe_button_press_event), iframe);
*/
gtk_widget_set_size_request (scrolled_window, width, height);
@@ -677,13 +677,13 @@ html_iframe_init (HTMLIFrame *iframe,
html_painter_set_focus (new_html->engine->painter, parent_html->engine->have_focus);
/*
gtk_signal_connect (GTK_OBJECT (html), "title_changed",
- GTK_SIGNAL_FUNC (title_changed_cb), (gpointer)app);
+ G_CALLBACK (title_changed_cb), (gpointer)app);
gtk_signal_connect (GTK_OBJECT (html), "button_press_event",
- GTK_SIGNAL_FUNC (on_button_press_event), popup_menu);
+ G_CALLBACK (on_button_press_event), popup_menu);
gtk_signal_connect (GTK_OBJECT (html), "redirect",
- GTK_SIGNAL_FUNC (on_redirect), NULL);
+ G_CALLBACK (on_redirect), NULL);
gtk_signal_connect (GTK_OBJECT (html), "object_requested",
- GTK_SIGNAL_FUNC (object_requested_cmd), NULL);
+ G_CALLBACK (object_requested_cmd), NULL);
*/
}
diff -up gtkhtml-3.23.4/gtkhtml/htmlplainpainter.h.deprecated-gtk-type gtkhtml-3.23.4/gtkhtml/htmlplainpainter.h
--- gtkhtml-3.23.4/gtkhtml/htmlplainpainter.h.deprecated-gtk-type 2008-06-15 23:19:58.000000000 -0400
+++ gtkhtml-3.23.4/gtkhtml/htmlplainpainter.h 2008-07-10 09:40:42.000000000 -0400
@@ -44,7 +44,7 @@ struct _HTMLPlainPainterClass {
HTMLGdkPainterClass base;
};
-GtkType html_plain_painter_get_type (void);
+GType html_plain_painter_get_type (void);
HTMLPainter *html_plain_painter_new (GtkWidget *widget, gboolean double_buffer);
#endif /* _HTMLPLAINPAINTER_H */
diff -up gtkhtml-3.23.4/gtkhtml/htmlprinter.h.deprecated-gtk-type gtkhtml-3.23.4/gtkhtml/htmlprinter.h
--- gtkhtml-3.23.4/gtkhtml/htmlprinter.h.deprecated-gtk-type 2008-06-15 23:19:59.000000000 -0400
+++ gtkhtml-3.23.4/gtkhtml/htmlprinter.h 2008-07-10 09:40:42.000000000 -0400
@@ -48,7 +48,7 @@ struct _HTMLPrinterClass {
HTMLPainterClass base;
};
-GtkType html_printer_get_type (void);
+GType html_printer_get_type (void);
HTMLPainter *html_printer_new (GtkWidget *widget,
GtkPrintContext *context);
guint html_printer_get_page_width (HTMLPrinter *printer);
diff -up gtkhtml-3.23.4/gtkhtml/htmltokenizer.c.deprecated-gtk-type gtkhtml-3.23.4/gtkhtml/htmltokenizer.c
--- gtkhtml-3.23.4/gtkhtml/htmltokenizer.c.deprecated-gtk-type 2008-06-15 23:19:58.000000000 -0400
+++ gtkhtml-3.23.4/gtkhtml/htmltokenizer.c 2008-07-10 09:40:42.000000000 -0400
@@ -265,10 +265,10 @@ html_tokenizer_finalize (GObject *obj)
G_OBJECT_CLASS (parent_class)->finalize (obj);
}
-GtkType
+GType
html_tokenizer_get_type (void)
{
- static GtkType html_tokenizer_type = 0;
+ static GType html_tokenizer_type = 0;
if (!html_tokenizer_type) {
static const GTypeInfo html_tokenizer_info = {
Index: gtkhtml3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtkhtml3/devel/gtkhtml3.spec,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -r1.125 -r1.126
--- gtkhtml3.spec 10 Jul 2008 13:25:43 -0000 1.125
+++ gtkhtml3.spec 10 Jul 2008 13:44:30 -0000 1.126
@@ -25,6 +25,9 @@
# GNOME bug #538703
Patch2: gtkhtml-3.23.4-dictionaries-on-demand.patch
+# GNOME bug #539289
+Patch3: gtkhtml-3.23.4-deprecated-gtk-type.patch
+
### Dependencies ###
Requires: gnome-icon-theme >= %{gnome_icon_theme_version}
@@ -63,6 +66,7 @@
%setup -q -n gtkhtml-%{version}
%patch1 -p1 -b .no-gnome-common
%patch2 -p1 -b .dictionaries-on-demand
+%patch3 -p1 -b .deprecated-gtk-type
%build
@@ -128,6 +132,7 @@
%changelog
* Thu Jul 10 2008 Matthew Barnes <mbarnes at redhat.com> - 3.23.4-2.fc10
- Add patch for GNOME bug #538703 (load dictionaries on-demand).
+- Add patch for GNOME bug #539289 (stop using GtkType already!).
* Mon Jun 16 2008 Matthew Barnes <mbarnes at redhat.com> - 3.23.4-1.fc10
- Update to 3.23.4
- Previous message (by thread): rpms/bluez-utils/F-9 bluez-utils.spec,1.103,1.104
- Next message (by thread): rpms/sagator/devel import.log, NONE, 1.1 .cvsignore, 1.2, 1.3 sagator.spec, 1.1, 1.2 sources, 1.2, 1.3
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list