From 207ca42f465d467abc6862ca297cbdf42c3b4447 Mon Sep 17 00:00:00 2001 From: Stef Walter Date: Tue, 9 Sep 2014 12:08:18 +0200 Subject: ui: Fix for various deprecations in GTK+ 3.14.x GtkAlignment is now deprecated, as is GtkArrow and some gtk_misc_xxx() methods. --- ui/frob-import-button.c | 8 +++----- ui/gcr-display-view.c | 15 ++++++++------- ui/gcr-import-button.c | 2 +- ui/gcr-key-widget.c | 6 +++--- ui/gcr-unlock-options-widget.c | 6 +++--- ui/gcr-unlock-renderer.c | 2 +- ui/gcr-unlock-renderer.h | 4 ++-- ui/gcr-viewer-window.c | 10 ++++------ 8 files changed, 25 insertions(+), 28 deletions(-) diff --git a/ui/frob-import-button.c b/ui/frob-import-button.c index 6a9a88e..c54435f 100644 --- a/ui/frob-import-button.c +++ b/ui/frob-import-button.c @@ -207,7 +207,6 @@ main (int argc, char *argv[]) GtkDialog *dialog; GcrParser *parser; GtkWidget *button; - GtkWidget *align; int i; gtk_init (&argc, &argv); @@ -221,11 +220,10 @@ main (int argc, char *argv[]) button = GTK_WIDGET (gcr_import_button_new ("Import Button")); gtk_widget_show (button); - align = gtk_alignment_new (0.5, 0.5, 0, 0); - gtk_container_add (GTK_CONTAINER (align), button); - gtk_widget_show (align); + gtk_widget_set_halign (button, 0.5); + gtk_widget_set_valign (button, 0.5); - gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (dialog)), align); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (dialog)), button); gtk_window_set_default_size (GTK_WINDOW (dialog), 200, 300); gtk_container_set_border_width (GTK_CONTAINER (dialog), 20); diff --git a/ui/gcr-display-view.c b/ui/gcr-display-view.c index 140585a..2fa0f82 100644 --- a/ui/gcr-display-view.c +++ b/ui/gcr-display-view.c @@ -272,7 +272,6 @@ create_display_item (GcrDisplayView *self, GcrRenderer *renderer) GtkTextIter iter; GtkWidget *widget; GtkWidget *label; - GtkWidget *alignment; gchar *text; item = g_new0 (GcrDisplayItem, 1); @@ -321,14 +320,15 @@ create_display_item (GcrDisplayView *self, GcrRenderer *renderer) item->expanded = gtk_expander_get_expanded (GTK_EXPANDER (widget)); g_free (text); - alignment = gtk_alignment_new (0.5, 0.5, 0.5, 0.5); - gtk_alignment_set_padding (GTK_ALIGNMENT (alignment), 6, 9, 0, 0); - gtk_container_add (GTK_CONTAINER (alignment), widget); - gtk_widget_show_all (alignment); + gtk_widget_set_halign (widget, 0.5); + gtk_widget_set_valign (widget, 0.5); + gtk_widget_set_margin_top (widget, 6); + gtk_widget_set_margin_bottom (widget, 9); + gtk_widget_show_all (widget); item->details_widget = gtk_event_box_new (); gtk_event_box_set_visible_window (GTK_EVENT_BOX (item->details_widget), FALSE); - gtk_container_add (GTK_CONTAINER (item->details_widget), alignment); + gtk_container_add (GTK_CONTAINER (item->details_widget), widget); g_signal_connect (item->details_widget, "realize", G_CALLBACK (on_expander_realize), NULL); g_object_ref (item->details_widget); @@ -1168,7 +1168,8 @@ _gcr_display_view_append_message (GcrDisplayView *self, if (name != NULL) { image = gtk_image_new_from_icon_name (name, GTK_ICON_SIZE_MENU); - gtk_misc_set_padding (GTK_MISC (image), MESSAGE_PADDING, 0); + gtk_widget_set_margin_start (image, MESSAGE_PADDING); + gtk_widget_set_margin_end (image, MESSAGE_PADDING); gtk_widget_show (image); anchor = gtk_text_buffer_create_child_anchor (self->pv->buffer, &iter); diff --git a/ui/gcr-import-button.c b/ui/gcr-import-button.c index 7ac15be..33cc443 100644 --- a/ui/gcr-import-button.c +++ b/ui/gcr-import-button.c @@ -202,7 +202,7 @@ gcr_import_button_constructed (GObject *obj) G_OBJECT_CLASS (gcr_import_button_parent_class)->constructed (obj); self->pv->spinner = gtk_spinner_new (); - self->pv->arrow = gtk_arrow_new (GTK_ARROW_DOWN, GTK_SHADOW_NONE); + self->pv->arrow = gtk_image_new_from_icon_name ("pan-down-symbolic", GTK_ICON_SIZE_BUTTON); grid = gtk_grid_new (); gtk_orientable_set_orientation (GTK_ORIENTABLE (grid), GTK_ORIENTATION_HORIZONTAL); diff --git a/ui/gcr-key-widget.c b/ui/gcr-key-widget.c index a685b32..75f861b 100644 --- a/ui/gcr-key-widget.c +++ b/ui/gcr-key-widget.c @@ -60,7 +60,7 @@ enum { }; struct _GcrKeyWidget { - GtkAlignment parent; + GtkBin parent; /*< private >*/ GcrKeyWidgetPrivate *pv; @@ -68,7 +68,7 @@ struct _GcrKeyWidget { struct _GcrKeyWidgetClass { /*< private >*/ - GtkAlignmentClass parent_class; + GtkBinClass parent_class; }; struct _GcrKeyWidgetPrivate { @@ -76,7 +76,7 @@ struct _GcrKeyWidgetPrivate { GcrKeyRenderer *renderer; }; -G_DEFINE_TYPE (GcrKeyWidget, gcr_key_widget, GTK_TYPE_ALIGNMENT); +G_DEFINE_TYPE (GcrKeyWidget, gcr_key_widget, GTK_TYPE_BIN); /* ----------------------------------------------------------------------------- * OBJECT diff --git a/ui/gcr-unlock-options-widget.c b/ui/gcr-unlock-options-widget.c index c6b025d..1033fa1 100644 --- a/ui/gcr-unlock-options-widget.c +++ b/ui/gcr-unlock-options-widget.c @@ -78,14 +78,14 @@ enum { }; struct _GcrUnlockOptionsWidget { - GtkAlignment parent; + GtkBin parent; /*< private >*/ GcrUnlockOptionsWidgetPrivate *pv; }; struct _GcrUnlockOptionsWidgetClass { - GtkAlignmentClass parent_class; + GtkBinClass parent_class; }; struct _GcrUnlockOptionsWidgetPrivate { @@ -93,7 +93,7 @@ struct _GcrUnlockOptionsWidgetPrivate { gchar *choice; }; -G_DEFINE_TYPE (GcrUnlockOptionsWidget, gcr_unlock_options_widget, GTK_TYPE_ALIGNMENT); +G_DEFINE_TYPE (GcrUnlockOptionsWidget, gcr_unlock_options_widget, GTK_TYPE_BIN); /* ----------------------------------------------------------------------------- * INTERNAL diff --git a/ui/gcr-unlock-renderer.c b/ui/gcr-unlock-renderer.c index 08b5ac5..ac9d476 100644 --- a/ui/gcr-unlock-renderer.c +++ b/ui/gcr-unlock-renderer.c @@ -56,7 +56,7 @@ static guint signals[LAST_SIGNAL] = { 0 }; static void gcr_renderer_iface_init (GcrRendererIface *iface); -G_DEFINE_TYPE_WITH_CODE (GcrUnlockRenderer, _gcr_unlock_renderer, GTK_TYPE_ALIGNMENT, +G_DEFINE_TYPE_WITH_CODE (GcrUnlockRenderer, _gcr_unlock_renderer, GTK_TYPE_BIN, G_IMPLEMENT_INTERFACE (GCR_TYPE_RENDERER, gcr_renderer_iface_init); ); diff --git a/ui/gcr-unlock-renderer.h b/ui/gcr-unlock-renderer.h index 02b1064..3f504a1 100644 --- a/ui/gcr-unlock-renderer.h +++ b/ui/gcr-unlock-renderer.h @@ -46,12 +46,12 @@ typedef struct _GcrUnlockRendererPrivate GcrUnlockRendererPrivate; struct _GcrUnlockRenderer { /*< private >*/ - GtkAlignment parent; + GtkBin parent; GcrUnlockRendererPrivate *pv; }; struct _GcrUnlockRendererClass { - GtkAlignmentClass parent_class; + GtkBinClass parent_class; /* signals */ void (*unlock_clicked) (GcrUnlockRenderer *unlock); diff --git a/ui/gcr-viewer-window.c b/ui/gcr-viewer-window.c index b9dd413..ca10b88 100644 --- a/ui/gcr-viewer-window.c +++ b/ui/gcr-viewer-window.c @@ -95,7 +95,6 @@ gcr_viewer_window_constructed (GObject *obj) GtkWidget *bbox; GtkWidget *box; GtkWidget *button; - GtkWidget *align; G_OBJECT_CLASS (gcr_viewer_window_parent_class)->constructed (obj); @@ -122,10 +121,9 @@ gcr_viewer_window_constructed (GObject *obj) gtk_box_pack_start (GTK_BOX (bbox), button, FALSE, TRUE, 0); gtk_box_pack_start (GTK_BOX (bbox), GTK_WIDGET (self->pv->import), FALSE, TRUE, 0); - align = gtk_alignment_new (0.5, 0.5, 1.0, 1.0); - gtk_alignment_set_padding (GTK_ALIGNMENT (align), 0, 0, 0, 12); - gtk_widget_show (align); - gtk_container_add (GTK_CONTAINER (align), bbox); + gtk_widget_set_halign (bbox, 0.5); + gtk_widget_set_valign (bbox, 0.5); + gtk_widget_set_margin_end (bbox, 12); self->pv->viewer = gcr_viewer_widget_new (); g_object_bind_property (self->pv->viewer, "display-name", @@ -139,7 +137,7 @@ gcr_viewer_window_constructed (GObject *obj) gtk_widget_show (box); gtk_box_pack_start (GTK_BOX (box), GTK_WIDGET (self->pv->viewer), TRUE, TRUE, 0); - gtk_box_pack_start (GTK_BOX (box), align, FALSE, FALSE, 6); + gtk_box_pack_start (GTK_BOX (box), bbox, FALSE, FALSE, 6); gtk_container_add (GTK_CONTAINER (self), box); -- cgit v1.2.3