summaryrefslogtreecommitdiff
path: root/libcaja-private
diff options
context:
space:
mode:
authorraveit65 <[email protected]>2015-09-26 17:05:23 +0200
committermonsta <[email protected]>2015-10-19 16:31:56 +0300
commit597e229c69cf05e734ce0a08cc8ad1af4b2ebae8 (patch)
tree4a82733244da39d82f29f16c83f18c4222815a33 /libcaja-private
parent5609227c672d94e54edec26e2b4db5f9e1697e17 (diff)
downloadcaja-597e229c69cf05e734ce0a08cc8ad1af4b2ebae8.tar.bz2
caja-597e229c69cf05e734ce0a08cc8ad1af4b2ebae8.tar.xz
GTK3: do not use deprecated gtk_misc_set_alignment
Diffstat (limited to 'libcaja-private')
-rw-r--r--libcaja-private/caja-autorun.c13
-rw-r--r--libcaja-private/caja-file-conflict-dialog.c13
-rw-r--r--libcaja-private/caja-mime-application-chooser.c4
-rw-r--r--libcaja-private/caja-open-with-dialog.c8
-rw-r--r--libcaja-private/caja-progress-info.c8
5 files changed, 46 insertions, 0 deletions
diff --git a/libcaja-private/caja-autorun.c b/libcaja-private/caja-autorun.c
index 989ec36e..9409456b 100644
--- a/libcaja-private/caja-autorun.c
+++ b/libcaja-private/caja-autorun.c
@@ -1012,7 +1012,12 @@ show_dialog:
g_object_unref (icon_info);
g_object_unref (icon);
image = gtk_image_new_from_pixbuf (pixbuf);
+#if GTK_CHECK_VERSION (3, 14, 0)
+ gtk_widget_set_halign (image, GTK_ALIGN_CENTER);
+ gtk_widget_set_valign (image, GTK_ALIGN_START);
+#else
gtk_misc_set_alignment (GTK_MISC (image), 0.5, 0.0);
+#endif
gtk_box_pack_start (GTK_BOX (hbox), image, TRUE, TRUE, 0);
/* also use the icon on the dialog */
gtk_window_set_title (GTK_WINDOW (dialog), mount_name);
@@ -1095,7 +1100,11 @@ show_dialog:
#if GTK_CHECK_VERSION (3, 0, 0)
gtk_label_set_max_width_chars (GTK_LABEL (label), 50);
#endif
+#if GTK_CHECK_VERSION (3, 14, 0)
+ gtk_widget_set_halign (label, GTK_ALIGN_START);
+#else
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
+#endif
gtk_box_pack_start (GTK_BOX (vbox), label, TRUE, TRUE, 0);
label = gtk_label_new (NULL);
@@ -1108,7 +1117,11 @@ show_dialog:
#if GTK_CHECK_VERSION (3, 0, 0)
gtk_label_set_max_width_chars (GTK_LABEL (label), 50);
#endif
+#if GTK_CHECK_VERSION (3, 14, 0)
+ gtk_widget_set_halign (label, GTK_ALIGN_START);
+#else
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
+#endif
gtk_box_pack_start (GTK_BOX (vbox), label, TRUE, TRUE, 0);
data = g_new0 (AutorunDialogData, 1);
diff --git a/libcaja-private/caja-file-conflict-dialog.c b/libcaja-private/caja-file-conflict-dialog.c
index 7ff27b76..45012e60 100644
--- a/libcaja-private/caja-file-conflict-dialog.c
+++ b/libcaja-private/caja-file-conflict-dialog.c
@@ -217,7 +217,11 @@ file_list_ready_cb (GList *files,
gtk_label_set_line_wrap (GTK_LABEL (label), TRUE);
gtk_label_set_line_wrap_mode (GTK_LABEL (label), PANGO_WRAP_WORD_CHAR);
gtk_widget_set_size_request (label, 350, -1);
+#if GTK_CHECK_VERSION (3, 14, 0)
+ gtk_widget_set_halign (label, GTK_ALIGN_START);
+#else
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
+#endif
gtk_box_pack_start (GTK_BOX (details->titles_vbox),
label, FALSE, FALSE, 0);
gtk_widget_modify_font (label, NULL);
@@ -232,7 +236,11 @@ file_list_ready_cb (GList *files,
label = gtk_label_new (secondary_text);
gtk_label_set_line_wrap (GTK_LABEL (label), TRUE);
gtk_widget_set_size_request (label, 350, -1);
+#if GTK_CHECK_VERSION (3, 14, 0)
+ gtk_widget_set_halign (label, GTK_ALIGN_START);
+#else
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
+#endif
gtk_box_pack_start (GTK_BOX (details->titles_vbox),
label, FALSE, FALSE, 0);
gtk_widget_show (label);
@@ -568,7 +576,12 @@ caja_file_conflict_dialog_init (CajaFileConflictDialog *fcd)
widget = gtk_image_new_from_stock (GTK_STOCK_DIALOG_WARNING,
GTK_ICON_SIZE_DIALOG);
gtk_box_pack_start (GTK_BOX (hbox), widget, FALSE, FALSE, 0);
+#if GTK_CHECK_VERSION (3, 14, 0)
+ gtk_widget_set_halign (widget, GTK_ALIGN_CENTER);
+ gtk_widget_set_valign (widget, GTK_ALIGN_START);
+#else
gtk_misc_set_alignment (GTK_MISC (widget), 0.5, 0.0);
+#endif
/* Setup the vbox containing the dialog body */
vbox = gtk_vbox_new (FALSE, 12);
diff --git a/libcaja-private/caja-mime-application-chooser.c b/libcaja-private/caja-mime-application-chooser.c
index c989bad1..438a92fe 100644
--- a/libcaja-private/caja-mime-application-chooser.c
+++ b/libcaja-private/caja-mime-application-chooser.c
@@ -381,7 +381,11 @@ caja_mime_application_chooser_init (CajaMimeApplicationChooser *chooser)
gtk_box_set_homogeneous (GTK_BOX (chooser), FALSE);
chooser->details->label = gtk_label_new ("");
+#if GTK_CHECK_VERSION (3, 14, 0)
+ gtk_widget_set_halign (chooser->details->label, GTK_ALIGN_START);
+#else
gtk_misc_set_alignment (GTK_MISC (chooser->details->label), 0.0, 0.5);
+#endif
gtk_label_set_line_wrap (GTK_LABEL (chooser->details->label), TRUE);
gtk_label_set_line_wrap_mode (GTK_LABEL (chooser->details->label),
PANGO_WRAP_WORD_CHAR);
diff --git a/libcaja-private/caja-open-with-dialog.c b/libcaja-private/caja-open-with-dialog.c
index 824b87e7..1a507a3f 100644
--- a/libcaja-private/caja-open-with-dialog.c
+++ b/libcaja-private/caja-open-with-dialog.c
@@ -857,7 +857,11 @@ caja_open_with_dialog_init (CajaOpenWithDialog *dialog)
gtk_box_pack_start (GTK_BOX (vbox), vbox2, TRUE, TRUE, 0);
dialog->details->label = gtk_label_new ("");
+#if GTK_CHECK_VERSION (3, 14, 0)
+ gtk_widget_set_halign (dialog->details->label, GTK_ALIGN_START);
+#else
gtk_misc_set_alignment (GTK_MISC (dialog->details->label), 0.0, 0.5);
+#endif
gtk_label_set_line_wrap (GTK_LABEL (dialog->details->label), TRUE);
gtk_box_pack_start (GTK_BOX (vbox2), dialog->details->label,
FALSE, FALSE, 0);
@@ -880,7 +884,11 @@ caja_open_with_dialog_init (CajaOpenWithDialog *dialog)
gtk_box_pack_start (GTK_BOX (vbox2), scrolled_window, TRUE, TRUE, 0);
dialog->details->desc_label = gtk_label_new (_("Select an application to view its description."));
+#if GTK_CHECK_VERSION (3, 14, 0)
+ gtk_widget_set_halign (dialog->details->desc_label, GTK_ALIGN_START);
+#else
gtk_misc_set_alignment (GTK_MISC (dialog->details->desc_label), 0.0, 0.5);
+#endif
gtk_label_set_justify (GTK_LABEL (dialog->details->desc_label), GTK_JUSTIFY_LEFT);
gtk_label_set_line_wrap (GTK_LABEL (dialog->details->desc_label), TRUE);
gtk_label_set_single_line_mode (GTK_LABEL (dialog->details->desc_label), FALSE);
diff --git a/libcaja-private/caja-progress-info.c b/libcaja-private/caja-progress-info.c
index 27f48da5..503a8ac6 100644
--- a/libcaja-private/caja-progress-info.c
+++ b/libcaja-private/caja-progress-info.c
@@ -375,7 +375,11 @@ progress_widget_new (CajaProgressInfo *info)
gtk_widget_set_size_request (label, 500, -1);
gtk_label_set_line_wrap (GTK_LABEL (label), TRUE);
gtk_label_set_line_wrap_mode (GTK_LABEL (label), PANGO_WRAP_WORD_CHAR);
+#if GTK_CHECK_VERSION (3, 14, 0)
+ gtk_widget_set_halign (label, GTK_ALIGN_START);
+#else
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
+#endif
gtk_box_pack_start (GTK_BOX (vbox),
label,
TRUE, FALSE,
@@ -413,7 +417,11 @@ progress_widget_new (CajaProgressInfo *info)
0);
label = gtk_label_new ("details");
+#if GTK_CHECK_VERSION (3, 14, 0)
+ gtk_widget_set_halign (label, GTK_ALIGN_START);
+#else
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
+#endif
gtk_label_set_line_wrap (GTK_LABEL (label), TRUE);
gtk_box_pack_start (GTK_BOX (vbox),
label,
generated by cgit v1.2.1 (git 2.18.0) at 2024-06-27 08:14:00 +0000