/pidgin/main: 018063ec9d2e: Remove backwards-compatibility with ...
Elliott Sales de Andrade <[email protected]> Tue, 06 Sep 2016 15:45:50 -0400
| Newsgroups | gmane.comp.gnome.gaim.cvs |
|---|---|
| Message-ID | <[email protected]> |
Changeset: 018063ec9d2ed6706225e98cab322493f32779ef Author: Elliott Sales de Andrade <[email protected]> Date: 2016-09-02 23:03 -0400 Branch: default URL: https://hg.pidgin.im/pidgin/main/rev/018063ec9d2e Description: Remove backwards-compatibility with GTK+2. diffstat: pidgin/gtk3compat.h | 247 --------------------------------------- pidgin/gtkblist-theme-loader.c | 3 - pidgin/gtkcellrendererexpander.c | 57 +------- pidgin/gtkconv.c | 20 ++- pidgin/gtkpounce.c | 112 +++++++++-------- pidgin/gtkprefs.c | 34 ++-- pidgin/gtkrequest.c | 51 +++---- pidgin/gtkxfer.c | 19 +- pidgin/plugins/xmppconsole.c | 9 - 9 files changed, 130 insertions(+), 422 deletions(-) diffs (truncated from 892 to 300 lines): diff --git a/pidgin/gtk3compat.h b/pidgin/gtk3compat.h --- a/pidgin/gtk3compat.h +++ b/pidgin/gtk3compat.h @@ -106,88 +106,6 @@ pidgin_color_chooser_get_rgb(GtkColorCho #endif /* 3.4.0 and gtk_color_chooser_ */ -#if GTK_CHECK_VERSION(3,0,0) - -static inline GtkWidget * -gtk_grid_table_new(guint rows, guint columns) -{ - return gtk_grid_new(); -} - -static inline void -gtk_grid_attach_defaults(GtkGrid *grid, GtkWidget *child, gint left, gint top, - gint width, gint height) -{ - gtk_grid_attach(grid, child, left, top, width, height); - gtk_widget_set_hexpand(child, TRUE); - gtk_widget_set_vexpand(child, TRUE); -} - -static inline void -gtk_grid_attach_full(GtkGrid *grid, GtkWidget *child, guint left, guint top, - guint width, guint height, GtkAttachOptions xoptions, - GtkAttachOptions yoptions, guint xpadding, guint ypadding) -{ - gtk_grid_attach(grid, child, left, top, width, height); - - if (xoptions & GTK_EXPAND) - gtk_widget_set_hexpand(child, TRUE); - if (!(xoptions & GTK_FILL)) - gtk_widget_set_halign(child, GTK_ALIGN_CENTER); - gtk_widget_set_margin_left(child, xpadding); - gtk_widget_set_margin_right(child, xpadding); - - if (yoptions & GTK_EXPAND) - gtk_widget_set_vexpand(child, TRUE); - if (!(yoptions & GTK_FILL)) - gtk_widget_set_valign(child, GTK_ALIGN_CENTER); - gtk_widget_set_margin_top(child, ypadding); - gtk_widget_set_margin_bottom(child, ypadding); -} - -#else /* 3.0.0 and gtk_grid_ */ - -#define GTK_GRID GTK_TABLE -#define GtkGrid GtkTable - -static inline GtkWidget * -gtk_grid_table_new(guint rows, guint columns) -{ - return gtk_table_new(rows, columns, FALSE); -} - -static inline void -gtk_grid_set_row_spacing(GtkGrid *grid, guint spacing) -{ - gtk_table_set_row_spacings(grid, spacing); -} - -static inline void -gtk_grid_set_column_spacing(GtkGrid *grid, guint spacing) -{ - gtk_table_set_col_spacings(grid, spacing); -} - -static inline void -gtk_grid_attach_defaults(GtkGrid *grid, GtkWidget *child, gint left, gint top, - gint width, gint height) -{ - gtk_table_attach_defaults(grid, child, left, left + width, - top, top + height); -} - -static inline void -gtk_grid_attach_full(GtkGrid *grid, GtkWidget *child, guint left, guint top, - guint width, guint height, GtkAttachOptions xoptions, - GtkAttachOptions yoptions, guint xpadding, guint ypadding) -{ - gtk_table_attach(grid, child, left, left + width, top, top + height, - xoptions, yoptions, xpadding, ypadding); -} - -#endif /* 3.0.0 and gtk_grid_ */ - - #if !GTK_CHECK_VERSION(3,2,0) #define GTK_FONT_CHOOSER GTK_FONT_SELECTION_DIALOG @@ -200,171 +118,6 @@ static inline GtkWidget * gtk_font_choos return gtk_font_selection_dialog_new(title); } -#if !GTK_CHECK_VERSION(3,0,0) - -#define gdk_x11_window_get_xid GDK_WINDOW_XWINDOW -#define gtk_widget_get_preferred_size(x,y,z) gtk_widget_size_request(x,z) - -#ifdef GDK_WINDOWING_X11 -#define GDK_IS_X11_WINDOW(window) TRUE -#endif -#ifdef GDK_WINDOWING_WIN32 -#define GDK_IS_WIN32_WINDOW(window) TRUE -#endif -#ifdef GDK_WINDOWING_QUARTZ -#define GDK_IS_QUARTZ_WINDOW(window) TRUE -#endif - -static inline GdkPixbuf * -gdk_pixbuf_get_from_surface(cairo_surface_t *surface, gint src_x, gint src_y, - gint width, gint height) -{ - GdkPixmap *pixmap; - GdkPixbuf *pixbuf; - cairo_t *cr; - - pixmap = gdk_pixmap_new(NULL, width, height, 24); - - cr = gdk_cairo_create(pixmap); - cairo_set_source_surface(cr, surface, -src_x, -src_y); - cairo_paint(cr); - cairo_destroy(cr); - - pixbuf = gdk_pixbuf_get_from_drawable(NULL, pixmap, - gdk_drawable_get_colormap(pixmap), 0, 0, 0, 0, width, height); - - g_object_unref(pixmap); - - return pixbuf; -} - -static inline GdkPixbuf * -gdk_pixbuf_get_from_window(GdkWindow *window, gint src_x, gint src_y, - gint width, gint height) -{ - return gdk_pixbuf_get_from_drawable(NULL, window, NULL, - src_x, src_y, 0, 0, width, height); -} - -static inline GtkWidget * -gtk_box_new(GtkOrientation orientation, gint spacing) -{ - g_return_val_if_fail(orientation == GTK_ORIENTATION_HORIZONTAL || - orientation == GTK_ORIENTATION_VERTICAL, NULL); - - if (orientation == GTK_ORIENTATION_HORIZONTAL) - return gtk_hbox_new(FALSE, spacing); - else /* GTK_ORIENTATION_VERTICAL */ - return gtk_vbox_new(FALSE, spacing); -} - -static inline GtkWidget * -gtk_separator_new(GtkOrientation orientation) -{ - g_return_val_if_fail(orientation == GTK_ORIENTATION_HORIZONTAL || - orientation == GTK_ORIENTATION_VERTICAL, NULL); - - if (orientation == GTK_ORIENTATION_HORIZONTAL) - return gtk_hseparator_new(); - else /* GTK_ORIENTATION_VERTICAL */ - return gtk_vseparator_new(); -} - -static inline GtkWidget * -gtk_button_box_new(GtkOrientation orientation) -{ - g_return_val_if_fail(orientation == GTK_ORIENTATION_HORIZONTAL || - orientation == GTK_ORIENTATION_VERTICAL, NULL); - - if (orientation == GTK_ORIENTATION_HORIZONTAL) - return gtk_hbutton_box_new(); - else /* GTK_ORIENTATION_VERTICAL */ - return gtk_vbutton_box_new(); -} - -static inline GtkWidget * -gtk_paned_new(GtkOrientation orientation) -{ - g_return_val_if_fail(orientation == GTK_ORIENTATION_HORIZONTAL || - orientation == GTK_ORIENTATION_VERTICAL, NULL); - - if (orientation == GTK_ORIENTATION_HORIZONTAL) - return gtk_hpaned_new(); - else /* GTK_ORIENTATION_VERTICAL */ - return gtk_vpaned_new(); -} - -static inline GtkWidget * -gtk_scale_new_with_range(GtkOrientation orientation, gdouble min, gdouble max, - gdouble step) -{ - g_return_val_if_fail(orientation == GTK_ORIENTATION_HORIZONTAL || - orientation == GTK_ORIENTATION_VERTICAL, NULL); - - if (orientation == GTK_ORIENTATION_HORIZONTAL) - return gtk_hscale_new_with_range(min, max, step); - else /* GTK_ORIENTATION_VERTICAL */ - return gtk_vscale_new_with_range(min, max, step); -} - -#if !GTK_CHECK_VERSION(2,24,0) - -#define gdk_x11_set_sm_client_id gdk_set_sm_client_id -#define gdk_window_get_display gdk_drawable_get_display -#define GtkComboBoxText GtkComboBox -#define GTK_COMBO_BOX_TEXT GTK_COMBO_BOX -#define gtk_combo_box_text_new gtk_combo_box_new_text -#define gtk_combo_box_text_new_with_entry gtk_combo_box_entry_new_text -#define gtk_combo_box_text_append_text gtk_combo_box_append_text -#define gtk_combo_box_text_get_active_text gtk_combo_box_get_active_text -#define gtk_combo_box_text_remove gtk_combo_box_remove_text - -static inline gint gdk_window_get_width(GdkWindow *x) -{ - gint w; - gdk_drawable_get_size(GDK_DRAWABLE(x), &w, NULL); - return w; -} - -static inline gint gdk_window_get_height(GdkWindow *x) -{ - gint h; - gdk_drawable_get_size(GDK_DRAWABLE(x), NULL, &h); - return h; -} - -#if !GTK_CHECK_VERSION(2,22,0) - -#define gdk_drag_context_get_actions(x) (x)->action -#define gdk_drag_context_get_suggested_action(x) (x)->suggested_action -#define gtk_text_view_get_vadjustment(x) (x)->vadjustment -#define gtk_font_selection_dialog_get_font_selection(x) (x)->fontsel - -#if !GTK_CHECK_VERSION(2,20,0) - -#define gtk_widget_get_mapped GTK_WIDGET_MAPPED -#define gtk_widget_set_mapped(x,y) do { \ - if (y) \ - GTK_WIDGET_SET_FLAGS(x, GTK_MAPPED); \ - else \ - GTK_WIDGET_UNSET_FLAGS(x, GTK_MAPPED); \ -} while(0) -#define gtk_widget_get_realized GTK_WIDGET_REALIZED -#define gtk_widget_set_realized(x,y) do { \ - if (y) \ - GTK_WIDGET_SET_FLAGS(x, GTK_REALIZED); \ - else \ - GTK_WIDGET_UNSET_FLAGS(x, GTK_REALIZED); \ -} while(0) - -#endif /* 2.20.0 */ - -#endif /* 2.22.0 */ - -#endif /* 2.24.0 */ - -#endif /* 3.0.0 */ - #endif /* 3.2.0 */ #endif /* _PIDGINGTK3COMPAT_H_ */ diff --git a/pidgin/gtkblist-theme-loader.c b/pidgin/gtkblist-theme-loader.c --- a/pidgin/gtkblist-theme-loader.c +++ b/pidgin/gtkblist-theme-loader.c @@ -65,9 +65,6 @@ parse_color(PurpleXmlNode *node, const c GdkColor color; if (temp && gdk_color_parse(temp, &color)) { -#if !GTK_CHECK_VERSION(3,0,0) - gdk_colormap_alloc_color(gdk_colormap_get_system(), &color, FALSE, TRUE); -#endif return gdk_color_copy(&color); } else { return NULL; diff --git a/pidgin/gtkcellrendererexpander.c b/pidgin/gtkcellrendererexpander.c --- a/pidgin/gtkcellrendererexpander.c +++ b/pidgin/gtkcellrendererexpander.c @@ -28,12 +28,6 @@ #include "gtk3compat.h" -#if GTK_CHECK_VERSION(3,0,0) -#define GTK3_CONST const -#else -#define GTK3_CONST -#endif - static void pidgin_cell_renderer_expander_get_property (GObject *object, guint param_id, GValue *value, @@ -46,30 +40,23 @@ static void pidgin_cell_renderer_expande static void pidgin_cell_renderer_expander_class_init (PidginCellRendererExpanderClass *class); static void pidgin_cell_renderer_expander_get_size (GtkCellRenderer *cell, GtkWidget *widget, - GTK3_CONST GdkRectangle *cell_area, + const GdkRectangle *cell_area, gint *x_offset, _______________________________________________ Commits mailing list [email protected] https://pidgin.im/cgi-bin/mailman/listinfo/commits