This is needed for https://github.com/geany/geany/pull/3316. I tried to remove all related GTK_CHECK_VERSION() except the one that #3316 eliminates to avoid merge conflicts. You can view, comment on, or merge this pull request online at:
https://github.com/geany/geany/pull/3580
-- Commit Summary --
* Bump GTK version requirement to 3.24
-- File Changes --
M HACKING (5) M m4/geany-gtk.m4 (2) M meson.build (2) M plugins/splitwindow.c (29) M src/dialogs.c (24) M src/editor.c (8) M src/symbols.c (4) M src/vte.c (26)
-- Patch Links --
https://github.com/geany/geany/pull/3580.patch https://github.com/geany/geany/pull/3580.diff
LGBI, love removing olde version workarounds :-)
@techee pushed 1 commit.
31dfef5e12bc5adfe9ca7ed3baf6192dab24b2eb Bump GTK version requirement to 3.24
I've just re-pushed: I removed one more use of GTK_CHECK_VERSION from this patch which is already removed by #3316 to avoid merge conflicts.
@kugel- requested changes on this pull request.
@@ -841,8 +827,8 @@ on_font_dialog_response(GtkDialog *dialog, gint response, gpointer user_data)
{ gchar *fontname;
- fontname = gtk_font_selection_dialog_get_font_name( - GTK_FONT_SELECTION_DIALOG(ui_widgets.open_fontsel)); + fontname = gtk_font_chooser_get_font( + GTK_FONT_CHOOSER(ui_widgets.open_fontsel));
`GTK_FONT_CHOOSER_DIALOG()`
@@ -883,8 +869,8 @@ void dialogs_show_open_font(void)
gtk_window_set_transient_for(GTK_WINDOW(ui_widgets.open_fontsel), GTK_WINDOW(main_widgets.window)); } - gtk_font_selection_dialog_set_font_name( - GTK_FONT_SELECTION_DIALOG(ui_widgets.open_fontsel), interface_prefs.editor_font); + gtk_font_chooser_set_font( + GTK_FONT_CHOOSER(ui_widgets.open_fontsel), interface_prefs.editor_font);
`GTK_FONT_CHOOSER_DIALOG`
@techee commented on this pull request.
@@ -841,8 +827,8 @@ on_font_dialog_response(GtkDialog *dialog, gint response, gpointer user_data)
{ gchar *fontname;
- fontname = gtk_font_selection_dialog_get_font_name( - GTK_FONT_SELECTION_DIALOG(ui_widgets.open_fontsel)); + fontname = gtk_font_chooser_get_font( + GTK_FONT_CHOOSER(ui_widgets.open_fontsel));
I think I did it right. Notice the original code - if first defines ``` #define GTK_FONT_SELECTION_DIALOG GTK_FONT_CHOOSER_DIALOG ``` but then, when it's called, there's an extra `GTK_FONT_CHOOSER()` which overrides it
@kugel- commented on this pull request.
@@ -841,8 +827,8 @@ on_font_dialog_response(GtkDialog *dialog, gint response, gpointer user_data)
{ gchar *fontname;
- fontname = gtk_font_selection_dialog_get_font_name( - GTK_FONT_SELECTION_DIALOG(ui_widgets.open_fontsel)); + fontname = gtk_font_chooser_get_font( + GTK_FONT_CHOOSER(ui_widgets.open_fontsel));
Okay, I didnt see the calls inside the macros.
But still, they are constructed with `gtk_font_chooser_dialog_new()` so I would think `GTK_FONT_CHOOSER_DIALOG()` is correct anyway
This mixes two things:
- configuration requiring 3.24 which is absolutely required since currently it only requires 3.0 which is completely wrong. - removal of various workarounds
The first is uncontroversial, a bugfix, and needed for release 2.0. The second is nice to have, but not absolutely required for 2.0 AFAICT.
Perhaps it should be split.
Perhaps it should be split.
Can do if this is the preferred solution.
But why splitting? IMO it causes only extra work and we want to remove the workarounds anyway if they are not necessary any more.
Sure there is some risk of breakage but in this case this is probably tolerable especially since we will probably use and test Geany in the next days even more than usually.
Splitting is just to get the essential part done whilst there are still changes requested on the other part. I didn't want to say override the changes requested.
@techee I just found another place to update, seems like we have forgotten it already the last time (:smile:): https://github.com/geany/geany/blob/master/doc/geany.txt?plain=1#L106
@techee I just found another place to update, seems like we have forgotten it already the last time (😄):
Good, thanks to this we'll have a smaller diff now bumping just the major version :-)
Which brought me to one more place - we can also drop some settings from `geany.css`!
Will do both.
@techee pushed 3 commits.
4bd14af80055e38ed5269a214c7d51872dde9766 Remove GTK < 3.24 stuff from geany.css 337daf7619f7029c6fe09511fa84905e9f7f1bda Update geany.txt with the required GTK version 9c49eceec823f042ffc93bea6e11e1e72d85df90 Remove geany-3.0.css and geany-3.20.css
Which brought me to one more place - we can also drop some settings from geany.css!
And also `geany-3.0.css` and `geany-3.20.css` can be dropped which I did in the last commit.
Awesome, thanks!
I'd vote for early merge to have as much testing via master as possible.
Works for me, happy for you to override the requested changes.
@kugel- approved this pull request.
Sorry
Merged #3580 into master.
github-comments@lists.geany.org