diff --git a/src/browser.c b/src/browser.c index 02d2e47..989321b 100644 --- a/src/browser.c +++ b/src/browser.c @@ -2182,11 +2182,19 @@ static void _preferences_on_mime_edit(gpointer data) hbox = gtk_hbox_new(FALSE, 4); #endif widget = gtk_label_new(_("Type:")); +#if GTK_CHECK_VERSION(3, 0, 0) + g_object_set(widget, "halign", GTK_ALIGN_START, NULL); +#else gtk_misc_set_alignment(GTK_MISC(widget), 0.0, 0.5); +#endif gtk_size_group_add_widget(group, widget); gtk_box_pack_start(GTK_BOX(hbox), widget, FALSE, TRUE, 0); widget = gtk_label_new(type); +#if GTK_CHECK_VERSION(3, 0, 0) + g_object_set(widget, "halign", GTK_ALIGN_START, NULL); +#else gtk_misc_set_alignment(GTK_MISC(widget), 0.0, 0.5); +#endif gtk_box_pack_start(GTK_BOX(hbox), widget, TRUE, TRUE, 0); gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, TRUE, 0); /* open */ @@ -2196,7 +2204,11 @@ static void _preferences_on_mime_edit(gpointer data) hbox = gtk_hbox_new(FALSE, 4); #endif widget = gtk_label_new(_("Open with:")); +#if GTK_CHECK_VERSION(3, 0, 0) + g_object_set(widget, "halign", GTK_ALIGN_START, NULL); +#else gtk_misc_set_alignment(GTK_MISC(widget), 0.0, 0.5); +#endif gtk_size_group_add_widget(group, widget); gtk_box_pack_start(GTK_BOX(hbox), widget, FALSE, TRUE, 0); open = gtk_entry_new(); @@ -2211,7 +2223,11 @@ static void _preferences_on_mime_edit(gpointer data) hbox = gtk_hbox_new(FALSE, 4); #endif widget = gtk_label_new(_("View with:")); +#if GTK_CHECK_VERSION(3, 0, 0) + g_object_set(widget, "halign", GTK_ALIGN_START, NULL); +#else gtk_misc_set_alignment(GTK_MISC(widget), 0.0, 0.5); +#endif gtk_size_group_add_widget(group, widget); gtk_box_pack_start(GTK_BOX(hbox), widget, FALSE, TRUE, 0); view = gtk_entry_new(); @@ -2226,7 +2242,11 @@ static void _preferences_on_mime_edit(gpointer data) hbox = gtk_hbox_new(FALSE, 4); #endif widget = gtk_label_new(_("Edit with:")); +#if GTK_CHECK_VERSION(3, 0, 0) + g_object_set(widget, "halign", GTK_ALIGN_START, NULL); +#else gtk_misc_set_alignment(GTK_MISC(widget), 0.0, 0.5); +#endif gtk_size_group_add_widget(group, widget); gtk_box_pack_start(GTK_BOX(hbox), widget, FALSE, TRUE, 0); edit = gtk_entry_new(); diff --git a/src/copy.c b/src/copy.c index 32cd068..58cf087 100644 --- a/src/copy.c +++ b/src/copy.c @@ -148,10 +148,11 @@ static int _copy(Prefs * prefs, unsigned int filec, char * filev[]) pango_font_description_set_weight(bold, PANGO_WEIGHT_BOLD); #if GTK_CHECK_VERSION(3, 0, 0) gtk_widget_override_font(widget, bold); + g_object_set(widget, "halign", GTK_ALIGN_START, NULL); #else gtk_widget_modify_font(widget, bold); + gtk_misc_set_alignment(GTK_MISC(widget), 0.0, 0.5); #endif - gtk_misc_set_alignment(GTK_MISC(widget), 0, 0); gtk_size_group_add_widget(left, widget); gtk_box_pack_start(GTK_BOX(hbox), widget, FALSE, TRUE, 0); copy.filename = gtk_entry_new(); @@ -172,16 +173,21 @@ static int _copy(Prefs * prefs, unsigned int filec, char * filev[]) widget = gtk_label_new(_("Filename: ")); #if GTK_CHECK_VERSION(3, 0, 0) gtk_widget_override_font(widget, bold); + g_object_set(widget, "halign", GTK_ALIGN_START, NULL); #else gtk_widget_modify_font(widget, bold); + gtk_misc_set_alignment(GTK_MISC(widget), 0.0, 0.5); #endif - gtk_misc_set_alignment(GTK_MISC(widget), 0, 0); gtk_size_group_add_widget(left, widget); gtk_box_pack_start(GTK_BOX(hbox), widget, FALSE, TRUE, 0); copy.flabel = gtk_label_new(""); gtk_label_set_ellipsize(GTK_LABEL(copy.flabel), PANGO_ELLIPSIZE_START); gtk_label_set_width_chars(GTK_LABEL(copy.flabel), 25); - gtk_misc_set_alignment(GTK_MISC(copy.flabel), 0, 0); +#if GTK_CHECK_VERSION(3, 0, 0) + g_object_set(copy.flabel, "halign", GTK_ALIGN_START, NULL); +#else + gtk_misc_set_alignment(GTK_MISC(copy.flabel), 0.0, 0.5); +#endif gtk_size_group_add_widget(right, copy.flabel); gtk_box_pack_start(GTK_BOX(hbox), copy.flabel, TRUE, TRUE, 0); gtk_box_pack_start(GTK_BOX(vbox), hbox, TRUE, TRUE, 0); @@ -194,14 +200,19 @@ static int _copy(Prefs * prefs, unsigned int filec, char * filev[]) widget = gtk_label_new(_("Copied: ")); #if GTK_CHECK_VERSION(3, 0, 0) gtk_widget_override_font(widget, bold); + g_object_set(widget, "halign", GTK_ALIGN_START, NULL); #else gtk_widget_modify_font(widget, bold); + gtk_misc_set_alignment(GTK_MISC(widget), 0.0, 0.5); #endif - gtk_misc_set_alignment(GTK_MISC(widget), 0, 0); gtk_size_group_add_widget(left, widget); gtk_box_pack_start(GTK_BOX(hbox), widget, FALSE, TRUE, 0); copy.fspeed = gtk_label_new(""); - gtk_misc_set_alignment(GTK_MISC(copy.fspeed), 0, 0); +#if GTK_CHECK_VERSION(3, 0, 0) + g_object_set(copy.fspeed, "halign", GTK_ALIGN_START, NULL); +#else + gtk_misc_set_alignment(GTK_MISC(copy.fspeed), 0.0, 0.5); +#endif gtk_size_group_add_widget(right, copy.fspeed); gtk_box_pack_start(GTK_BOX(hbox), copy.fspeed, TRUE, TRUE, 0); gtk_box_pack_start(GTK_BOX(vbox), hbox, TRUE, TRUE, 0); @@ -214,14 +225,19 @@ static int _copy(Prefs * prefs, unsigned int filec, char * filev[]) widget = gtk_label_new(_("Remaining: ")); #if GTK_CHECK_VERSION(3, 0, 0) gtk_widget_override_font(widget, bold); + g_object_set(widget, "halign", GTK_ALIGN_START, NULL); #else gtk_widget_modify_font(widget, bold); + gtk_misc_set_alignment(GTK_MISC(widget), 0.0, 0.5); #endif - gtk_misc_set_alignment(GTK_MISC(widget), 0, 0); gtk_size_group_add_widget(left, widget); gtk_box_pack_start(GTK_BOX(hbox), widget, FALSE, TRUE, 0); copy.fremaining = gtk_label_new(""); - gtk_misc_set_alignment(GTK_MISC(copy.fremaining), 0, 0); +#if GTK_CHECK_VERSION(3, 0, 0) + g_object_set(copy.fremaining, "halign", GTK_ALIGN_START, NULL); +#else + gtk_misc_set_alignment(GTK_MISC(copy.fremaining), 0.0, 0.5); +#endif gtk_size_group_add_widget(right, copy.fremaining); gtk_box_pack_start(GTK_BOX(hbox), copy.fremaining, TRUE, TRUE, 0); gtk_box_pack_start(GTK_BOX(vbox), hbox, TRUE, TRUE, 0); diff --git a/src/delete.c b/src/delete.c index f0524d0..f43278c 100644 --- a/src/delete.c +++ b/src/delete.c @@ -137,7 +137,11 @@ static int _delete(Prefs * prefs, unsigned int filec, char * filev[]) gtk_label_set_ellipsize(GTK_LABEL(delete.label), PANGO_ELLIPSIZE_END); gtk_label_set_width_chars(GTK_LABEL(delete.label), 25); #endif - gtk_misc_set_alignment(GTK_MISC(delete.label), 0, 0); +#if GTK_CHECK_VERSION(3, 0, 0) + g_object_set(delete.label, "halign", GTK_ALIGN_START, NULL); +#else + gtk_misc_set_alignment(GTK_MISC(delete.label), 0.0, 0.5); +#endif gtk_box_pack_start(GTK_BOX(hbox), delete.label, TRUE, TRUE, 0); gtk_box_pack_start(GTK_BOX(vbox), hbox, TRUE, TRUE, 0); /* progress bar */ diff --git a/src/desktop.c b/src/desktop.c index 1eac01b..2ed04b8 100644 --- a/src/desktop.c +++ b/src/desktop.c @@ -1818,7 +1818,11 @@ static void _preferences_background(Desktop * desktop, GtkWidget * notebook) hbox = gtk_hbox_new(FALSE, 0); #endif label = gtk_label_new(_("Default color: ")); +#if GTK_CHECK_VERSION(3, 0, 0) + g_object_set(label, "halign", GTK_ALIGN_START, NULL); +#else gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5); +#endif gtk_size_group_add_widget(group, label); gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, TRUE, 0); desktop->pr_color = gtk_color_button_new(); @@ -1830,7 +1834,11 @@ static void _preferences_background(Desktop * desktop, GtkWidget * notebook) hbox = gtk_hbox_new(FALSE, 0); #endif label = gtk_label_new(_("Wallpaper: ")); +#if GTK_CHECK_VERSION(3, 0, 0) + g_object_set(label, "halign", GTK_ALIGN_START, NULL); +#else gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5); +#endif gtk_size_group_add_widget(group, label); gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, TRUE, 0); desktop->pr_background = gtk_file_chooser_button_new(_("Background"), @@ -1863,7 +1871,11 @@ static void _preferences_background(Desktop * desktop, GtkWidget * notebook) hbox = gtk_hbox_new(FALSE, 0); #endif label = gtk_label_new(_("Position: ")); +#if GTK_CHECK_VERSION(3, 0, 0) + g_object_set(label, "halign", GTK_ALIGN_START, NULL); +#else gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5); +#endif gtk_size_group_add_widget(group, label); gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, TRUE, 0); #if GTK_CHECK_VERSION(2, 24, 0) @@ -1925,7 +1937,11 @@ static void _preferences_icons(Desktop * desktop, GtkWidget * notebook) hbox = gtk_hbox_new(FALSE, 0); #endif label = gtk_label_new(_("Layout: ")); +#if GTK_CHECK_VERSION(3, 0, 0) + g_object_set(label, "halign", GTK_ALIGN_START, NULL); +#else gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5); +#endif gtk_size_group_add_widget(group, label); gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, TRUE, 0); #if GTK_CHECK_VERSION(2, 24, 0) @@ -1952,7 +1968,11 @@ static void _preferences_icons(Desktop * desktop, GtkWidget * notebook) hbox = gtk_hbox_new(FALSE, 0); #endif label = gtk_label_new(_("Monitor: ")); +#if GTK_CHECK_VERSION(3, 0, 0) + g_object_set(label, "halign", GTK_ALIGN_START, NULL); +#else gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5); +#endif gtk_size_group_add_widget(group, label); gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, TRUE, 0); #if GTK_CHECK_VERSION(2, 24, 0) @@ -1969,7 +1989,11 @@ static void _preferences_icons(Desktop * desktop, GtkWidget * notebook) hbox = gtk_hbox_new(FALSE, 0); #endif label = gtk_label_new(_("Background color: ")); +#if GTK_CHECK_VERSION(3, 0, 0) + g_object_set(label, "halign", GTK_ALIGN_START, NULL); +#else gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5); +#endif gtk_size_group_add_widget(group, label); gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, TRUE, 0); desktop->pr_ibcolor = gtk_color_button_new(); @@ -1982,7 +2006,11 @@ static void _preferences_icons(Desktop * desktop, GtkWidget * notebook) hbox = gtk_hbox_new(FALSE, 0); #endif label = gtk_label_new(_("Foreground color: ")); +#if GTK_CHECK_VERSION(3, 0, 0) + g_object_set(label, "halign", GTK_ALIGN_START, NULL); +#else gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5); +#endif gtk_size_group_add_widget(group, label); gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, TRUE, 0); desktop->pr_ifcolor = gtk_color_button_new(); @@ -1995,7 +2023,11 @@ static void _preferences_icons(Desktop * desktop, GtkWidget * notebook) hbox = gtk_hbox_new(FALSE, 0); #endif label = gtk_label_new(_("Font: ")); +#if GTK_CHECK_VERSION(3, 0, 0) + g_object_set(label, "halign", GTK_ALIGN_START, NULL); +#else gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5); +#endif gtk_size_group_add_widget(group, label); gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, TRUE, 0); desktop->pr_ifont = gtk_font_button_new(); @@ -2028,7 +2060,11 @@ static void _preferences_monitors(Desktop * desktop, GtkWidget * notebook) hbox = gtk_hbox_new(FALSE, 0); #endif label = gtk_label_new(_("Monitor: ")); +#if GTK_CHECK_VERSION(3, 0, 0) + g_object_set(label, "halign", GTK_ALIGN_START, NULL); +#else gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5); +#endif gtk_size_group_add_widget(group, label); gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, TRUE, 0); #if GTK_CHECK_VERSION(2, 24, 0) @@ -2045,11 +2081,19 @@ static void _preferences_monitors(Desktop * desktop, GtkWidget * notebook) hbox = gtk_hbox_new(FALSE, 0); #endif label = gtk_label_new(_("Resolution: ")); +#if GTK_CHECK_VERSION(3, 0, 0) + g_object_set(label, "halign", GTK_ALIGN_START, NULL); +#else gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5); +#endif gtk_size_group_add_widget(group, label); gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, TRUE, 0); desktop->pr_monitors_res = gtk_label_new(NULL); +#if GTK_CHECK_VERSION(3, 0, 0) + g_object_set(desktop->pr_monitors_res, "halign", GTK_ALIGN_START, NULL); +#else gtk_misc_set_alignment(GTK_MISC(desktop->pr_monitors_res), 0.0, 0.5); +#endif gtk_box_pack_start(GTK_BOX(hbox), desktop->pr_monitors_res, TRUE, TRUE, 0); gtk_box_pack_start(GTK_BOX(vbox2), hbox, FALSE, TRUE, 0); @@ -2060,11 +2104,20 @@ static void _preferences_monitors(Desktop * desktop, GtkWidget * notebook) hbox = gtk_hbox_new(FALSE, 0); #endif label = gtk_label_new(_("Size: ")); +#if GTK_CHECK_VERSION(3, 0, 0) + g_object_set(label, "halign", GTK_ALIGN_START, NULL); +#else gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5); +#endif gtk_size_group_add_widget(group, label); gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, TRUE, 0); desktop->pr_monitors_size = gtk_label_new(NULL); +#if GTK_CHECK_VERSION(3, 0, 0) + g_object_set(desktop->pr_monitors_size, "halign", GTK_ALIGN_START, + NULL); +#else gtk_misc_set_alignment(GTK_MISC(desktop->pr_monitors_size), 0.0, 0.5); +#endif gtk_box_pack_start(GTK_BOX(hbox), desktop->pr_monitors_size, TRUE, TRUE, 0); gtk_box_pack_start(GTK_BOX(vbox2), hbox, FALSE, TRUE, 0); diff --git a/src/move.c b/src/move.c index 376e3fc..4c86f60 100644 --- a/src/move.c +++ b/src/move.c @@ -118,10 +118,11 @@ static int _move(Prefs * prefs, unsigned int filec, char * filev[]) pango_font_description_set_weight(bold, PANGO_WEIGHT_BOLD); #if GTK_CHECK_VERSION(3, 0, 0) gtk_widget_override_font(widget, bold); + g_object_set(widget, "halign", GTK_ALIGN_START, NULL); #else gtk_widget_modify_font(widget, bold); -#endif gtk_misc_set_alignment(GTK_MISC(widget), 0, 0); +#endif gtk_size_group_add_widget(left, widget); gtk_box_pack_start(GTK_BOX(hbox), widget, FALSE, TRUE, 0); move.label = gtk_label_new(""); @@ -129,7 +130,11 @@ static int _move(Prefs * prefs, unsigned int filec, char * filev[]) gtk_label_set_ellipsize(GTK_LABEL(move.label), PANGO_ELLIPSIZE_END); gtk_label_set_width_chars(GTK_LABEL(move.label), 25); #endif - gtk_misc_set_alignment(GTK_MISC(move.label), 0, 0); +#if GTK_CHECK_VERSION(3, 0, 0) + g_object_set(move.label, "halign", GTK_ALIGN_START, NULL); +#else + gtk_misc_set_alignment(GTK_MISC(move.label), 0.0, 0.5); +#endif gtk_size_group_add_widget(right, move.label); gtk_box_pack_start(GTK_BOX(hbox), move.label, TRUE, TRUE, 0); gtk_box_pack_start(GTK_BOX(vbox), hbox, TRUE, TRUE, 0); diff --git a/src/plugins/cvs.c b/src/plugins/cvs.c index edd07cd..60d517f 100644 --- a/src/plugins/cvs.c +++ b/src/plugins/cvs.c @@ -141,16 +141,21 @@ static CVS * _cvs_init(BrowserPluginHelper * helper) /* label */ cvs->name = gtk_label_new(""); gtk_label_set_ellipsize(GTK_LABEL(cvs->name), PANGO_ELLIPSIZE_MIDDLE); - gtk_misc_set_alignment(GTK_MISC(cvs->name), 0.0, 0.5); #if GTK_CHECK_VERSION(3, 0, 0) gtk_widget_override_font(cvs->name, font); + g_object_set(cvs->name, "halign", GTK_ALIGN_START, NULL); #else gtk_widget_modify_font(cvs->name, font); + gtk_misc_set_alignment(GTK_MISC(cvs->name), 0.0, 0.5); #endif gtk_box_pack_start(GTK_BOX(cvs->widget), cvs->name, FALSE, TRUE, 0); cvs->status = gtk_label_new(""); gtk_label_set_ellipsize(GTK_LABEL(cvs->status), PANGO_ELLIPSIZE_END); +#if GTK_CHECK_VERSION(3, 0, 0) + g_object_set(cvs->status, "halign", GTK_ALIGN_START, NULL); +#else gtk_misc_set_alignment(GTK_MISC(cvs->status), 0.0, 0.5); +#endif gtk_box_pack_start(GTK_BOX(cvs->widget), cvs->status, FALSE, TRUE, 0); /* checkout */ cvs->checkout = gtk_box_new(GTK_ORIENTATION_VERTICAL, 4); @@ -266,12 +271,20 @@ static GtkWidget * _init_label(GtkSizeGroup * group, char const * label, hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 4); *widget = gtk_label_new(label); +#if GTK_CHECK_VERSION(3, 0, 0) + g_object_set(*widget, "halign", GTK_ALIGN_START, NULL); +#else gtk_misc_set_alignment(GTK_MISC(*widget), 0.0, 0.5); +#endif gtk_size_group_add_widget(group, *widget); gtk_box_pack_start(GTK_BOX(hbox), *widget, FALSE, TRUE, 0); *widget = gtk_label_new(""); gtk_label_set_ellipsize(GTK_LABEL(*widget), PANGO_ELLIPSIZE_MIDDLE); +#if GTK_CHECK_VERSION(3, 0, 0) + g_object_set(*widget, "halign", GTK_ALIGN_START, NULL); +#else gtk_misc_set_alignment(GTK_MISC(*widget), 0.0, 0.5); +#endif gtk_box_pack_start(GTK_BOX(hbox), *widget, TRUE, TRUE, 0); return hbox; } @@ -659,7 +672,11 @@ static GtkResponseType _cvs_prompt_checkout(char const * message, char ** path, # endif hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 4); label = gtk_label_new(_("Path: ")); +#if GTK_CHECK_VERSION(3, 0, 0) + g_object_set(label, "halign", GTK_ALIGN_START, NULL); +#else gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5); +#endif gtk_size_group_add_widget(group, label); gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, TRUE, 0); epath = gtk_entry_new(); @@ -668,7 +685,11 @@ static GtkResponseType _cvs_prompt_checkout(char const * message, char ** path, gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, TRUE, 0); hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 4); label = gtk_label_new(_("Module: ")); +#if GTK_CHECK_VERSION(3, 0, 0) + g_object_set(label, "halign", GTK_ALIGN_START, NULL); +#else gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5); +#endif gtk_size_group_add_widget(group, label); gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, TRUE, 0); emodule = gtk_entry_new(); diff --git a/src/plugins/git.c b/src/plugins/git.c index 1f0b3b4..4425553 100644 --- a/src/plugins/git.c +++ b/src/plugins/git.c @@ -131,16 +131,21 @@ static Git * _git_init(BrowserPluginHelper * helper) /* label */ git->name = gtk_label_new(""); gtk_label_set_ellipsize(GTK_LABEL(git->name), PANGO_ELLIPSIZE_MIDDLE); - gtk_misc_set_alignment(GTK_MISC(git->name), 0.0, 0.5); #if GTK_CHECK_VERSION(3, 0, 0) gtk_widget_override_font(git->name, font); + g_object_set(git->name, "halign", GTK_ALIGN_START, NULL); #else gtk_widget_modify_font(git->name, font); + gtk_misc_set_alignment(GTK_MISC(git->name), 0.0, 0.5); #endif gtk_box_pack_start(GTK_BOX(git->widget), git->name, FALSE, TRUE, 0); git->status = gtk_label_new(""); gtk_label_set_ellipsize(GTK_LABEL(git->status), PANGO_ELLIPSIZE_END); +#if GTK_CHECK_VERSION(3, 0, 0) + g_object_set(git->status, "halign", GTK_ALIGN_START, NULL); +#else gtk_misc_set_alignment(GTK_MISC(git->status), 0.0, 0.5); +#endif gtk_box_pack_start(GTK_BOX(git->widget), git->status, FALSE, TRUE, 0); /* init */ git->init = gtk_box_new(GTK_ORIENTATION_VERTICAL, 4); diff --git a/src/plugins/make.c b/src/plugins/make.c index 53a7dde..8390e9e 100644 --- a/src/plugins/make.c +++ b/src/plugins/make.c @@ -138,16 +138,21 @@ static Make * _make_init(BrowserPluginHelper * helper) /* label */ make->name = gtk_label_new(""); gtk_label_set_ellipsize(GTK_LABEL(make->name), PANGO_ELLIPSIZE_MIDDLE); - gtk_misc_set_alignment(GTK_MISC(make->name), 0.0, 0.5); #if GTK_CHECK_VERSION(3, 0, 0) gtk_widget_override_font(make->name, font); + g_object_set(make->name, "halign", GTK_ALIGN_START, NULL); #else gtk_widget_modify_font(make->name, font); + gtk_misc_set_alignment(GTK_MISC(make->name), 0.0, 0.5); #endif gtk_box_pack_start(GTK_BOX(make->widget), make->name, FALSE, TRUE, 0); make->status = gtk_label_new(""); gtk_label_set_ellipsize(GTK_LABEL(make->status), PANGO_ELLIPSIZE_END); +#if GTK_CHECK_VERSION(3, 0, 0) + g_object_set(make->status, "halign", GTK_ALIGN_START, NULL); +#else gtk_misc_set_alignment(GTK_MISC(make->status), 0.0, 0.5); +#endif gtk_box_pack_start(GTK_BOX(make->widget), make->status, FALSE, TRUE, 0); /* directory */ make->directory = gtk_box_new(GTK_ORIENTATION_VERTICAL, 4); diff --git a/src/plugins/properties.c b/src/plugins/properties.c index 21db960..e1ad7cb 100644 --- a/src/plugins/properties.c +++ b/src/plugins/properties.c @@ -318,7 +318,11 @@ static GtkWidget * _new_label_left(GtkSizeGroup * group, char const * text) ret = gtk_label_new(text); if(group != NULL) gtk_size_group_add_widget(group, ret); +#if GTK_CHECK_VERSION(3, 0, 0) + g_object_set(ret, "halign", GTK_ALIGN_START, NULL); +#else gtk_misc_set_alignment(GTK_MISC(ret), 0.0, 0.5); +#endif return ret; } diff --git a/src/plugins/selection.c b/src/plugins/selection.c index b53b656..a28f7f8 100644 --- a/src/plugins/selection.c +++ b/src/plugins/selection.c @@ -124,7 +124,11 @@ static Selection * _selection_init(BrowserPluginHelper * helper) gtk_container_add(GTK_CONTAINER(widget), selection->view); gtk_box_pack_start(GTK_BOX(selection->widget), widget, TRUE, TRUE, 0); selection->status = gtk_label_new(NULL); +#if GTK_CHECK_VERSION(3, 0, 0) + g_object_set(selection->status, "halign", GTK_ALIGN_START, NULL); +#else gtk_misc_set_alignment(GTK_MISC(selection->status), 0.0, 0.5); +#endif gtk_box_pack_start(GTK_BOX(selection->widget), selection->status, FALSE, TRUE, 0); gtk_widget_show_all(selection->widget); diff --git a/src/plugins/subversion.c b/src/plugins/subversion.c index 36e21a9..69e5744 100644 --- a/src/plugins/subversion.c +++ b/src/plugins/subversion.c @@ -125,16 +125,21 @@ static SVN * _subversion_init(BrowserPluginHelper * helper) /* label */ svn->name = gtk_label_new(""); gtk_label_set_ellipsize(GTK_LABEL(svn->name), PANGO_ELLIPSIZE_MIDDLE); - gtk_misc_set_alignment(GTK_MISC(svn->name), 0.0, 0.5); #if GTK_CHECK_VERSION(3, 0, 0) gtk_widget_override_font(svn->name, font); + g_object_set(svn->name, "halign", GTK_ALIGN_START, NULL); #else gtk_widget_modify_font(svn->name, font); + gtk_misc_set_alignment(GTK_MISC(svn->name), 0.0, 0.5); #endif gtk_box_pack_start(GTK_BOX(svn->widget), svn->name, FALSE, TRUE, 0); svn->status = gtk_label_new(""); gtk_label_set_ellipsize(GTK_LABEL(svn->status), PANGO_ELLIPSIZE_END); +#if GTK_CHECK_VERSION(3, 0, 0) + g_object_set(svn->status, "halign", GTK_ALIGN_START, NULL); +#else gtk_misc_set_alignment(GTK_MISC(svn->status), 0.0, 0.5); +#endif gtk_box_pack_start(GTK_BOX(svn->widget), svn->status, FALSE, TRUE, 0); /* directory */ svn->directory = gtk_box_new(GTK_ORIENTATION_VERTICAL, 4);