diff options
| author | Wolfgang Ulbrich <[email protected]> | 2016-01-27 18:14:37 +0100 |
|---|---|---|
| committer | Wolfgang Ulbrich <[email protected]> | 2016-01-27 18:14:37 +0100 |
| commit | 37e590249dd9d191a2331040fb879830c9ceea8e (patch) | |
| tree | 59fa7570d63841063eeb7682c201a5053f3d427b | |
| parent | acc20eb50af01fcb6ca2a024b65913cc32a1e670 (diff) | |
| download | mate-applets-37e590249dd9d191a2331040fb879830c9ceea8e.tar.bz2 mate-applets-37e590249dd9d191a2331040fb879830c9ceea8e.tar.xz | |
GTK3: fix previous GtkMisc deprecations fix commit
| -rw-r--r-- | charpick/properties.c | 8 | ||||
| -rw-r--r-- | command/command.c | 18 | ||||
| -rw-r--r-- | geyes/themes.c | 12 | ||||
| -rw-r--r-- | mateweather/mateweather-dialog.c | 156 | ||||
| -rw-r--r-- | mateweather/mateweather-pref.c | 36 | ||||
| -rw-r--r-- | multiload/properties.c | 34 | ||||
| -rw-r--r-- | netspeed/src/netspeed.c | 90 | ||||
| -rw-r--r-- | timerapplet/timerapplet.c | 24 | ||||
| -rw-r--r-- | trashapplet/src/trashapplet.c | 12 |
9 files changed, 191 insertions, 199 deletions
diff --git a/charpick/properties.c b/charpick/properties.c index 2252131d..ac41ebd9 100644 --- a/charpick/properties.c +++ b/charpick/properties.c @@ -420,8 +420,8 @@ create_hig_catagory (GtkWidget *main_box, gchar *title) tmp = g_strdup_printf ("<b>%s</b>", title); label = gtk_label_new (NULL); -#if GTK_CHECK_VERSION (3, 0, 0) - gtk_widget_set_halign (label, GTK_ALIGN_START); +#if GTK_CHECK_VERSION (3, 16, 0) + gtk_label_set_xalign (GTK_LABEL (label), 0.0); #else gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); #endif @@ -464,8 +464,8 @@ 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); -#if GTK_CHECK_VERSION (3, 0, 0) - gtk_widget_set_halign (label, GTK_ALIGN_START); +#if GTK_CHECK_VERSION (3, 16, 0) + gtk_label_set_xalign (GTK_LABEL (label), 0.0); #else gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); #endif diff --git a/command/command.c b/command/command.c index 14822cb6..f81ce49e 100644 --- a/command/command.c +++ b/command/command.c @@ -143,9 +143,9 @@ command_settings_callback (GtkAction *action, CommandApplet *command_applet) gtk_container_set_border_width (GTK_CONTAINER (dialog), 10); widget = gtk_label_new (_("Command:")); -#if GTK_CHECK_VERSION (3, 0, 0) - gtk_widget_set_halign (widget, GTK_ALIGN_END); - gtk_widget_set_valign (widget, GTK_ALIGN_CENTER); +#if GTK_CHECK_VERSION (3, 16, 0) + gtk_label_set_xalign (GTK_LABEL (widget), 1.0); + gtk_label_set_yalign (GTK_LABEL (widget), 0.5); #else gtk_misc_set_alignment (GTK_MISC (widget), 1.0, 0.5); #endif @@ -159,9 +159,9 @@ command_settings_callback (GtkAction *action, CommandApplet *command_applet) 0, 0); widget = gtk_label_new (_("Interval (seconds):")); -#if GTK_CHECK_VERSION (3, 0, 0) - gtk_widget_set_halign (widget, GTK_ALIGN_END); - gtk_widget_set_valign (widget, GTK_ALIGN_CENTER); +#if GTK_CHECK_VERSION (3, 16, 0) + gtk_label_set_xalign (GTK_LABEL (widget), 1.0); + gtk_label_set_yalign (GTK_LABEL (widget), 0.5); #else gtk_misc_set_alignment (GTK_MISC (widget), 1.0, 0.5); #endif @@ -175,9 +175,9 @@ command_settings_callback (GtkAction *action, CommandApplet *command_applet) 0, 0); widget = gtk_label_new (_("Maximum width (chars):")); -#if GTK_CHECK_VERSION (3, 0, 0) - gtk_widget_set_halign (widget, GTK_ALIGN_END); - gtk_widget_set_valign (widget, GTK_ALIGN_CENTER); +#if GTK_CHECK_VERSION (3, 16, 0) + gtk_label_set_xalign (GTK_LABEL (widget), 1.0); + gtk_label_set_yalign (GTK_LABEL (widget), 0.5); #else gtk_misc_set_alignment (GTK_MISC (widget), 1.0, 0.5); #endif diff --git a/geyes/themes.c b/geyes/themes.c index e562bf8a..58a82679 100644 --- a/geyes/themes.c +++ b/geyes/themes.c @@ -320,10 +320,10 @@ properties_cb (GtkAction *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); -#if GTK_CHECK_VERSION (3, 0, 0) - gtk_widget_set_halign (label, GTK_ALIGN_START); +#if GTK_CHECK_VERSION (3, 16, 0) + gtk_label_set_xalign (GTK_LABEL (label), 0.0); #else - gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5); + gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); #endif gtk_box_pack_start (GTK_BOX (category_vbox), label, FALSE, FALSE, 0); g_free (title); @@ -342,10 +342,10 @@ properties_cb (GtkAction *action, gtk_widget_show (control_vbox); label = gtk_label_new_with_mnemonic (_("_Select a theme:")); -#if GTK_CHECK_VERSION (3, 0, 0) - gtk_widget_set_halign (label, GTK_ALIGN_START); +#if GTK_CHECK_VERSION (3, 16, 0) + gtk_label_set_xalign (GTK_LABEL (label), 0.0); #else - gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5); + gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); #endif gtk_box_pack_start (GTK_BOX (control_vbox), label, FALSE, FALSE, 0); diff --git a/mateweather/mateweather-dialog.c b/mateweather/mateweather-dialog.c index 510de399..9e8344b8 100644 --- a/mateweather/mateweather-dialog.c +++ b/mateweather/mateweather-dialog.c @@ -234,10 +234,10 @@ static void mateweather_dialog_create(MateWeatherDialog* dialog) (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 0); gtk_label_set_justify (GTK_LABEL (cond_location_lbl), GTK_JUSTIFY_LEFT); -#if GTK_CHECK_VERSION (3, 0, 0) - gtk_widget_set_halign (cond_location_lbl, GTK_ALIGN_START); +#if GTK_CHECK_VERSION (3, 16, 0) + gtk_label_set_xalign (GTK_LABEL (cond_location_lbl), 0.0); #else - gtk_misc_set_alignment (GTK_MISC (cond_location_lbl), 0, 0.5); + gtk_misc_set_alignment (GTK_MISC (cond_location_lbl), 0.0, 0.5); #endif cond_update_lbl = gtk_label_new (_("Last update:")); @@ -246,10 +246,10 @@ static void mateweather_dialog_create(MateWeatherDialog* dialog) (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 0); gtk_label_set_justify (GTK_LABEL (cond_update_lbl), GTK_JUSTIFY_LEFT); -#if GTK_CHECK_VERSION (3, 0, 0) - gtk_widget_set_halign (cond_update_lbl, GTK_ALIGN_START); +#if GTK_CHECK_VERSION (3, 16, 0) + gtk_label_set_xalign (GTK_LABEL (cond_update_lbl), 0.0); #else - gtk_misc_set_alignment (GTK_MISC (cond_update_lbl), 0, 0.5); + gtk_misc_set_alignment (GTK_MISC (cond_update_lbl), 0.0, 0.5); #endif cond_cond_lbl = gtk_label_new (_("Conditions:")); @@ -258,10 +258,10 @@ static void mateweather_dialog_create(MateWeatherDialog* dialog) (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 0); gtk_label_set_justify (GTK_LABEL (cond_cond_lbl), GTK_JUSTIFY_LEFT); -#if GTK_CHECK_VERSION (3, 0, 0) - gtk_widget_set_halign (cond_cond_lbl, GTK_ALIGN_START); +#if GTK_CHECK_VERSION (3, 16, 0) + gtk_label_set_xalign (GTK_LABEL (cond_cond_lbl), 0.0); #else - gtk_misc_set_alignment (GTK_MISC (cond_cond_lbl), 0, 0.5); + gtk_misc_set_alignment (GTK_MISC (cond_cond_lbl), 0.0, 0.5); #endif cond_sky_lbl = gtk_label_new (_("Sky:")); @@ -270,10 +270,10 @@ static void mateweather_dialog_create(MateWeatherDialog* dialog) (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 0); gtk_label_set_justify (GTK_LABEL (cond_sky_lbl), GTK_JUSTIFY_LEFT); -#if GTK_CHECK_VERSION (3, 0, 0) - gtk_widget_set_halign (cond_sky_lbl, GTK_ALIGN_START); +#if GTK_CHECK_VERSION (3, 16, 0) + gtk_label_set_xalign (GTK_LABEL (cond_sky_lbl), 0.0); #else - gtk_misc_set_alignment (GTK_MISC (cond_sky_lbl), 0, 0.5); + gtk_misc_set_alignment (GTK_MISC (cond_sky_lbl), 0.0, 0.5); #endif cond_temp_lbl = gtk_label_new (_("Temperature:")); @@ -282,10 +282,10 @@ static void mateweather_dialog_create(MateWeatherDialog* dialog) (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 0); gtk_label_set_justify (GTK_LABEL (cond_temp_lbl), GTK_JUSTIFY_LEFT); -#if GTK_CHECK_VERSION (3, 0, 0) - gtk_widget_set_halign (cond_temp_lbl, GTK_ALIGN_START); +#if GTK_CHECK_VERSION (3, 16, 0) + gtk_label_set_xalign (GTK_LABEL (cond_temp_lbl), 0.0); #else - gtk_misc_set_alignment (GTK_MISC (cond_temp_lbl), 0, 0.5); + gtk_misc_set_alignment (GTK_MISC (cond_temp_lbl), 0.0, 0.5); #endif cond_apparent_lbl = gtk_label_new (_("Feels like:")); @@ -294,10 +294,10 @@ static void mateweather_dialog_create(MateWeatherDialog* dialog) (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 0); gtk_label_set_justify (GTK_LABEL (cond_apparent_lbl), GTK_JUSTIFY_LEFT); -#if GTK_CHECK_VERSION (3, 0, 0) - gtk_widget_set_halign (cond_apparent_lbl, GTK_ALIGN_START); +#if GTK_CHECK_VERSION (3, 16, 0) + gtk_label_set_xalign (GTK_LABEL (cond_apparent_lbl), 0.0); #else - gtk_misc_set_alignment (GTK_MISC (cond_apparent_lbl), 0, 0.5); + gtk_misc_set_alignment (GTK_MISC (cond_apparent_lbl), 0.0, 0.5); #endif cond_dew_lbl = gtk_label_new (_("Dew point:")); @@ -306,10 +306,10 @@ static void mateweather_dialog_create(MateWeatherDialog* dialog) (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 0); gtk_label_set_justify (GTK_LABEL (cond_dew_lbl), GTK_JUSTIFY_LEFT); -#if GTK_CHECK_VERSION (3, 0, 0) - gtk_widget_set_halign (cond_dew_lbl, GTK_ALIGN_START); +#if GTK_CHECK_VERSION (3, 16, 0) + gtk_label_set_xalign (GTK_LABEL (cond_dew_lbl), 0.0); #else - gtk_misc_set_alignment (GTK_MISC (cond_dew_lbl), 0, 0.5); + gtk_misc_set_alignment (GTK_MISC (cond_dew_lbl), 0.0, 0.5); #endif cond_humidity_lbl = gtk_label_new (_("Relative humidity:")); @@ -318,10 +318,10 @@ static void mateweather_dialog_create(MateWeatherDialog* dialog) (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 0); gtk_label_set_justify (GTK_LABEL (cond_humidity_lbl), GTK_JUSTIFY_LEFT); -#if GTK_CHECK_VERSION (3, 0, 0) - gtk_widget_set_halign (cond_humidity_lbl, GTK_ALIGN_START); +#if GTK_CHECK_VERSION (3, 16, 0) + gtk_label_set_xalign (GTK_LABEL (cond_humidity_lbl), 0.0); #else - gtk_misc_set_alignment (GTK_MISC (cond_humidity_lbl), 0, 0.5); + gtk_misc_set_alignment (GTK_MISC (cond_humidity_lbl), 0.0, 0.5); #endif cond_wind_lbl = gtk_label_new (_("Wind:")); @@ -330,10 +330,10 @@ static void mateweather_dialog_create(MateWeatherDialog* dialog) (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 0); gtk_label_set_justify (GTK_LABEL (cond_wind_lbl), GTK_JUSTIFY_LEFT); -#if GTK_CHECK_VERSION (3, 0, 0) - gtk_widget_set_halign (cond_wind_lbl, GTK_ALIGN_START); +#if GTK_CHECK_VERSION (3, 16, 0) + gtk_label_set_xalign (GTK_LABEL (cond_wind_lbl), 0.0); #else - gtk_misc_set_alignment (GTK_MISC (cond_wind_lbl), 0, 0.5); + gtk_misc_set_alignment (GTK_MISC (cond_wind_lbl), 0.0, 0.5); #endif cond_pressure_lbl = gtk_label_new (_("Pressure:")); @@ -342,10 +342,10 @@ static void mateweather_dialog_create(MateWeatherDialog* dialog) (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 0); gtk_label_set_justify (GTK_LABEL (cond_pressure_lbl), GTK_JUSTIFY_LEFT); -#if GTK_CHECK_VERSION (3, 0, 0) - gtk_widget_set_halign (cond_pressure_lbl, GTK_ALIGN_START); +#if GTK_CHECK_VERSION (3, 16, 0) + gtk_label_set_xalign (GTK_LABEL (cond_pressure_lbl), 0.0); #else - gtk_misc_set_alignment (GTK_MISC (cond_pressure_lbl), 0, 0.5); + gtk_misc_set_alignment (GTK_MISC (cond_pressure_lbl), 0.0, 0.5); #endif cond_vis_lbl = gtk_label_new (_("Visibility:")); @@ -354,10 +354,10 @@ static void mateweather_dialog_create(MateWeatherDialog* dialog) (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 0); gtk_label_set_justify (GTK_LABEL (cond_vis_lbl), GTK_JUSTIFY_LEFT); -#if GTK_CHECK_VERSION (3, 0, 0) - gtk_widget_set_halign (cond_vis_lbl, GTK_ALIGN_START); +#if GTK_CHECK_VERSION (3, 16, 0) + gtk_label_set_xalign (GTK_LABEL (cond_vis_lbl), 0.0); #else - gtk_misc_set_alignment (GTK_MISC (cond_vis_lbl), 0, 0.5); + gtk_misc_set_alignment (GTK_MISC (cond_vis_lbl), 0.0, 0.5); #endif cond_sunrise_lbl = gtk_label_new (_("Sunrise:")); @@ -366,10 +366,10 @@ static void mateweather_dialog_create(MateWeatherDialog* dialog) (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 0); gtk_label_set_justify (GTK_LABEL (cond_sunrise_lbl), GTK_JUSTIFY_LEFT); -#if GTK_CHECK_VERSION (3, 0, 0) - gtk_widget_set_halign (cond_sunrise_lbl, GTK_ALIGN_START); +#if GTK_CHECK_VERSION (3, 16, 0) + gtk_label_set_xalign (GTK_LABEL (cond_sunrise_lbl), 0.0); #else - gtk_misc_set_alignment (GTK_MISC (cond_sunrise_lbl), 0, 0.5); + gtk_misc_set_alignment (GTK_MISC (cond_sunrise_lbl), 0.0, 0.5); #endif cond_sunset_lbl = gtk_label_new (_("Sunset:")); @@ -378,10 +378,10 @@ static void mateweather_dialog_create(MateWeatherDialog* dialog) (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 0); gtk_label_set_justify (GTK_LABEL (cond_sunset_lbl), GTK_JUSTIFY_LEFT); -#if GTK_CHECK_VERSION (3, 0, 0) - gtk_widget_set_halign (cond_sunset_lbl, GTK_ALIGN_START); +#if GTK_CHECK_VERSION (3, 16, 0) + gtk_label_set_xalign (GTK_LABEL (cond_sunset_lbl), 0.0); #else - gtk_misc_set_alignment (GTK_MISC (cond_sunset_lbl), 0, 0.5); + gtk_misc_set_alignment (GTK_MISC (cond_sunset_lbl), 0.0, 0.5); #endif priv->cond_location = gtk_label_new (""); @@ -391,10 +391,10 @@ static void mateweather_dialog_create(MateWeatherDialog* 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); -#if GTK_CHECK_VERSION (3, 0, 0) - gtk_widget_set_halign (priv->cond_location, GTK_ALIGN_START); +#if GTK_CHECK_VERSION (3, 16, 0) + gtk_label_set_xalign (GTK_LABEL (priv->cond_location), 0.0); #else - gtk_misc_set_alignment (GTK_MISC (priv->cond_location), 0, 0.5); + gtk_misc_set_alignment (GTK_MISC (priv->cond_location), 0.0, 0.5); #endif priv->cond_update = gtk_label_new (""); @@ -404,10 +404,10 @@ static void mateweather_dialog_create(MateWeatherDialog* 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); -#if GTK_CHECK_VERSION (3, 0, 0) - gtk_widget_set_halign (priv->cond_update, GTK_ALIGN_START); +#if GTK_CHECK_VERSION (3, 16, 0) + gtk_label_set_xalign (GTK_LABEL (priv->cond_update), 0.0); #else - gtk_misc_set_alignment (GTK_MISC (priv->cond_update), 0, 0.5); + gtk_misc_set_alignment (GTK_MISC (priv->cond_update), 0.0, 0.5); #endif priv->cond_cond = gtk_label_new (""); @@ -417,10 +417,10 @@ static void mateweather_dialog_create(MateWeatherDialog* 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); -#if GTK_CHECK_VERSION (3, 0, 0) - gtk_widget_set_halign (priv->cond_cond, GTK_ALIGN_START); +#if GTK_CHECK_VERSION (3, 16, 0) + gtk_label_set_xalign (GTK_LABEL (priv->cond_cond), 0.0); #else - gtk_misc_set_alignment (GTK_MISC (priv->cond_cond), 0, 0.5); + gtk_misc_set_alignment (GTK_MISC (priv->cond_cond), 0.0, 0.5); #endif priv->cond_sky = gtk_label_new (""); @@ -430,10 +430,10 @@ static void mateweather_dialog_create(MateWeatherDialog* 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); -#if GTK_CHECK_VERSION (3, 0, 0) - gtk_widget_set_halign (priv->cond_sky, GTK_ALIGN_START); +#if GTK_CHECK_VERSION (3, 16, 0) + gtk_label_set_xalign (GTK_LABEL (priv->cond_sky), 0.0); #else - gtk_misc_set_alignment (GTK_MISC (priv->cond_sky), 0, 0.5); + gtk_misc_set_alignment (GTK_MISC (priv->cond_sky), 0.0, 0.5); #endif priv->cond_temp = gtk_label_new (""); @@ -443,10 +443,10 @@ static void mateweather_dialog_create(MateWeatherDialog* 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); -#if GTK_CHECK_VERSION (3, 0, 0) - gtk_widget_set_halign (priv->cond_temp, GTK_ALIGN_START); +#if GTK_CHECK_VERSION (3, 16, 0) + gtk_label_set_xalign (GTK_LABEL (priv->cond_temp), 0.0); #else - gtk_misc_set_alignment (GTK_MISC (priv->cond_temp), 0, 0.5); + gtk_misc_set_alignment (GTK_MISC (priv->cond_temp), 0.0, 0.5); #endif priv->cond_apparent = gtk_label_new (""); @@ -456,10 +456,10 @@ static void mateweather_dialog_create(MateWeatherDialog* 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); -#if GTK_CHECK_VERSION (3, 0, 0) - gtk_widget_set_halign (priv->cond_apparent, GTK_ALIGN_START); +#if GTK_CHECK_VERSION (3, 16, 0) + gtk_label_set_xalign (GTK_LABEL (priv->cond_apparent), 0.0); #else - gtk_misc_set_alignment (GTK_MISC (priv->cond_apparent), 0, 0.5); + gtk_misc_set_alignment (GTK_MISC (priv->cond_apparent), 0.0, 0.5); #endif priv->cond_dew = gtk_label_new (""); @@ -469,10 +469,10 @@ static void mateweather_dialog_create(MateWeatherDialog* 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); -#if GTK_CHECK_VERSION (3, 0, 0) - gtk_widget_set_halign (priv->cond_dew, GTK_ALIGN_START); +#if GTK_CHECK_VERSION (3, 16, 0) + gtk_label_set_xalign (GTK_LABEL (priv->cond_dew), 0.0); #else - gtk_misc_set_alignment (GTK_MISC (priv->cond_dew), 0, 0.5); + gtk_misc_set_alignment (GTK_MISC (priv->cond_dew), 0.0, 0.5); #endif priv->cond_humidity = gtk_label_new (""); @@ -482,10 +482,10 @@ static void mateweather_dialog_create(MateWeatherDialog* 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); -#if GTK_CHECK_VERSION (3, 0, 0) - gtk_widget_set_halign (priv->cond_humidity, GTK_ALIGN_START); +#if GTK_CHECK_VERSION (3, 16, 0) + gtk_label_set_xalign (GTK_LABEL (priv->cond_humidity), 0.0); #else - gtk_misc_set_alignment (GTK_MISC (priv->cond_humidity), 0, 0.5); + gtk_misc_set_alignment (GTK_MISC (priv->cond_humidity), 0.0, 0.5); #endif priv->cond_wind = gtk_label_new (""); @@ -495,10 +495,10 @@ static void mateweather_dialog_create(MateWeatherDialog* 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); -#if GTK_CHECK_VERSION (3, 0, 0) - gtk_widget_set_halign (priv->cond_wind, GTK_ALIGN_START); +#if GTK_CHECK_VERSION (3, 16, 0) + gtk_label_set_xalign (GTK_LABEL (priv->cond_wind), 0.0); #else - gtk_misc_set_alignment (GTK_MISC (priv->cond_wind), 0, 0.5); + gtk_misc_set_alignment (GTK_MISC (priv->cond_wind), 0.0, 0.5); #endif priv->cond_pressure = gtk_label_new (""); @@ -508,10 +508,10 @@ static void mateweather_dialog_create(MateWeatherDialog* 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); -#if GTK_CHECK_VERSION (3, 0, 0) - gtk_widget_set_halign (priv->cond_pressure, GTK_ALIGN_START); +#if GTK_CHECK_VERSION (3, 16, 0) + gtk_label_set_xalign (GTK_LABEL (priv->cond_pressure), 0.0); #else - gtk_misc_set_alignment (GTK_MISC (priv->cond_pressure), 0, 0.5); + gtk_misc_set_alignment (GTK_MISC (priv->cond_pressure), 0.0, 0.5); #endif priv->cond_vis = gtk_label_new (""); @@ -521,10 +521,10 @@ static void mateweather_dialog_create(MateWeatherDialog* 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); -#if GTK_CHECK_VERSION (3, 0, 0) - gtk_widget_set_halign (priv->cond_vis, GTK_ALIGN_START); +#if GTK_CHECK_VERSION (3, 16, 0) + gtk_label_set_xalign (GTK_LABEL (priv->cond_vis), 0.0); #else - gtk_misc_set_alignment (GTK_MISC (priv->cond_vis), 0, 0.5); + gtk_misc_set_alignment (GTK_MISC (priv->cond_vis), 0.0, 0.5); #endif priv->cond_sunrise = gtk_label_new (""); @@ -534,10 +534,10 @@ static void mateweather_dialog_create(MateWeatherDialog* 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); -#if GTK_CHECK_VERSION (3, 0, 0) - gtk_widget_set_halign (priv->cond_sunrise, GTK_ALIGN_START); +#if GTK_CHECK_VERSION (3, 16, 0) + gtk_label_set_xalign (GTK_LABEL (priv->cond_sunrise), 0.0); #else - gtk_misc_set_alignment (GTK_MISC (priv->cond_sunrise), 0, 0.5); + gtk_misc_set_alignment (GTK_MISC (priv->cond_sunrise), 0.0, 0.5); #endif priv->cond_sunset = gtk_label_new (""); @@ -547,10 +547,10 @@ static void mateweather_dialog_create(MateWeatherDialog* 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); -#if GTK_CHECK_VERSION (3, 0, 0) - gtk_widget_set_halign (priv->cond_sunset, GTK_ALIGN_START); +#if GTK_CHECK_VERSION (3, 16, 0) + gtk_label_set_xalign (GTK_LABEL (priv->cond_sunset), 0.0); #else - gtk_misc_set_alignment (GTK_MISC (priv->cond_sunset), 0, 0.5); + gtk_misc_set_alignment (GTK_MISC (priv->cond_sunset), 0.0, 0.5); #endif cond_frame_alignment = gtk_alignment_new (0.5, 0, 1, 0); diff --git a/mateweather/mateweather-pref.c b/mateweather/mateweather-pref.c index 6d64a59d..79448acd 100644 --- a/mateweather/mateweather-pref.c +++ b/mateweather/mateweather-pref.c @@ -575,8 +575,8 @@ static GtkWidget* create_hig_catagory(GtkWidget* main_box, gchar* title) tmp = g_strdup_printf ("<b>%s</b>", title); label = gtk_label_new (NULL); -#if GTK_CHECK_VERSION (3, 0, 0) - gtk_widget_set_halign (label, GTK_ALIGN_START); +#if GTK_CHECK_VERSION (3, 16, 0) + gtk_label_set_xalign (GTK_LABEL (label), 0.0); #else gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); #endif @@ -871,10 +871,10 @@ static void mateweather_pref_create(MateWeatherPref* 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); -#if GTK_CHECK_VERSION (3, 0, 0) - gtk_widget_set_halign (temp_label, GTK_ALIGN_START); +#if GTK_CHECK_VERSION (3, 16, 0) + gtk_label_set_xalign (GTK_LABEL (label), 0.0); #else - gtk_misc_set_alignment (GTK_MISC (temp_label), 0, 0.5); + gtk_misc_set_alignment (GTK_MISC (temp_label), 0.0, 0.5); #endif gtk_widget_show (temp_label); @@ -897,10 +897,10 @@ static void mateweather_pref_create(MateWeatherPref* 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); -#if GTK_CHECK_VERSION (3, 0, 0) - gtk_widget_set_halign (speed_label, GTK_ALIGN_START); +#if GTK_CHECK_VERSION (3, 16, 0) + gtk_label_set_xalign (GTK_LABEL (label), 0.0); #else - gtk_misc_set_alignment (GTK_MISC (speed_label), 0, 0.5); + gtk_misc_set_alignment (GTK_MISC (speed_label), 0.0, 0.5); #endif gtk_widget_show (speed_label); @@ -928,10 +928,10 @@ static void mateweather_pref_create(MateWeatherPref* 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); -#if GTK_CHECK_VERSION (3, 0, 0) - gtk_widget_set_halign (pres_label, GTK_ALIGN_START); +#if GTK_CHECK_VERSION (3, 16, 0) + gtk_label_set_xalign (GTK_LABEL (label), 0.0); #else - gtk_misc_set_alignment (GTK_MISC (pres_label), 0, 0.5); + gtk_misc_set_alignment (GTK_MISC (pres_label), 0.0, 0.5); #endif gtk_widget_show (pres_label); @@ -962,8 +962,8 @@ static void mateweather_pref_create(MateWeatherPref* 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); -#if GTK_CHECK_VERSION (3, 0, 0) - gtk_widget_set_halign (dist_label, GTK_ALIGN_START); +#if GTK_CHECK_VERSION (3, 16, 0) + gtk_label_set_xalign (GTK_LABEL (label), 0.0); #else gtk_misc_set_alignment (GTK_MISC (dist_label), 0, 0.5); #endif @@ -1070,12 +1070,6 @@ static void mateweather_pref_create(MateWeatherPref* pref) pref_basic_update_lbl = gtk_label_new_with_mnemonic (_("_Automatically update every:")); gtk_widget_show (pref_basic_update_lbl); - -/* - 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_widget_show (pref_basic_update_hbox); pref_basic_update_spin_adj = gtk_adjustment_new (30, 1, 3600, 5, 25, 1); @@ -1135,8 +1129,8 @@ static void mateweather_pref_create(MateWeatherPref* pref) gtk_container_add (GTK_CONTAINER (pref_notebook), pref_loc_hbox); tree_label = gtk_label_new_with_mnemonic (_("_Select a location:")); -#if GTK_CHECK_VERSION (3, 0, 0) - gtk_widget_set_halign (tree_label, GTK_ALIGN_START); +#if GTK_CHECK_VERSION (3, 16, 0) + gtk_label_set_xalign (GTK_LABEL (tree_label), 0.0); #else gtk_misc_set_alignment (GTK_MISC (tree_label), 0.0, 0.5); #endif diff --git a/multiload/properties.c b/multiload/properties.c index 791b7b2c..31cd28b0 100644 --- a/multiload/properties.c +++ b/multiload/properties.c @@ -339,10 +339,10 @@ 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); -#if GTK_CHECK_VERSION (3, 0, 0) - gtk_widget_set_halign (label, GTK_ALIGN_START); +#if GTK_CHECK_VERSION (3, 16, 0) + gtk_label_set_xalign (GTK_LABEL (label), 0.0); #else - gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5); + gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); #endif gtk_box_pack_start (GTK_BOX (category_vbox), label, FALSE, FALSE, 0); g_free (title); @@ -448,10 +448,10 @@ 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); -#if GTK_CHECK_VERSION (3, 0, 0) - gtk_widget_set_halign (label, GTK_ALIGN_START); +#if GTK_CHECK_VERSION (3, 16, 0) + gtk_label_set_xalign (GTK_LABEL (label), 0.0); #else - gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5); + gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); #endif gtk_box_pack_start (GTK_BOX (category_vbox), label, FALSE, FALSE, 0); gtk_widget_show (label); @@ -483,8 +483,8 @@ fill_properties(GtkWidget *dialog, MultiloadApplet *ma) label_text = g_strdup(_("System m_onitor height: ")); label = gtk_label_new_with_mnemonic(label_text); -#if GTK_CHECK_VERSION (3, 0, 0) - gtk_widget_set_halign (label, GTK_ALIGN_START); +#if GTK_CHECK_VERSION (3, 16, 0) + gtk_label_set_xalign (GTK_LABEL (label), 0.0f); #else gtk_misc_set_alignment (GTK_MISC (label), 0.0f, 0.5f); #endif @@ -516,8 +516,8 @@ fill_properties(GtkWidget *dialog, MultiloadApplet *ma) gtk_box_pack_start (GTK_BOX (hbox), spin_button, FALSE, FALSE, 0); label = gtk_label_new (_("pixels")); -#if GTK_CHECK_VERSION (3, 0, 0) - gtk_widget_set_halign (label, GTK_ALIGN_START); +#if GTK_CHECK_VERSION (3, 16, 0) + gtk_label_set_xalign (GTK_LABEL (label), 0.0f); #else gtk_misc_set_alignment (GTK_MISC (label), 0.0f, 0.5f); #endif @@ -528,8 +528,8 @@ fill_properties(GtkWidget *dialog, MultiloadApplet *ma) gtk_widget_show (control_hbox); label = gtk_label_new_with_mnemonic(_("Sys_tem monitor update interval: ")); -#if GTK_CHECK_VERSION (3, 0, 0) - gtk_widget_set_halign (label, GTK_ALIGN_START); +#if GTK_CHECK_VERSION (3, 16, 0) + gtk_label_set_xalign (GTK_LABEL (label), 0.0f); #else gtk_misc_set_alignment (GTK_MISC (label), 0.0f, 0.5f); #endif @@ -558,8 +558,8 @@ fill_properties(GtkWidget *dialog, MultiloadApplet *ma) } label = gtk_label_new(_("milliseconds")); -#if GTK_CHECK_VERSION (3, 0, 0) - gtk_widget_set_halign (label, GTK_ALIGN_START); +#if GTK_CHECK_VERSION (3, 16, 0) + gtk_label_set_xalign (GTK_LABEL (label), 0.0f); #else gtk_misc_set_alignment (GTK_MISC (label), 0.0f, 0.5f); #endif @@ -576,10 +576,10 @@ 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); -#if GTK_CHECK_VERSION (3, 0, 0) - gtk_widget_set_halign (label, GTK_ALIGN_START); +#if GTK_CHECK_VERSION (3, 16, 0) + gtk_label_set_xalign (GTK_LABEL (label), 0.0); #else - gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5); + gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); #endif gtk_box_pack_start (GTK_BOX (category_vbox), label, FALSE, FALSE, 0); gtk_widget_show (label); diff --git a/netspeed/src/netspeed.c b/netspeed/src/netspeed.c index 98d486d6..abf6451b 100644 --- a/netspeed/src/netspeed.c +++ b/netspeed/src/netspeed.c @@ -993,11 +993,11 @@ settings_cb(GtkAction *action, gpointer data) category_header_label = gtk_label_new(header_str); gtk_label_set_use_markup(GTK_LABEL(category_header_label), TRUE); gtk_label_set_justify(GTK_LABEL(category_header_label), GTK_JUSTIFY_LEFT); -#if GTK_CHECK_VERSION (3, 0, 0) - gtk_widget_set_halign (category_header_label, GTK_ALIGN_START); - gtk_widget_set_valign (category_header_label, GTK_ALIGN_CENTER); +#if GTK_CHECK_VERSION (3, 16, 0) + gtk_label_set_xalign (GTK_LABEL (category_header_label), 0.0); + gtk_label_set_yalign (GTK_LABEL (category_header_label), 0.5); #else - gtk_misc_set_alignment(GTK_MISC (category_header_label), 0, 0.5); + gtk_misc_set_alignment(GTK_MISC (category_header_label), 0.0, 0.5); #endif gtk_box_pack_start(GTK_BOX (category_vbox), category_header_label, FALSE, FALSE, 0); g_free(header_str); @@ -1017,9 +1017,9 @@ settings_cb(GtkAction *action, gpointer data) network_device_label = gtk_label_new_with_mnemonic(_("Network _device:")); gtk_label_set_justify(GTK_LABEL(network_device_label), GTK_JUSTIFY_LEFT); -#if GTK_CHECK_VERSION (3, 0, 0) - gtk_widget_set_halign (network_device_label, GTK_ALIGN_START); - gtk_widget_set_valign (network_device_label, GTK_ALIGN_CENTER); +#if GTK_CHECK_VERSION (3, 16, 0) + gtk_label_set_xalign (GTK_LABEL (network_device_label), 0.0f); + gtk_label_set_yalign (GTK_LABEL (network_device_label), 0.5f); #else gtk_misc_set_alignment(GTK_MISC(network_device_label), 0.0f, 0.5f); #endif @@ -1256,33 +1256,31 @@ showinfo_cb(GtkAction *action, gpointer data) gtk_label_set_selectable(GTK_LABEL(hwaddr_text), TRUE); gtk_label_set_selectable(GTK_LABEL(ptpip_text), TRUE); -#if GTK_CHECK_VERSION (3, 0, 0) - gtk_widget_set_halign (ip_label, GTK_ALIGN_START); - gtk_widget_set_valign (ip_label, GTK_ALIGN_CENTER); - gtk_widget_set_halign (ip_text, GTK_ALIGN_START); - gtk_widget_set_valign (ip_text, GTK_ALIGN_CENTER); - gtk_widget_set_halign (netmask_label, GTK_ALIGN_START); - gtk_widget_set_valign (netmask_label, GTK_ALIGN_CENTER); - gtk_widget_set_halign (netmask_text, GTK_ALIGN_START); - gtk_widget_set_valign (netmask_text, GTK_ALIGN_CENTER); - gtk_widget_set_halign (hwaddr_label, GTK_ALIGN_START); - gtk_widget_set_valign (hwaddr_label, GTK_ALIGN_CENTER); - gtk_widget_set_halign (hwaddr_text, GTK_ALIGN_START); - gtk_widget_set_valign (hwaddr_text, GTK_ALIGN_CENTER); - gtk_widget_set_halign (ptpip_label, GTK_ALIGN_START); - gtk_widget_set_valign (ptpip_label, GTK_ALIGN_CENTER); - gtk_widget_set_halign (ptpip_text, GTK_ALIGN_START); - gtk_widget_set_valign (ptpip_text, GTK_ALIGN_CENTER); - gtk_widget_set_halign (inbytes_label, GTK_ALIGN_START); - gtk_widget_set_valign (inbytes_label, GTK_ALIGN_CENTER); - gtk_widget_set_halign (applet->inbytes_text, GTK_ALIGN_START); - gtk_widget_set_valign (applet->inbytes_text, GTK_ALIGN_CENTER); - gtk_widget_set_halign (inbytes_label, GTK_ALIGN_START); - gtk_widget_set_valign (inbytes_label, GTK_ALIGN_CENTER); - gtk_widget_set_halign (applet->outbytes_text, GTK_ALIGN_START); - gtk_widget_set_valign (applet->outbytes_text, GTK_ALIGN_CENTER); - gtk_widget_set_halign (outbytes_label, GTK_ALIGN_START); - gtk_widget_set_valign (outbytes_label, GTK_ALIGN_CENTER); +#if GTK_CHECK_VERSION (3, 16, 0) + gtk_label_set_xalign (GTK_LABEL (ip_label), 0.0f); + gtk_label_set_yalign (GTK_LABEL (ip_label), 0.5f); + gtk_label_set_xalign (GTK_LABEL (ip_text), 0.0f); + gtk_label_set_yalign (GTK_LABEL (ip_text), 0.5f); + gtk_label_set_xalign (GTK_LABEL (netmask_label), 0.0f); + gtk_label_set_yalign (GTK_LABEL (netmask_label), 0.5f); + gtk_label_set_xalign (GTK_LABEL (netmask_text), 0.0f); + gtk_label_set_yalign (GTK_LABEL (netmask_text), 0.5f); + gtk_label_set_xalign (GTK_LABEL (hwaddr_label), 0.0f); + gtk_label_set_yalign (GTK_LABEL (hwaddr_label), 0.5f); + gtk_label_set_xalign (GTK_LABEL (hwaddr_text), 0.0f); + gtk_label_set_yalign (GTK_LABEL (hwaddr_text), 0.5f); + gtk_label_set_xalign (GTK_LABEL (ptpip_label), 0.0f); + gtk_label_set_yalign (GTK_LABEL (ptpip_label), 0.5f); + gtk_label_set_xalign (GTK_LABEL (ptpip_text), 0.0f); + gtk_label_set_yalign (GTK_LABEL (ptpip_text), 0.5f); + gtk_label_set_xalign (GTK_LABEL (inbytes_label), 0.0f); + gtk_label_set_yalign (GTK_LABEL (inbytes_label), 0.5f); + gtk_label_set_xalign (GTK_LABEL (applet->inbytes_text), 0.0f); + gtk_label_set_yalign (GTK_LABEL (applet->inbytes_text), 0.5f); + gtk_label_set_xalign (GTK_LABEL (outbytes_label), 0.0f); + gtk_label_set_yalign (GTK_LABEL (outbytes_label), 0.5f); + gtk_label_set_xalign (GTK_LABEL (applet->outbytes_text), 0.0f); + gtk_label_set_yalign (GTK_LABEL (applet->outbytes_text), 0.5f); #else gtk_misc_set_alignment(GTK_MISC(ip_label), 0.0f, 0.5f); gtk_misc_set_alignment(GTK_MISC(ip_text), 0.0f, 0.5f); @@ -1320,11 +1318,11 @@ showinfo_cb(GtkAction *action, gpointer data) gtk_label_set_selectable (GTK_LABEL (ipv6_text), TRUE); -#if GTK_CHECK_VERSION (3, 0, 0) - gtk_widget_set_halign (ipv6_label, GTK_ALIGN_START); - gtk_widget_set_valign (ipv6_label, GTK_ALIGN_CENTER); - gtk_widget_set_halign (ipv6_text, GTK_ALIGN_START); - gtk_widget_set_valign (ipv6_text, GTK_ALIGN_CENTER); +#if GTK_CHECK_VERSION (3, 16, 0) + gtk_label_set_xalign (GTK_LABEL (ipv6_label), 0.0f); + gtk_label_set_yalign (GTK_LABEL (ipv6_label), 0.5f); + gtk_label_set_xalign (GTK_LABEL (ipv6_text), 0.0f); + gtk_label_set_yalign (GTK_LABEL (ipv6_text), 0.5f); #else gtk_misc_set_alignment (GTK_MISC (ipv6_label), 0.0f, 0.5f); gtk_misc_set_alignment (GTK_MISC (ipv6_text), 0.0f, 0.5f); @@ -1358,13 +1356,13 @@ showinfo_cb(GtkAction *action, gpointer data) essid_label = gtk_label_new (_("ESSID:")); essid_text = gtk_label_new (applet->devinfo.essid); -#if GTK_CHECK_VERSION (3, 0, 0) - gtk_widget_set_halign (signal_label, GTK_ALIGN_START); - gtk_widget_set_valign (signal_label, GTK_ALIGN_CENTER); - gtk_widget_set_halign (essid_label, GTK_ALIGN_START); - gtk_widget_set_valign (essid_label, GTK_ALIGN_CENTER); - gtk_widget_set_halign (essid_text, GTK_ALIGN_START); - gtk_widget_set_valign (essid_text, GTK_ALIGN_CENTER); +#if GTK_CHECK_VERSION (3, 16, 0) + gtk_label_set_xalign (GTK_LABEL (signal_label), 0.0f); + gtk_label_set_yalign (GTK_LABEL (signal_label), 0.5f); + gtk_label_set_xalign (GTK_LABEL (essid_label), 0.0f); + gtk_label_set_yalign (GTK_LABEL (essid_label), 0.5f);; + gtk_label_set_xalign (GTK_LABEL (essid_text), 0.0f); + gtk_label_set_yalign (GTK_LABEL (essid_text), 0.5f); #else gtk_misc_set_alignment (GTK_MISC (signal_label), 0.0f, 0.5f); gtk_misc_set_alignment (GTK_MISC (essid_label), 0.0f, 0.5f); diff --git a/timerapplet/timerapplet.c b/timerapplet/timerapplet.c index 381219a1..263aa8ba 100644 --- a/timerapplet/timerapplet.c +++ b/timerapplet/timerapplet.c @@ -303,9 +303,9 @@ timer_preferences_callback (GtkAction *action, TimerApplet *applet) gtk_container_set_border_width (GTK_CONTAINER (dialog), 10); widget = gtk_label_new (_("Name:")); -#if GTK_CHECK_VERSION (3, 0, 0) - gtk_widget_set_halign (widget, GTK_ALIGN_END); - gtk_widget_set_valign (widget, GTK_ALIGN_CENTER); +#if GTK_CHECK_VERSION (3, 16, 0) + gtk_label_set_xalign (GTK_LABEL (widget), 1.0); + gtk_label_set_yalign (GTK_LABEL (widget), 0.5); #else gtk_misc_set_alignment (GTK_MISC (widget), 1.0, 0.5); #endif @@ -320,9 +320,9 @@ timer_preferences_callback (GtkAction *action, TimerApplet *applet) g_settings_bind (applet->settings, NAME_KEY, widget, "text", G_SETTINGS_BIND_DEFAULT); widget = gtk_label_new (_("Hours:")); -#if GTK_CHECK_VERSION (3, 0, 0) - gtk_widget_set_halign (widget, GTK_ALIGN_END); - gtk_widget_set_valign (widget, GTK_ALIGN_CENTER); +#if GTK_CHECK_VERSION (3, 16, 0) + gtk_label_set_xalign (GTK_LABEL (widget), 1.0); + gtk_label_set_yalign (GTK_LABEL (widget), 0.5); #else gtk_misc_set_alignment (GTK_MISC (widget), 1.0, 0.5); #endif @@ -339,9 +339,9 @@ timer_preferences_callback (GtkAction *action, TimerApplet *applet) g_signal_connect (widget, "value-changed", G_CALLBACK (timer_spin_button_value_changed), applet); widget = gtk_label_new (_("Minutes:")); -#if GTK_CHECK_VERSION (3, 0, 0) - gtk_widget_set_halign (widget, GTK_ALIGN_END); - gtk_widget_set_valign (widget, GTK_ALIGN_CENTER); +#if GTK_CHECK_VERSION (3, 16, 0) + gtk_label_set_xalign (GTK_LABEL (widget), 1.0); + gtk_label_set_yalign (GTK_LABEL (widget), 0.5); #else gtk_misc_set_alignment (GTK_MISC (widget), 1.0, 0.5); #endif @@ -358,9 +358,9 @@ timer_preferences_callback (GtkAction *action, TimerApplet *applet) g_signal_connect (widget, "value-changed", G_CALLBACK (timer_spin_button_value_changed), applet); widget = gtk_label_new (_("Seconds:")); -#if GTK_CHECK_VERSION (3, 0, 0) - gtk_widget_set_halign (widget, GTK_ALIGN_END); - gtk_widget_set_valign (widget, GTK_ALIGN_CENTER); +#if GTK_CHECK_VERSION (3, 16, 0) + gtk_label_set_xalign (GTK_LABEL (widget), 1.0); + gtk_label_set_yalign (GTK_LABEL (widget), 0.5); #else gtk_misc_set_alignment (GTK_MISC (widget), 1.0, 0.5); #endif diff --git a/trashapplet/src/trashapplet.c b/trashapplet/src/trashapplet.c index ae79790a..7b297aab 100644 --- a/trashapplet/src/trashapplet.c +++ b/trashapplet/src/trashapplet.c @@ -503,10 +503,10 @@ 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); -#if GTK_CHECK_VERSION (3, 0, 0) - gtk_widget_set_halign (label, GTK_ALIGN_START); +#if GTK_CHECK_VERSION (3, 16, 0) + gtk_label_set_xalign (GTK_LABEL (label), 0.0); #else - gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5); + gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); #endif gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0); gtk_widget_show (label); @@ -515,10 +515,10 @@ 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); -#if GTK_CHECK_VERSION (3, 0, 0) - gtk_widget_set_halign (label, GTK_ALIGN_START); +#if GTK_CHECK_VERSION (3, 16, 0) + gtk_label_set_xalign (GTK_LABEL (label), 0.0); #else - gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5); + gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); #endif gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0); gtk_widget_show (label); |