summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormonsta <[email protected]>2016-01-21 15:17:30 +0300
committermonsta <[email protected]>2016-01-21 15:17:30 +0300
commit27c4734007edef523f90668fadd0ae4e055fb42e (patch)
tree6072a4a2c6f1ea4222f9560ec76be079d964bdbc
parentcb41e6337e553f74dd2109aef852cae74601307e (diff)
downloadmate-notification-daemon-27c4734007edef523f90668fadd0ae4e055fb42e.tar.bz2
mate-notification-daemon-27c4734007edef523f90668fadd0ae4e055fb42e.tar.xz
some corrections in checks and fixes of deprecations
Diffstat
-rw-r--r--src/themes/coco/coco-theme.c9
-rw-r--r--src/themes/nodoka/nodoka-theme.c17
-rw-r--r--src/themes/slider/theme.c9
-rw-r--r--src/themes/standard/theme.c12
4 files changed, 26 insertions, 21 deletions
diff --git a/src/themes/coco/coco-theme.c b/src/themes/coco/coco-theme.c
index 1a9c84f..debc8cd 100644
--- a/src/themes/coco/coco-theme.c
+++ b/src/themes/coco/coco-theme.c
@@ -568,7 +568,7 @@ create_notification(UrlClickedCb url_clicked)
gtk_label_set_xalign (GTK_LABEL (windata->summary_label), 0.0);
gtk_label_set_yalign (GTK_LABEL (windata->summary_label), 0.0);
#else
- gtk_misc_set_alignment(GTK_MISC(windata->summary_label), 0, 0);
+ gtk_misc_set_alignment(GTK_MISC(windata->summary_label), 0.0, 0.0);
#endif
gtk_label_set_line_wrap(GTK_LABEL(windata->summary_label), TRUE);
gtk_label_set_line_wrap_mode (GTK_LABEL (windata->summary_label), PANGO_WRAP_WORD_CHAR);
@@ -582,7 +582,7 @@ create_notification(UrlClickedCb url_clicked)
gtk_label_set_xalign (GTK_LABEL (windata->body_label), 0.0);
gtk_label_set_yalign (GTK_LABEL (windata->body_label), 0.0);
#else
- gtk_misc_set_alignment(GTK_MISC(windata->body_label), 0, 0);
+ gtk_misc_set_alignment(GTK_MISC(windata->body_label), 0.0, 0.0);
#endif
gtk_label_set_line_wrap(GTK_LABEL(windata->body_label), TRUE);
gtk_label_set_line_wrap_mode (GTK_LABEL (windata->body_label), PANGO_WRAP_WORD_CHAR);
@@ -724,7 +724,7 @@ add_notification_action(GtkWindow *nw, const char *text, const char *key,
GtkWidget *image = gtk_image_new_from_pixbuf(pixbuf);
gtk_widget_show(image);
gtk_box_pack_start(GTK_BOX(hbox), image, FALSE, FALSE, 0);
-#if GTK_CHECK_VERSION (3, 16, 0)
+#if GTK_CHECK_VERSION (3, 0, 0)
gtk_widget_set_halign (image, GTK_ALIGN_CENTER);
gtk_widget_set_valign (image, GTK_ALIGN_CENTER);
#else
@@ -737,8 +737,9 @@ add_notification_action(GtkWindow *nw, const char *text, const char *key,
gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
#if GTK_CHECK_VERSION (3, 16, 0)
gtk_label_set_xalign (GTK_LABEL (label), 0.0);
+ gtk_label_set_yalign (GTK_LABEL (label), 0.5);
#else
- gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
+ gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5);
#endif
buf = g_strdup_printf("<small>%s</small>", text);
gtk_label_set_markup(GTK_LABEL(label), buf);
diff --git a/src/themes/nodoka/nodoka-theme.c b/src/themes/nodoka/nodoka-theme.c
index fa7ae76..9f6d9ac 100644
--- a/src/themes/nodoka/nodoka-theme.c
+++ b/src/themes/nodoka/nodoka-theme.c
@@ -919,7 +919,7 @@ create_notification(UrlClickedCb url_clicked)
gtk_label_set_xalign (GTK_LABEL (windata->summary_label), 0.0);
gtk_label_set_yalign (GTK_LABEL (windata->summary_label), 0.0);
#else
- gtk_misc_set_alignment(GTK_MISC(windata->summary_label), 0, 0);
+ gtk_misc_set_alignment(GTK_MISC(windata->summary_label), 0.0, 0.0);
#endif
gtk_label_set_line_wrap(GTK_LABEL(windata->summary_label), TRUE);
gtk_label_set_line_wrap_mode (GTK_LABEL (windata->summary_label), PANGO_WRAP_WORD_CHAR);
@@ -959,11 +959,11 @@ create_notification(UrlClickedCb url_clicked)
windata->icon = gtk_image_new();
gtk_box_pack_start(GTK_BOX(windata->iconbox), windata->icon,
TRUE, TRUE, 0);
-#if GTK_CHECK_VERSION (3, 16, 0)
- gtk_widget_set_halign (image, GTK_ALIGN_CENTER);
- gtk_widget_set_valign (image, GTK_ALIGN_CENTER);
+#if GTK_CHECK_VERSION (3, 0, 0)
+ gtk_widget_set_halign (image, GTK_ALIGN_CENTER);
+ gtk_widget_set_valign (image, GTK_ALIGN_CENTER);
#else
- gtk_misc_set_alignment(GTK_MISC(image), 0.5, 0.5);
+ gtk_misc_set_alignment(GTK_MISC(image), 0.5, 0.5);
#endif
vbox = gtk_vbox_new(FALSE, 6);
@@ -976,7 +976,7 @@ create_notification(UrlClickedCb url_clicked)
gtk_label_set_xalign (GTK_LABEL (windata->body_label), 0.0);
gtk_label_set_yalign (GTK_LABEL (windata->body_label), 0.0);
#else
- gtk_misc_set_alignment(GTK_MISC(windata->body_label), 0, 0);
+ gtk_misc_set_alignment(GTK_MISC(windata->body_label), 0.0, 0.0);
#endif
gtk_label_set_line_wrap(GTK_LABEL(windata->body_label), TRUE);
gtk_label_set_line_wrap_mode (GTK_LABEL (windata->body_label), PANGO_WRAP_WORD_CHAR);
@@ -1130,7 +1130,7 @@ add_notification_action(GtkWindow *nw, const char *text, const char *key,
GtkWidget *image = gtk_image_new_from_pixbuf(pixbuf);
gtk_widget_show(image);
gtk_box_pack_start(GTK_BOX(hbox), image, FALSE, FALSE, 0);
-#if GTK_CHECK_VERSION (3, 16, 0)
+#if GTK_CHECK_VERSION (3, 0, 0)
gtk_widget_set_halign (image, GTK_ALIGN_CENTER);
gtk_widget_set_valign (image, GTK_ALIGN_CENTER);
#else
@@ -1143,8 +1143,9 @@ add_notification_action(GtkWindow *nw, const char *text, const char *key,
gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
#if GTK_CHECK_VERSION (3, 16, 0)
gtk_label_set_xalign (GTK_LABEL (label), 0.0);
+ gtk_label_set_yalign (GTK_LABEL (label), 0.5);
#else
- gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
+ gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5);
#endif
buf = g_strdup_printf("<small>%s</small>", text);
gtk_label_set_markup(GTK_LABEL(label), buf);
diff --git a/src/themes/slider/theme.c b/src/themes/slider/theme.c
index 1921cb7..623d4f8 100644
--- a/src/themes/slider/theme.c
+++ b/src/themes/slider/theme.c
@@ -740,7 +740,7 @@ GtkWindow* create_notification(UrlClickedCb url_clicked)
gtk_label_set_xalign (GTK_LABEL (windata->summary_label), 0.0);
gtk_label_set_yalign (GTK_LABEL (windata->summary_label), 0.0);
#else
- gtk_misc_set_alignment(GTK_MISC(windata->summary_label), 0, 0);
+ gtk_misc_set_alignment(GTK_MISC(windata->summary_label), 0.0, 0.0);
#endif
gtk_label_set_line_wrap(GTK_LABEL(windata->summary_label), TRUE);
#if GTK_CHECK_VERSION (3, 0, 0)
@@ -769,7 +769,7 @@ GtkWindow* create_notification(UrlClickedCb url_clicked)
gtk_label_set_xalign (GTK_LABEL (windata->body_label), 0.0);
gtk_label_set_yalign (GTK_LABEL (windata->body_label), 0.0);
#else
- gtk_misc_set_alignment(GTK_MISC(windata->body_label), 0, 0);
+ gtk_misc_set_alignment(GTK_MISC(windata->body_label), 0.0, 0.0);
#endif
gtk_label_set_line_wrap(GTK_LABEL(windata->body_label), TRUE);
#if GTK_CHECK_VERSION (3, 0, 0)
@@ -1114,7 +1114,7 @@ void add_notification_action(GtkWindow* nw, const char* text, const char* key, A
#endif
gtk_widget_show(image);
gtk_box_pack_start(GTK_BOX(hbox), image, FALSE, FALSE, 0);
-#if GTK_CHECK_VERSION (3, 16, 0)
+#if GTK_CHECK_VERSION (3, 0, 0)
gtk_widget_set_halign (image, GTK_ALIGN_CENTER);
gtk_widget_set_valign (image, GTK_ALIGN_CENTER);
#else
@@ -1130,8 +1130,9 @@ void add_notification_action(GtkWindow* nw, const char* text, const char* key, A
gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
#if GTK_CHECK_VERSION (3, 16, 0)
gtk_label_set_xalign (GTK_LABEL (label), 0.0);
+ gtk_label_set_yalign (GTK_LABEL (label), 0.5);
#else
- gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
+ gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5);
#endif
buf = g_strdup_printf("<small>%s</small>", text);
gtk_label_set_markup(GTK_LABEL(label), buf);
diff --git a/src/themes/standard/theme.c b/src/themes/standard/theme.c
index 1a57b7c..2f9fb78 100644
--- a/src/themes/standard/theme.c
+++ b/src/themes/standard/theme.c
@@ -743,7 +743,7 @@ GtkWindow* create_notification(UrlClickedCb url_clicked)
gtk_label_set_xalign (GTK_LABEL (windata->summary_label), 0.0);
gtk_label_set_yalign (GTK_LABEL (windata->summary_label), 0.0);
#else
- gtk_misc_set_alignment(GTK_MISC(windata->summary_label), 0, 0);
+ gtk_misc_set_alignment(GTK_MISC(windata->summary_label), 0.0, 0.0);
#endif
gtk_label_set_line_wrap(GTK_LABEL(windata->summary_label), TRUE);
#if GTK_CHECK_VERSION (3, 0, 0)
@@ -793,7 +793,8 @@ GtkWindow* create_notification(UrlClickedCb url_clicked)
windata->icon = gtk_image_new();
gtk_box_pack_start(GTK_BOX(windata->iconbox), windata->icon, TRUE, TRUE, 0);
-#if GTK_CHECK_VERSION (3, 16, 0)
+#if GTK_CHECK_VERSION (3, 0, 0)
+ gtk_widget_set_halign (windata->icon, GTK_ALIGN_CENTER);
gtk_widget_set_valign (windata->icon, GTK_ALIGN_START);
#else
gtk_misc_set_alignment(GTK_MISC(windata->icon), 0.5, 0.0);
@@ -809,7 +810,7 @@ GtkWindow* create_notification(UrlClickedCb url_clicked)
gtk_label_set_xalign (GTK_LABEL (windata->body_label), 0.0);
gtk_label_set_yalign (GTK_LABEL (windata->body_label), 0.0);
#else
- gtk_misc_set_alignment(GTK_MISC(windata->body_label), 0, 0);
+ gtk_misc_set_alignment(GTK_MISC(windata->body_label), 0.0, 0.0);
#endif
gtk_label_set_line_wrap(GTK_LABEL(windata->body_label), TRUE);
#if GTK_CHECK_VERSION (3, 0, 0)
@@ -1092,7 +1093,7 @@ void add_notification_action(GtkWindow* nw, const char* text, const char* key, A
GtkWidget* image = gtk_image_new_from_pixbuf(pixbuf);
gtk_widget_show(image);
gtk_box_pack_start(GTK_BOX(hbox), image, FALSE, FALSE, 0);
-#if GTK_CHECK_VERSION (3, 16, 0)
+#if GTK_CHECK_VERSION (3, 0, 0)
gtk_widget_set_halign (image, GTK_ALIGN_CENTER);
gtk_widget_set_valign (image, GTK_ALIGN_CENTER);
#else
@@ -1105,8 +1106,9 @@ void add_notification_action(GtkWindow* nw, const char* text, const char* key, A
gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
#if GTK_CHECK_VERSION (3, 16, 0)
gtk_label_set_xalign (GTK_LABEL (label), 0.0);
+ gtk_label_set_yalign (GTK_LABEL (label), 0.5);
#else
- gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
+ gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5);
#endif
buf = g_strdup_printf("<small>%s</small>", text);
gtk_label_set_markup(GTK_LABEL(label), buf);
generated by cgit v1.2.1 (git 2.18.0) at 2024-05-07 09:58:54 +0000