[gnome-applets] don't use deprecated GtkMisc
- From: Alberts Muktupāvels <muktupavels src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-applets] don't use deprecated GtkMisc
- Date: Mon, 24 Nov 2014 05:50:09 +0000 (UTC)
commit 46d7d7216605745a2c3cfe1aa05ce365764193f4
Author: Alberts Muktupāvels <alberts muktupavels gmail com>
Date: Mon Nov 24 07:45:15 2014 +0200
don't use deprecated GtkMisc
charpick/properties.c | 4 +-
configure.ac | 2 +-
geyes/geyes.c | 29 +++++++++++++++++++---
geyes/themes.c | 4 +-
gweather/gweather-dialog.c | 52 ++++++++++++++++++++--------------------
gweather/gweather-pref.c | 14 +++++-----
multiload/properties.c | 14 +++++-----
trashapplet/src/trashapplet.c | 7 +++--
windowpicker/src/task-title.c | 2 +-
9 files changed, 75 insertions(+), 53 deletions(-)
---
diff --git a/charpick/properties.c b/charpick/properties.c
index 4395461..3c0d101 100644
--- a/charpick/properties.c
+++ b/charpick/properties.c
@@ -413,7 +413,7 @@ create_hig_catagory (GtkWidget *main_box, gchar *title)
tmp = g_strdup_printf ("<b>%s</b>", title);
label = gtk_label_new (NULL);
- gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
+ gtk_label_set_xalign (GTK_LABEL (label), 0.0);
gtk_label_set_markup (GTK_LABEL (label), tmp);
g_free (tmp);
gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0);
@@ -453,7 +453,7 @@ static void default_chars_frame_create(charpick_data *curr_data)
label = gtk_label_new_with_mnemonic(_("_Palettes:"));
gtk_box_pack_start(GTK_BOX(vbox3), label, FALSE, FALSE, 0);
- gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
+ gtk_label_set_xalign (GTK_LABEL (label), 0.0);
gtk_widget_show(label);
hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
diff --git a/configure.ac b/configure.ac
index 108dfd0..7f4e456 100644
--- a/configure.ac
+++ b/configure.ac
@@ -12,7 +12,7 @@ m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
dnl ***************************************************************************
dnl *** Minimum library versions for GNOME-APPLETS ***
dnl ***************************************************************************
-GTK_REQUIRED=3.2
+GTK_REQUIRED=3.15.2
GLIB_REQUIRED=2.30.0
GIO_REQUIRED=2.26.0
LIBPANEL_REQUIRED=3.10.0
diff --git a/geyes/geyes.c b/geyes/geyes.c
index 41db9b1..f1c066b 100644
--- a/geyes/geyes.c
+++ b/geyes/geyes.c
@@ -24,6 +24,22 @@
#define UPDATE_TIMEOUT 100
+static gfloat
+gtk_align_to_gfloat (GtkAlign align)
+{
+ switch (align) {
+ case GTK_ALIGN_START:
+ return 0.0;
+ case GTK_ALIGN_END:
+ return 1.0;
+ case GTK_ALIGN_CENTER:
+ case GTK_ALIGN_FILL:
+ return 0.5;
+ default:
+ return 0.0;
+ }
+}
+
/* TODO - Optimize this a bit */
static void
calculate_pupil_xy (EyesApplet *eyes_applet,
@@ -43,7 +59,9 @@ calculate_pupil_xy (EyesApplet *eyes_applet,
gtk_widget_get_allocation (GTK_WIDGET(widget), &allocation);
width = allocation.width;
height = allocation.height;
- gtk_misc_get_alignment(GTK_MISC(widget), &xalign, &yalign);
+
+ xalign = gtk_align_to_gfloat (gtk_widget_get_halign (widget));
+ yalign = gtk_align_to_gfloat (gtk_widget_get_valign (widget));
nx = x - MAX(width - eyes_applet->eye_width, 0) * xalign - eyes_applet->eye_width / 2;
ny = y - MAX(height- eyes_applet->eye_height, 0) * yalign - eyes_applet->eye_height / 2;
@@ -212,13 +230,16 @@ setup_eyes (EyesApplet *eyes_applet)
0);
if ((eyes_applet->num_eyes != 1) && (i == 0)) {
- gtk_misc_set_alignment (GTK_MISC (eyes_applet->eyes[i]), 1.0, 0.5);
+ gtk_widget_set_halign (eyes_applet->eyes[i], GTK_ALIGN_END);
+ gtk_widget_set_valign (eyes_applet->eyes[i], GTK_ALIGN_CENTER);
}
else if ((eyes_applet->num_eyes != 1) && (i == eyes_applet->num_eyes - 1)) {
- gtk_misc_set_alignment (GTK_MISC (eyes_applet->eyes[i]), 0.0, 0.5);
+ gtk_widget_set_halign (eyes_applet->eyes[i], GTK_ALIGN_START);
+ gtk_widget_set_valign (eyes_applet->eyes[i], GTK_ALIGN_CENTER);
}
else {
- gtk_misc_set_alignment (GTK_MISC (eyes_applet->eyes[i]), 0.5, 0.5);
+ gtk_widget_set_halign (eyes_applet->eyes[i], GTK_ALIGN_CENTER);
+ gtk_widget_set_valign (eyes_applet->eyes[i], GTK_ALIGN_CENTER);
}
gtk_widget_realize (eyes_applet->eyes[i]);
diff --git a/geyes/themes.c b/geyes/themes.c
index e95b008..f9e2978 100644
--- a/geyes/themes.c
+++ b/geyes/themes.c
@@ -314,7 +314,7 @@ properties_cb (GSimpleAction *action,
label = gtk_label_new (_(title));
gtk_label_set_use_markup (GTK_LABEL (label), TRUE);
gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_LEFT);
- gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
+ gtk_label_set_xalign (GTK_LABEL (label), 0.0);
gtk_box_pack_start (GTK_BOX (category_vbox), label, FALSE, FALSE, 0);
g_free (title);
@@ -332,7 +332,7 @@ properties_cb (GSimpleAction *action,
gtk_widget_show (control_vbox);
label = gtk_label_new_with_mnemonic (_("_Select a theme:"));
- gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
+ gtk_label_set_xalign (GTK_LABEL (label), 0.0);
gtk_box_pack_start (GTK_BOX (control_vbox), label, FALSE, FALSE, 0);
scrolled = gtk_scrolled_window_new (NULL, NULL);
diff --git a/gweather/gweather-dialog.c b/gweather/gweather-dialog.c
index 6a1d3d9..6e10cd9 100644
--- a/gweather/gweather-dialog.c
+++ b/gweather/gweather-dialog.c
@@ -202,7 +202,7 @@ gweather_dialog_create (GWeatherDialog *dialog)
(GtkAttachOptions) (GTK_FILL),
(GtkAttachOptions) (0), 0, 0);
gtk_label_set_justify (GTK_LABEL (cond_location_lbl), GTK_JUSTIFY_LEFT);
- gtk_misc_set_alignment (GTK_MISC (cond_location_lbl), 0, 0.5);
+ gtk_label_set_xalign (GTK_LABEL (cond_location_lbl), 0.0);
cond_update_lbl = gtk_label_new (_("Last update:"));
gtk_widget_show (cond_update_lbl);
@@ -210,7 +210,7 @@ gweather_dialog_create (GWeatherDialog *dialog)
(GtkAttachOptions) (GTK_FILL),
(GtkAttachOptions) (0), 0, 0);
gtk_label_set_justify (GTK_LABEL (cond_update_lbl), GTK_JUSTIFY_LEFT);
- gtk_misc_set_alignment (GTK_MISC (cond_update_lbl), 0, 0.5);
+ gtk_label_set_xalign (GTK_LABEL (cond_update_lbl), 0.0);
cond_cond_lbl = gtk_label_new (_("Conditions:"));
gtk_widget_show (cond_cond_lbl);
@@ -218,7 +218,7 @@ gweather_dialog_create (GWeatherDialog *dialog)
(GtkAttachOptions) (GTK_FILL),
(GtkAttachOptions) (0), 0, 0);
gtk_label_set_justify (GTK_LABEL (cond_cond_lbl), GTK_JUSTIFY_LEFT);
- gtk_misc_set_alignment (GTK_MISC (cond_cond_lbl), 0, 0.5);
+ gtk_label_set_xalign (GTK_LABEL (cond_cond_lbl), 0.0);
cond_sky_lbl = gtk_label_new (_("Sky:"));
gtk_widget_show (cond_sky_lbl);
@@ -226,7 +226,7 @@ gweather_dialog_create (GWeatherDialog *dialog)
(GtkAttachOptions) (GTK_FILL),
(GtkAttachOptions) (0), 0, 0);
gtk_label_set_justify (GTK_LABEL (cond_sky_lbl), GTK_JUSTIFY_LEFT);
- gtk_misc_set_alignment (GTK_MISC (cond_sky_lbl), 0, 0.5);
+ gtk_label_set_xalign (GTK_LABEL (cond_sky_lbl), 0.0);
cond_temp_lbl = gtk_label_new (_("Temperature:"));
gtk_widget_show (cond_temp_lbl);
@@ -234,7 +234,7 @@ gweather_dialog_create (GWeatherDialog *dialog)
(GtkAttachOptions) (GTK_FILL),
(GtkAttachOptions) (0), 0, 0);
gtk_label_set_justify (GTK_LABEL (cond_temp_lbl), GTK_JUSTIFY_LEFT);
- gtk_misc_set_alignment (GTK_MISC (cond_temp_lbl), 0, 0.5);
+ gtk_label_set_xalign (GTK_LABEL (cond_temp_lbl), 0.0);
cond_apparent_lbl = gtk_label_new (_("Feels like:"));
gtk_widget_show (cond_apparent_lbl);
@@ -242,7 +242,7 @@ gweather_dialog_create (GWeatherDialog *dialog)
(GtkAttachOptions) (GTK_FILL),
(GtkAttachOptions) (0), 0, 0);
gtk_label_set_justify (GTK_LABEL (cond_apparent_lbl), GTK_JUSTIFY_LEFT);
- gtk_misc_set_alignment (GTK_MISC (cond_apparent_lbl), 0, 0.5);
+ gtk_label_set_xalign (GTK_LABEL (cond_apparent_lbl), 0.0);
cond_dew_lbl = gtk_label_new (_("Dew point:"));
gtk_widget_show (cond_dew_lbl);
@@ -250,7 +250,7 @@ gweather_dialog_create (GWeatherDialog *dialog)
(GtkAttachOptions) (GTK_FILL),
(GtkAttachOptions) (0), 0, 0);
gtk_label_set_justify (GTK_LABEL (cond_dew_lbl), GTK_JUSTIFY_LEFT);
- gtk_misc_set_alignment (GTK_MISC (cond_dew_lbl), 0, 0.5);
+ gtk_label_set_xalign (GTK_LABEL (cond_dew_lbl), 0.0);
cond_humidity_lbl = gtk_label_new (_("Relative humidity:"));
gtk_widget_show (cond_humidity_lbl);
@@ -258,7 +258,7 @@ gweather_dialog_create (GWeatherDialog *dialog)
(GtkAttachOptions) (GTK_FILL),
(GtkAttachOptions) (0), 0, 0);
gtk_label_set_justify (GTK_LABEL (cond_humidity_lbl), GTK_JUSTIFY_LEFT);
- gtk_misc_set_alignment (GTK_MISC (cond_humidity_lbl), 0, 0.5);
+ gtk_label_set_xalign (GTK_LABEL (cond_humidity_lbl), 0.0);
cond_wind_lbl = gtk_label_new (_("Wind:"));
gtk_widget_show (cond_wind_lbl);
@@ -266,7 +266,7 @@ gweather_dialog_create (GWeatherDialog *dialog)
(GtkAttachOptions) (GTK_FILL),
(GtkAttachOptions) (0), 0, 0);
gtk_label_set_justify (GTK_LABEL (cond_wind_lbl), GTK_JUSTIFY_LEFT);
- gtk_misc_set_alignment (GTK_MISC (cond_wind_lbl), 0, 0.5);
+ gtk_label_set_xalign (GTK_LABEL (cond_wind_lbl), 0.0);
cond_pressure_lbl = gtk_label_new (_("Pressure:"));
gtk_widget_show (cond_pressure_lbl);
@@ -274,7 +274,7 @@ gweather_dialog_create (GWeatherDialog *dialog)
(GtkAttachOptions) (GTK_FILL),
(GtkAttachOptions) (0), 0, 0);
gtk_label_set_justify (GTK_LABEL (cond_pressure_lbl), GTK_JUSTIFY_LEFT);
- gtk_misc_set_alignment (GTK_MISC (cond_pressure_lbl), 0, 0.5);
+ gtk_label_set_xalign (GTK_LABEL (cond_pressure_lbl), 0.0);
cond_vis_lbl = gtk_label_new (_("Visibility:"));
gtk_widget_show (cond_vis_lbl);
@@ -282,7 +282,7 @@ gweather_dialog_create (GWeatherDialog *dialog)
(GtkAttachOptions) (GTK_FILL),
(GtkAttachOptions) (0), 0, 0);
gtk_label_set_justify (GTK_LABEL (cond_vis_lbl), GTK_JUSTIFY_LEFT);
- gtk_misc_set_alignment (GTK_MISC (cond_vis_lbl), 0, 0.5);
+ gtk_label_set_xalign (GTK_LABEL (cond_vis_lbl), 0.0);
cond_sunrise_lbl = gtk_label_new (_("Sunrise:"));
gtk_widget_show (cond_sunrise_lbl);
@@ -290,7 +290,7 @@ gweather_dialog_create (GWeatherDialog *dialog)
(GtkAttachOptions) (GTK_FILL),
(GtkAttachOptions) (0), 0, 0);
gtk_label_set_justify (GTK_LABEL (cond_sunrise_lbl), GTK_JUSTIFY_LEFT);
- gtk_misc_set_alignment (GTK_MISC (cond_sunrise_lbl), 0, 0.5);
+ gtk_label_set_xalign (GTK_LABEL (cond_sunrise_lbl), 0.0);
cond_sunset_lbl = gtk_label_new (_("Sunset:"));
gtk_widget_show (cond_sunset_lbl);
@@ -298,7 +298,7 @@ gweather_dialog_create (GWeatherDialog *dialog)
(GtkAttachOptions) (GTK_FILL),
(GtkAttachOptions) (0), 0, 0);
gtk_label_set_justify (GTK_LABEL (cond_sunset_lbl), GTK_JUSTIFY_LEFT);
- gtk_misc_set_alignment (GTK_MISC (cond_sunset_lbl), 0, 0.5);
+ gtk_label_set_xalign (GTK_LABEL (cond_sunset_lbl), 0.0);
priv->cond_location = gtk_label_new ("");
gtk_widget_show (priv->cond_location);
@@ -307,7 +307,7 @@ gweather_dialog_create (GWeatherDialog *dialog)
(GtkAttachOptions) (0), 0, 0);
gtk_label_set_selectable (GTK_LABEL (priv->cond_location), TRUE);
gtk_label_set_justify (GTK_LABEL (priv->cond_location), GTK_JUSTIFY_LEFT);
- gtk_misc_set_alignment (GTK_MISC (priv->cond_location), 0, 0.5);
+ gtk_label_set_xalign (GTK_LABEL (priv->cond_location), 0.0);
priv->cond_update = gtk_label_new ("");
gtk_widget_show (priv->cond_update);
@@ -316,7 +316,7 @@ gweather_dialog_create (GWeatherDialog *dialog)
(GtkAttachOptions) (0), 0, 0);
gtk_label_set_selectable (GTK_LABEL (priv->cond_update), TRUE);
gtk_label_set_justify (GTK_LABEL (priv->cond_update), GTK_JUSTIFY_LEFT);
- gtk_misc_set_alignment (GTK_MISC (priv->cond_update), 0, 0.5);
+ gtk_label_set_xalign (GTK_LABEL (priv->cond_update), 0.0);
priv->cond_cond = gtk_label_new ("");
gtk_widget_show (priv->cond_cond);
@@ -325,7 +325,7 @@ gweather_dialog_create (GWeatherDialog *dialog)
(GtkAttachOptions) (0), 0, 0);
gtk_label_set_selectable (GTK_LABEL (priv->cond_cond), TRUE);
gtk_label_set_justify (GTK_LABEL (priv->cond_cond), GTK_JUSTIFY_LEFT);
- gtk_misc_set_alignment (GTK_MISC (priv->cond_cond), 0, 0.5);
+ gtk_label_set_xalign (GTK_LABEL (priv->cond_cond), 0.0);
priv->cond_sky = gtk_label_new ("");
gtk_widget_show (priv->cond_sky);
@@ -334,7 +334,7 @@ gweather_dialog_create (GWeatherDialog *dialog)
(GtkAttachOptions) (0), 0, 0);
gtk_label_set_selectable (GTK_LABEL (priv->cond_sky), TRUE);
gtk_label_set_justify (GTK_LABEL (priv->cond_sky), GTK_JUSTIFY_LEFT);
- gtk_misc_set_alignment (GTK_MISC (priv->cond_sky), 0, 0.5);
+ gtk_label_set_xalign (GTK_LABEL (priv->cond_sky), 0.0);
priv->cond_temp = gtk_label_new ("");
gtk_widget_show (priv->cond_temp);
@@ -343,7 +343,7 @@ gweather_dialog_create (GWeatherDialog *dialog)
(GtkAttachOptions) (0), 0, 0);
gtk_label_set_selectable (GTK_LABEL (priv->cond_temp), TRUE);
gtk_label_set_justify (GTK_LABEL (priv->cond_temp), GTK_JUSTIFY_LEFT);
- gtk_misc_set_alignment (GTK_MISC (priv->cond_temp), 0, 0.5);
+ gtk_label_set_xalign (GTK_LABEL (priv->cond_temp), 0.0);
priv->cond_apparent = gtk_label_new ("");
gtk_widget_show (priv->cond_apparent);
@@ -352,7 +352,7 @@ gweather_dialog_create (GWeatherDialog *dialog)
(GtkAttachOptions) (0), 0, 0);
gtk_label_set_selectable (GTK_LABEL (priv->cond_apparent), TRUE);
gtk_label_set_justify (GTK_LABEL (priv->cond_apparent), GTK_JUSTIFY_LEFT);
- gtk_misc_set_alignment (GTK_MISC (priv->cond_apparent), 0, 0.5);
+ gtk_label_set_xalign (GTK_LABEL (priv->cond_apparent), 0.0);
priv->cond_dew = gtk_label_new ("");
gtk_widget_show (priv->cond_dew);
@@ -361,7 +361,7 @@ gweather_dialog_create (GWeatherDialog *dialog)
(GtkAttachOptions) (0), 0, 0);
gtk_label_set_selectable (GTK_LABEL (priv->cond_dew), TRUE);
gtk_label_set_justify (GTK_LABEL (priv->cond_dew), GTK_JUSTIFY_LEFT);
- gtk_misc_set_alignment (GTK_MISC (priv->cond_dew), 0, 0.5);
+ gtk_label_set_xalign (GTK_LABEL (priv->cond_dew), 0.0);
priv->cond_humidity = gtk_label_new ("");
gtk_widget_show (priv->cond_humidity);
@@ -370,7 +370,7 @@ gweather_dialog_create (GWeatherDialog *dialog)
(GtkAttachOptions) (0), 0, 0);
gtk_label_set_selectable (GTK_LABEL (priv->cond_humidity), TRUE);
gtk_label_set_justify (GTK_LABEL (priv->cond_humidity), GTK_JUSTIFY_LEFT);
- gtk_misc_set_alignment (GTK_MISC (priv->cond_humidity), 0, 0.5);
+ gtk_label_set_xalign (GTK_LABEL (priv->cond_humidity), 0.0);
priv->cond_wind = gtk_label_new ("");
gtk_widget_show (priv->cond_wind);
@@ -379,7 +379,7 @@ gweather_dialog_create (GWeatherDialog *dialog)
(GtkAttachOptions) (0), 0, 0);
gtk_label_set_selectable (GTK_LABEL (priv->cond_wind), TRUE);
gtk_label_set_justify (GTK_LABEL (priv->cond_wind), GTK_JUSTIFY_LEFT);
- gtk_misc_set_alignment (GTK_MISC (priv->cond_wind), 0, 0.5);
+ gtk_label_set_xalign (GTK_LABEL (priv->cond_wind), 0.0);
priv->cond_pressure = gtk_label_new ("");
gtk_widget_show (priv->cond_pressure);
@@ -388,7 +388,7 @@ gweather_dialog_create (GWeatherDialog *dialog)
(GtkAttachOptions) (0), 0, 0);
gtk_label_set_selectable (GTK_LABEL (priv->cond_pressure), TRUE);
gtk_label_set_justify (GTK_LABEL (priv->cond_pressure), GTK_JUSTIFY_LEFT);
- gtk_misc_set_alignment (GTK_MISC (priv->cond_pressure), 0, 0.5);
+ gtk_label_set_xalign (GTK_LABEL (priv->cond_pressure), 0.0);
priv->cond_vis = gtk_label_new ("");
gtk_widget_show (priv->cond_vis);
@@ -397,7 +397,7 @@ gweather_dialog_create (GWeatherDialog *dialog)
(GtkAttachOptions) (0), 0, 0);
gtk_label_set_selectable (GTK_LABEL (priv->cond_vis), TRUE);
gtk_label_set_justify (GTK_LABEL (priv->cond_vis), GTK_JUSTIFY_LEFT);
- gtk_misc_set_alignment (GTK_MISC (priv->cond_vis), 0, 0.5);
+ gtk_label_set_xalign (GTK_LABEL (priv->cond_vis), 0.0);
priv->cond_sunrise = gtk_label_new ("");
gtk_widget_show (priv->cond_sunrise);
@@ -406,7 +406,7 @@ gweather_dialog_create (GWeatherDialog *dialog)
(GtkAttachOptions) (0), 0, 0);
gtk_label_set_selectable (GTK_LABEL (priv->cond_sunrise), TRUE);
gtk_label_set_justify (GTK_LABEL (priv->cond_sunrise), GTK_JUSTIFY_LEFT);
- gtk_misc_set_alignment (GTK_MISC (priv->cond_sunrise), 0, 0.5);
+ gtk_label_set_xalign (GTK_LABEL (priv->cond_sunrise), 0.0);
priv->cond_sunset = gtk_label_new ("");
gtk_widget_show (priv->cond_sunset);
@@ -415,7 +415,7 @@ gweather_dialog_create (GWeatherDialog *dialog)
(GtkAttachOptions) (0), 0, 0);
gtk_label_set_selectable (GTK_LABEL (priv->cond_sunset), TRUE);
gtk_label_set_justify (GTK_LABEL (priv->cond_sunset), GTK_JUSTIFY_LEFT);
- gtk_misc_set_alignment (GTK_MISC (priv->cond_sunset), 0, 0.5);
+ gtk_label_set_xalign (GTK_LABEL (priv->cond_sunset), 0.0);
cond_frame_alignment = gtk_alignment_new (0.5, 0, 1, 0);
gtk_widget_show (cond_frame_alignment);
diff --git a/gweather/gweather-pref.c b/gweather/gweather-pref.c
index fd4114c..34110fb 100644
--- a/gweather/gweather-pref.c
+++ b/gweather/gweather-pref.c
@@ -508,7 +508,7 @@ create_hig_catagory (GtkWidget *main_box, gchar *title)
tmp = g_strdup_printf ("<b>%s</b>", title);
label = gtk_label_new (NULL);
- gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
+ gtk_label_set_xalign (GTK_LABEL (label), 0.0);
gtk_label_set_markup (GTK_LABEL (label), tmp);
g_free (tmp);
gtk_box_pack_start (GTK_BOX (vbox), label, TRUE, FALSE, 0);
@@ -778,7 +778,7 @@ gweather_pref_create (GWeatherPref *pref)
temp_label = gtk_label_new_with_mnemonic (_("_Temperature unit:"));
gtk_label_set_use_markup (GTK_LABEL (temp_label), TRUE);
gtk_label_set_justify (GTK_LABEL (temp_label), GTK_JUSTIFY_LEFT);
- gtk_misc_set_alignment (GTK_MISC (temp_label), 0, 0.5);
+ gtk_label_set_xalign (GTK_LABEL (temp_label), 0.0);
gtk_widget_show (temp_label);
temp_combo = gtk_combo_box_text_new ();
@@ -795,7 +795,7 @@ gweather_pref_create (GWeatherPref *pref)
speed_label = gtk_label_new_with_mnemonic (_("_Wind speed unit:"));
gtk_label_set_use_markup (GTK_LABEL (speed_label), TRUE);
gtk_label_set_justify (GTK_LABEL (speed_label), GTK_JUSTIFY_LEFT);
- gtk_misc_set_alignment (GTK_MISC (speed_label), 0, 0.5);
+ gtk_label_set_xalign (GTK_LABEL (speed_label), 0.0);
gtk_widget_show (speed_label);
speed_combo = gtk_combo_box_text_new ();
@@ -818,7 +818,7 @@ gweather_pref_create (GWeatherPref *pref)
pres_label = gtk_label_new_with_mnemonic (_("_Pressure unit:"));
gtk_label_set_use_markup (GTK_LABEL (pres_label), TRUE);
gtk_label_set_justify (GTK_LABEL (pres_label), GTK_JUSTIFY_LEFT);
- gtk_misc_set_alignment (GTK_MISC (pres_label), 0, 0.5);
+ gtk_label_set_xalign (GTK_LABEL (pres_label), 0.0);
gtk_widget_show (pres_label);
pres_combo = gtk_combo_box_text_new ();
@@ -843,7 +843,7 @@ gweather_pref_create (GWeatherPref *pref)
dist_label = gtk_label_new_with_mnemonic (_("_Visibility unit:"));
gtk_label_set_use_markup (GTK_LABEL (dist_label), TRUE);
gtk_label_set_justify (GTK_LABEL (dist_label), GTK_JUSTIFY_LEFT);
- gtk_misc_set_alignment (GTK_MISC (dist_label), 0, 0.5);
+ gtk_label_set_xalign (GTK_LABEL (dist_label), 0.0);
gtk_widget_show (dist_label);
dist_combo = gtk_combo_box_text_new ();
@@ -935,7 +935,7 @@ gweather_pref_create (GWeatherPref *pref)
/*
gtk_label_set_justify (GTK_LABEL (pref_basic_update_lbl), GTK_JUSTIFY_RIGHT);
- gtk_misc_set_alignment (GTK_MISC (pref_basic_update_lbl), 1, 0.5);
+ gtk_label_set_xalign (GTK_LABEL (prefs_basic_update_lbl), 0.0);
*/
gtk_widget_show (pref_basic_update_hbox);
@@ -990,7 +990,7 @@ gweather_pref_create (GWeatherPref *pref)
gtk_container_add (GTK_CONTAINER (pref_notebook), pref_loc_hbox);
tree_label = gtk_label_new_with_mnemonic (_("_Select a location:"));
- gtk_misc_set_alignment (GTK_MISC (tree_label), 0.0, 0.5);
+ gtk_label_set_xalign (GTK_LABEL (tree_label), 0.0);
gtk_box_pack_start (GTK_BOX (pref_loc_hbox), tree_label, FALSE, FALSE, 0);
scrolled_window = gtk_scrolled_window_new (NULL, NULL);
diff --git a/multiload/properties.c b/multiload/properties.c
index 700582b..1f7e222 100644
--- a/multiload/properties.c
+++ b/multiload/properties.c
@@ -313,7 +313,7 @@ fill_properties(GtkWidget *dialog, MultiloadApplet *ma)
label = gtk_label_new_with_mnemonic (_(title));
gtk_label_set_use_markup (GTK_LABEL (label), TRUE);
gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_LEFT);
- gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
+ gtk_label_set_xalign (GTK_LABEL (label), 0.0);
gtk_box_pack_start (GTK_BOX (category_vbox), label, FALSE, FALSE, 0);
g_free (title);
@@ -418,7 +418,7 @@ fill_properties(GtkWidget *dialog, MultiloadApplet *ma)
label = gtk_label_new (title);
gtk_label_set_use_markup (GTK_LABEL (label), TRUE);
gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_LEFT);
- gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
+ gtk_label_set_xalign (GTK_LABEL (label), 0.0);
gtk_box_pack_start (GTK_BOX (category_vbox), label, FALSE, FALSE, 0);
gtk_widget_show (label);
g_free (title);
@@ -449,7 +449,7 @@ fill_properties(GtkWidget *dialog, MultiloadApplet *ma)
label_text = g_strdup(_("System m_onitor height: "));
label = gtk_label_new_with_mnemonic(label_text);
- gtk_misc_set_alignment (GTK_MISC (label), 0.0f, 0.5f);
+ gtk_label_set_xalign (GTK_LABEL (label), 0.0);
gtk_size_group_add_widget (label_size, label);
gtk_box_pack_start (GTK_BOX (control_hbox), label, FALSE, FALSE, 0);
@@ -478,7 +478,7 @@ fill_properties(GtkWidget *dialog, MultiloadApplet *ma)
gtk_box_pack_start (GTK_BOX (hbox), spin_button, FALSE, FALSE, 0);
label = gtk_label_new (_("pixels"));
- gtk_misc_set_alignment (GTK_MISC (label), 0.0f, 0.5f);
+ gtk_label_set_xalign (GTK_LABEL (label), 0.0);
gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
control_hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
@@ -486,7 +486,7 @@ fill_properties(GtkWidget *dialog, MultiloadApplet *ma)
gtk_widget_show (control_hbox);
label = gtk_label_new_with_mnemonic(_("Sys_tem monitor update interval: "));
- gtk_misc_set_alignment (GTK_MISC (label), 0.0f, 0.5f);
+ gtk_label_set_xalign (GTK_LABEL (label), 0.0);
gtk_size_group_add_widget (label_size, label);
gtk_box_pack_start (GTK_BOX (control_hbox), label, FALSE, FALSE, 0);
@@ -512,7 +512,7 @@ fill_properties(GtkWidget *dialog, MultiloadApplet *ma)
}
label = gtk_label_new(_("milliseconds"));
- gtk_misc_set_alignment (GTK_MISC (label), 0.0f, 0.5f);
+ gtk_label_set_xalign (GTK_LABEL (label), 0.0);
gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
g_free(label_text);
@@ -526,7 +526,7 @@ fill_properties(GtkWidget *dialog, MultiloadApplet *ma)
label = gtk_label_new (title);
gtk_label_set_use_markup (GTK_LABEL (label), TRUE);
gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_LEFT);
- gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
+ gtk_label_set_xalign (GTK_LABEL (label), 0.0);
gtk_box_pack_start (GTK_BOX (category_vbox), label, FALSE, FALSE, 0);
gtk_widget_show (label);
g_free (title);
diff --git a/trashapplet/src/trashapplet.c b/trashapplet/src/trashapplet.c
index 9cc963c..a29f294 100644
--- a/trashapplet/src/trashapplet.c
+++ b/trashapplet/src/trashapplet.c
@@ -459,7 +459,8 @@ confirm_delete_immediately (GtkWidget *parent_view,
FALSE, FALSE, 0);
image = gtk_image_new_from_icon_name ("dialog-question", GTK_ICON_SIZE_DIALOG);
- gtk_misc_set_alignment (GTK_MISC (image), 0.5, 0.0);
+ gtk_widget_set_halign (image, GTK_ALIGN_CENTER);
+ gtk_widget_set_valign (image, GTK_ALIGN_START);
gtk_widget_show (image);
gtk_box_pack_start (GTK_BOX (hbox), image, FALSE, FALSE, 0);
@@ -484,7 +485,7 @@ confirm_delete_immediately (GtkWidget *parent_view,
gtk_label_set_use_markup (GTK_LABEL (label), TRUE);
gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_LEFT);
gtk_label_set_line_wrap (GTK_LABEL (label), TRUE);
- gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
+ gtk_label_set_xalign (GTK_LABEL (label), 0.0);
gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0);
gtk_widget_show (label);
g_free (str);
@@ -492,7 +493,7 @@ confirm_delete_immediately (GtkWidget *parent_view,
label = gtk_label_new (detail);
gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_LEFT);
gtk_label_set_line_wrap (GTK_LABEL (label), TRUE);
- gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
+ gtk_label_set_xalign (GTK_LABEL (label), 0.0);
gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0);
gtk_widget_show (label);
g_free (detail);
diff --git a/windowpicker/src/task-title.c b/windowpicker/src/task-title.c
index cebe5bb..242fc01 100644
--- a/windowpicker/src/task-title.c
+++ b/windowpicker/src/task-title.c
@@ -311,7 +311,7 @@ static gboolean on_draw (
static GtkWidget *getTitleLabel() {
GtkWidget *label = gtk_label_new (_("Home"));
gtk_label_set_ellipsize (GTK_LABEL (label), PANGO_ELLIPSIZE_END);
- gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
+ gtk_label_set_xalign (GTK_LABEL (label), 0.0);
PangoAttrList *attr_list = pango_attr_list_new ();
PangoAttribute *attr = pango_attr_weight_new (PANGO_WEIGHT_BOLD);
pango_attr_list_insert (attr_list, attr);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
