Plugins-Commits May 2019

plugins-commits@lists.geany.org

1 participants
44 discussions

[geany/geany-plugins] d079ef: automark: move initialization behind DOC_VALID check. Fixes #574.
by LarsGit223 16 May '19

16 May '19

Branch: refs/heads/master Author: LarsGit223 <lars_paulsen(a)web.de> Committer: LarsGit223 <lars_paulsen(a)web.de> Date: Thu, 16 May 2019 17:55:20 UTC Commit: d079efa87f3e9ab672a3d7d6ea740f3da2e3a2b5 https://github.com/geany/geany-plugins/commit/d079efa87f3e9ab672a3d7d6ea740… Log Message: ----------- automark: move initialization behind DOC_VALID check. Fixes #574. Modified Paths: -------------- automark/src/automark.c Modified: automark/src/automark.c 7 lines changed, 5 insertions(+), 2 deletions(-) =================================================================== @@ -91,9 +91,9 @@ static gboolean automark(gpointer user_data) { GeanyDocument *doc = (GeanyDocument *)user_data; - GeanyEditor *editor = doc->editor; + GeanyEditor *editor; static GeanyEditor *editor_cache = NULL; - ScintillaObject *sci = editor->sci; + ScintillaObject *sci; gchar *text; static gchar text_cache[GEANY_MAX_WORD_LENGTH] = {0}; gint match_flag = SCFIND_MATCHCASE | SCFIND_WHOLEWORD; @@ -105,6 +105,9 @@ automark(gpointer user_data) if (!DOC_VALID(doc)) return FALSE; + editor = doc->editor; + sci = editor->sci; + /* Do not highlight while selecting text and allow other markers to work */ if (sci_has_selection(sci)) return FALSE; -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] 69fddd: Merge pull request #857 from LarsGit223/autoclose-gtk3
by Frank Lanitz 16 May '19

16 May '19

Branch: refs/heads/master Author: Frank Lanitz <frank(a)frank.uvena.de> Committer: GitHub <noreply(a)github.com> Date: Thu, 16 May 2019 05:32:30 UTC Commit: 69fddd4454498944dc2cb218385cb665026eb2d7 https://github.com/geany/geany-plugins/commit/69fddd4454498944dc2cb218385cb… Log Message: ----------- Merge pull request #857 from LarsGit223/autoclose-gtk3 autoclose: fixed deprecated gtk call for gtk3 Modified Paths: -------------- autoclose/src/autoclose.c Modified: autoclose/src/autoclose.c 4 lines changed, 4 insertions(+), 0 deletions(-) =================================================================== @@ -1005,7 +1005,11 @@ plugin_autoclose_configure(G_GNUC_UNUSED GeanyPlugin *plugin, GtkDialog *dialog, vbox = gtk_vbox_new(FALSE, 0); scrollbox = gtk_scrolled_window_new(NULL, NULL); gtk_widget_set_size_request(GTK_WIDGET(scrollbox), -1, 400); +#if GTK_CHECK_VERSION(3, 8, 0) + gtk_container_add(GTK_CONTAINER(scrollbox), vbox); +#else gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(scrollbox), vbox); +#endif gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrollbox), GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC); -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] 07d586: GeanyVC: Remove image from README as it appears to be gone
by Frank Lanitz 15 May '19

15 May '19

Branch: refs/heads/master Author: Frank Lanitz <frank(a)frank.uvena.de> Committer: Frank Lanitz <frank(a)frank.uvena.de> Date: Wed, 15 May 2019 20:24:11 UTC Commit: 07d586e211118c25486bc301805540075ac60378 https://github.com/geany/geany-plugins/commit/07d586e211118c25486bc30180554… Log Message: ----------- GeanyVC: Remove image from README as it appears to be gone Modified Paths: -------------- geanyvc/README Modified: geanyvc/README 10 lines changed, 2 insertions(+), 8 deletions(-) =================================================================== @@ -1,12 +1,6 @@ GeanyVC =========== -.. image:: http://img846.imageshack.us/img846/7136/geanyvcsmall.png - :width: 400 - :alt: image of a plugin in work (if applicable) - :align: right - :target: http://img210.imageshack.us/img210/5382/geanyvc.png - .. contents:: About @@ -55,7 +49,7 @@ Features * revert base directory * update * commit - + Usage ----- @@ -119,7 +113,7 @@ Requirements * GTK >= 2.8.0 * gtkspell >=2.0 for a spell checking * Geany >= 0.19 - + Contact developers ------------------ -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] 82eab5: Merge pull request #861 from LarsGit223/geanyvc-silence-check
by Frank Lanitz 15 May '19

15 May '19

Branch: refs/heads/master Author: Frank Lanitz <frank(a)frank.uvena.de> Committer: GitHub <noreply(a)github.com> Date: Wed, 15 May 2019 07:51:34 UTC Commit: 82eab5291c37d7c214b4ddd38ebdc23edcfc6509 https://github.com/geany/geany-plugins/commit/82eab5291c37d7c214b4ddd38ebdc… Log Message: ----------- Merge pull request #861 from LarsGit223/geanyvc-silence-check geanyvc: silence check errors Modified Paths: -------------- geanyvc/src/geanyvc.c Modified: geanyvc/src/geanyvc.c 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -1359,7 +1359,7 @@ create_commit_message_history_combobox(void) GtkCellRenderer *renderer; GtkTreeIter iter; GtkListStore *store; - GSList *list_item; + GSList *list_item = NULL; GString *display_message_string; gchar *display_message; @@ -2147,7 +2147,7 @@ load_config(void) GError *error = NULL; #endif - gchar **commit_message_history_keys, **ptr; + gchar **commit_message_history_keys, **ptr = NULL; gchar *commit_message; GKeyFile *config = g_key_file_new(); -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] 147f35: geanynumberedbookmarks: fixed deprecated gtk calls for gtk3
by LarsGit223 14 May '19

14 May '19

Branch: refs/heads/master Author: LarsGit223 <lars_paulsen(a)web.de> Committer: LarsGit223 <lars_paulsen(a)web.de> Date: Tue, 14 May 2019 19:25:25 UTC Commit: 147f3559ca2721b2d0229f116f4ae05729552956 https://github.com/geany/geany-plugins/commit/147f3559ca2721b2d0229f116f4ae… Log Message: ----------- geanynumberedbookmarks: fixed deprecated gtk calls for gtk3 Modified Paths: -------------- build/geanynumberedbookmarks.m4 geanynumberedbookmarks/src/Makefile.am geanynumberedbookmarks/src/geanynumberedbookmarks.c utils/src/gp_gtkcompat.h Modified: build/geanynumberedbookmarks.m4 2 lines changed, 2 insertions(+), 0 deletions(-) =================================================================== @@ -1,6 +1,8 @@ AC_DEFUN([GP_CHECK_GEANYNUMBEREDBOOKMARKS], [ GP_ARG_DISABLE([GeanyNumberedBookmarks], [auto]) + GP_CHECK_UTILSLIB([GeanyNumberedBookmarks]) + GP_COMMIT_PLUGIN_STATUS([GeanyNumberedBookmarks]) AC_CONFIG_FILES([ geanynumberedbookmarks/Makefile Modified: geanynumberedbookmarks/src/Makefile.am 5 lines changed, 4 insertions(+), 1 deletions(-) =================================================================== @@ -5,4 +5,7 @@ geanyplugins_LTLIBRARIES = geanynumberedbookmarks.la geanynumberedbookmarks_la_SOURCES = geanynumberedbookmarks.c geanynumberedbookmarks_la_CPPFLAGS = $(AM_CPPFLAGS) -DG_LOG_DOMAIN=\"GeanyNumberedBookmarks\" -geanynumberedbookmarks_la_LIBADD = $(COMMONLIBS) +geanynumberedbookmarks_la_CFLAGS = $(AM_CFLAGS) \ + -I$(top_srcdir)/utils/src +geanynumberedbookmarks_la_LIBADD = $(COMMONLIBS) \ + $(top_builddir)/utils/src/libgeanypluginutils.la Modified: geanynumberedbookmarks/src/geanynumberedbookmarks.c 16 lines changed, 15 insertions(+), 1 deletions(-) =================================================================== @@ -20,6 +20,7 @@ #include <gdk/gdkkeysyms.h> #include <gtk/gtk.h> #include <glib/gstdio.h> +#include <gp_gtkcompat.h> static const gint base64_char_to_int[]= { @@ -1289,10 +1290,19 @@ will move the bookmark there if it was set on a different line, or create it if scroll=gtk_scrolled_window_new(NULL,NULL); gtk_scrolled_window_set_policy((GtkScrolledWindow*)scroll,GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC); +#if GTK_CHECK_VERSION(3, 8, 0) + gtk_widget_set_size_request(label, 600, -1); + gtk_widget_set_halign(label, GTK_ALIGN_CENTER); + gtk_widget_set_valign(label, GTK_ALIGN_CENTER); + gtk_widget_set_vexpand(label, TRUE); + gtk_container_add(GTK_CONTAINER(scroll),label); + gtk_scrolled_window_set_shadow_type((GtkScrolledWindow*)scroll, GTK_SHADOW_IN); +#else gtk_scrolled_window_add_with_viewport((GtkScrolledWindow*)scroll,label); +#endif gtk_container_add(GTK_CONTAINER(gtk_dialog_get_content_area(GTK_DIALOG(dialog))),scroll); - gtk_widget_show(scroll); + gtk_widget_show_all(dialog); /* set dialog size (leave width default) */ gtk_widget_set_size_request(dialog,-1,300); @@ -1475,7 +1485,11 @@ void plugin_init(GeanyData *data) { gint i,k,iResults=0; GdkKeymapKey *gdkkmkResults; +#if GTK_CHECK_VERSION(3, 22, 0) + GdkKeymap *gdkKeyMap=gdk_keymap_get_for_display(gdk_display_get_default()); +#else GdkKeymap *gdkKeyMap=gdk_keymap_get_default(); +#endif /* Load settings */ LoadSettings(); Modified: utils/src/gp_gtkcompat.h 2 lines changed, 2 insertions(+), 0 deletions(-) =================================================================== @@ -48,8 +48,10 @@ G_BEGIN_DECLS #if GTK_CHECK_VERSION(3, 10, 0) #undef GTK_STOCK_OPEN #undef GTK_STOCK_CANCEL +#undef GTK_STOCK_OK #define GTK_STOCK_OPEN _("_Open") #define GTK_STOCK_CANCEL _("_Cancel") +#define GTK_STOCK_OK _("_OK") #endif /* Replace calls to gtk_icon_info_free() with call to -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] f255b8: geanyvc: silence check errors
by LarsGit223 14 May '19

14 May '19

Branch: refs/heads/master Author: LarsGit223 <lars_paulsen(a)web.de> Committer: LarsGit223 <lars_paulsen(a)web.de> Date: Tue, 14 May 2019 16:55:04 UTC Commit: f255b8a53f48e91f659c5490770a9f5356f9c951 https://github.com/geany/geany-plugins/commit/f255b8a53f48e91f659c5490770a9… Log Message: ----------- geanyvc: silence check errors Initialize two pointers (although not required) to silence two erros reported on 'make check' (Uninitialized variable). Modified Paths: -------------- geanyvc/src/geanyvc.c Modified: geanyvc/src/geanyvc.c 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -1359,7 +1359,7 @@ create_commit_message_history_combobox(void) GtkCellRenderer *renderer; GtkTreeIter iter; GtkListStore *store; - GSList *list_item; + GSList *list_item = NULL; GString *display_message_string; gchar *display_message; @@ -2147,7 +2147,7 @@ load_config(void) GError *error = NULL; #endif - gchar **commit_message_history_keys, **ptr; + gchar **commit_message_history_keys, **ptr = NULL; gchar *commit_message; GKeyFile *config = g_key_file_new(); -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] 898264: Merge pull request #858 from LarsGit223/extrasel-gtk3
by Frank Lanitz 14 May '19

14 May '19

Branch: refs/heads/master Author: Frank Lanitz <frank(a)frank.uvena.de> Committer: GitHub <noreply(a)github.com> Date: Tue, 14 May 2019 15:03:21 UTC Commit: 8982649398d08a736a2788ee20671253114fe63f https://github.com/geany/geany-plugins/commit/8982649398d08a736a2788ee20671… Log Message: ----------- Merge pull request #858 from LarsGit223/extrasel-gtk3 extrasel: fixed deprecated gtk call Modified Paths: -------------- geanyextrasel/src/extrasel.c Modified: geanyextrasel/src/extrasel.c 4 lines changed, 4 insertions(+), 0 deletions(-) =================================================================== @@ -334,7 +334,11 @@ static void doit_and_select(guint group_id, guint key_id) else { if (geany_data->prefs->beep_on_errors) +#if GTK_CHECK_VERSION(2, 2, 0) + gdk_display_beep(gdk_display_get_default()); +#else gdk_beep(); +#endif return; } -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] e4e0f3: Merge pull request #853 from LarsGit223/wb-gtk3
by Frank Lanitz 14 May '19

14 May '19

Branch: refs/heads/master Author: Frank Lanitz <frank(a)frank.uvena.de> Committer: GitHub <noreply(a)github.com> Date: Tue, 14 May 2019 15:01:59 UTC Commit: e4e0f315ffd98a3dff7b7fb6737944b247c74369 https://github.com/geany/geany-plugins/commit/e4e0f315ffd98a3dff7b7fb673794… Log Message: ----------- Merge pull request #853 from LarsGit223/wb-gtk3 workbench: fixed deprecated gtk calls for gtk3 Modified Paths: -------------- utils/src/gp_gtkcompat.h workbench/src/dialogs.c workbench/src/popup_menu.c workbench/src/sidebar.c Modified: utils/src/gp_gtkcompat.h 9 lines changed, 8 insertions(+), 1 deletions(-) =================================================================== @@ -51,7 +51,14 @@ G_BEGIN_DECLS #define GTK_STOCK_OPEN _("_Open") #define GTK_STOCK_CANCEL _("_Cancel") #endif + +/* Replace calls to gtk_icon_info_free() with call to + g_object_unref(). Starting from version 3.8.*/ +#if GTK_CHECK_VERSION(3, 8, 0) +#define gtk_icon_info_free(icon_info) \ + g_object_unref(icon_info) +#endif + G_END_DECLS #endif /* GP_GTKCOMPAT_H */ - Modified: workbench/src/dialogs.c 100 lines changed, 98 insertions(+), 2 deletions(-) =================================================================== @@ -279,7 +279,12 @@ gboolean dialogs_directory_settings(WB_PROJECT_DIR *directory) { GtkWidget *w_file_patterns, *w_ignored_dirs_patterns, *w_ignored_file_patterns; GtkWidget *dialog, *label, *content_area; - GtkWidget *vbox, *hbox, *hbox1, *table; + GtkWidget *vbox, *hbox, *hbox1; +#if GTK_CHECK_VERSION(3, 4, 0) + GtkWidget *grid; +#else + GtkWidget *table; +#endif GtkDialogFlags flags; gchar *file_patterns_old, *ignored_file_patterns_old, *ignored_dirs_patterns_old; gboolean changed; @@ -296,14 +301,34 @@ gboolean dialogs_directory_settings(WB_PROJECT_DIR *directory) vbox = gtk_vbox_new(FALSE, 0); +#if GTK_CHECK_VERSION(3, 4, 0) + grid = gtk_grid_new (); + gtk_grid_set_row_spacing (GTK_GRID(grid), 5); + gtk_grid_set_column_spacing (GTK_GRID(grid), 10); +#else table = gtk_table_new(5, 2, FALSE); gtk_table_set_row_spacings(GTK_TABLE(table), 5); gtk_table_set_col_spacings(GTK_TABLE(table), 10); +#endif label = gtk_label_new(_("File patterns:")); +#if GTK_CHECK_VERSION(3, 16, 0) + gtk_label_set_xalign (GTK_LABEL(label), 0); + gtk_label_set_yalign (GTK_LABEL(label), 0); +#else gtk_misc_set_alignment(GTK_MISC(label), 0, 0); +#endif w_file_patterns = gtk_entry_new(); +#if GTK_CHECK_VERSION(3, 4, 0) + gtk_grid_attach (GTK_GRID(grid), label, 0, 0, 1, 1); + gtk_grid_attach (GTK_GRID(grid), w_file_patterns, 1, 0, 1, 1); + gtk_widget_set_valign (label, GTK_ALIGN_BASELINE); + gtk_widget_set_hexpand (label, FALSE); + gtk_widget_set_valign (w_file_patterns, GTK_ALIGN_BASELINE); + gtk_widget_set_hexpand (w_file_patterns, TRUE); +#else ui_table_add_row(GTK_TABLE(table), 0, label, w_file_patterns, NULL); +#endif ui_entry_add_clear_icon(GTK_ENTRY(w_file_patterns)); gtk_widget_set_tooltip_text(w_file_patterns, _("Space separated list of patterns that are used to identify files " @@ -312,28 +337,60 @@ gboolean dialogs_directory_settings(WB_PROJECT_DIR *directory) gtk_entry_set_text(GTK_ENTRY(w_file_patterns), file_patterns_old); label = gtk_label_new(_("Ignored file patterns:")); +#if GTK_CHECK_VERSION(3, 16, 0) + gtk_label_set_xalign (GTK_LABEL(label), 0); + gtk_label_set_yalign (GTK_LABEL(label), 0); +#else gtk_misc_set_alignment(GTK_MISC(label), 0, 0); +#endif w_ignored_file_patterns = gtk_entry_new(); ui_entry_add_clear_icon(GTK_ENTRY(w_ignored_file_patterns)); +#if GTK_CHECK_VERSION(3, 4, 0) + gtk_grid_attach (GTK_GRID(grid), label, 0, 1, 1, 1); + gtk_grid_attach (GTK_GRID(grid), w_ignored_file_patterns, 1, 1, 1, 1); + gtk_widget_set_valign (label, GTK_ALIGN_BASELINE); + gtk_widget_set_hexpand (label, FALSE); + gtk_widget_set_valign (w_ignored_file_patterns, GTK_ALIGN_BASELINE); + gtk_widget_set_hexpand (w_ignored_file_patterns, TRUE); +#else ui_table_add_row(GTK_TABLE(table), 2, label, w_ignored_file_patterns, NULL); +#endif gtk_widget_set_tooltip_text(w_ignored_file_patterns, _("Space separated list of patterns that are used to identify files " "that shall not be displayed in the directory tree.")); ignored_file_patterns_old = g_strjoinv(" ", wb_project_dir_get_ignored_file_patterns(directory)); gtk_entry_set_text(GTK_ENTRY(w_ignored_file_patterns), ignored_file_patterns_old); label = gtk_label_new(_("Ignored directory patterns:")); +#if GTK_CHECK_VERSION(3, 16, 0) + gtk_label_set_xalign (GTK_LABEL(label), 0); + gtk_label_set_yalign (GTK_LABEL(label), 0); +#else gtk_misc_set_alignment(GTK_MISC(label), 0, 0); +#endif w_ignored_dirs_patterns = gtk_entry_new(); ui_entry_add_clear_icon(GTK_ENTRY(w_ignored_dirs_patterns)); +#if GTK_CHECK_VERSION(3, 4, 0) + gtk_grid_attach (GTK_GRID(grid), label, 0, 2, 1, 1); + gtk_grid_attach (GTK_GRID(grid), w_ignored_dirs_patterns, 1, 2, 1, 1); + gtk_widget_set_valign (label, GTK_ALIGN_BASELINE); + gtk_widget_set_hexpand (label, FALSE); + gtk_widget_set_valign (w_ignored_dirs_patterns, GTK_ALIGN_BASELINE); + gtk_widget_set_hexpand (w_ignored_dirs_patterns, TRUE); +#else ui_table_add_row(GTK_TABLE(table), 3, label, w_ignored_dirs_patterns, NULL); +#endif gtk_widget_set_tooltip_text(w_ignored_dirs_patterns, _("Space separated list of patterns that are used to identify directories " "that shall not be scanned for source files.")); ignored_dirs_patterns_old = g_strjoinv(" ", wb_project_dir_get_ignored_dirs_patterns(directory)); gtk_entry_set_text(GTK_ENTRY(w_ignored_dirs_patterns), ignored_dirs_patterns_old); +#if GTK_CHECK_VERSION(3, 4, 0) + gtk_box_pack_start(GTK_BOX(vbox), grid, FALSE, FALSE, 6); +#else gtk_box_pack_start(GTK_BOX(vbox), table, FALSE, FALSE, 6); +#endif hbox1 = gtk_hbox_new(FALSE, 0); label = gtk_label_new(_("Note: the patterns above affect only the workbench directory and are not used in the Find in Files\n" @@ -409,7 +466,12 @@ gboolean dialogs_workbench_settings(WORKBENCH *workbench) gint result; GtkWidget *w_rescan_projects_on_open, *w_enable_live_update, *w_expand_on_hover; GtkWidget *dialog, *content_area; - GtkWidget *vbox, *hbox, *table; + GtkWidget *vbox, *hbox; +#if GTK_CHECK_VERSION(3, 4, 0) + GtkWidget *grid; +#else + GtkWidget *table; +#endif GtkDialogFlags flags; gboolean changed, rescan_projects_on_open, rescan_projects_on_open_old; gboolean enable_live_update, enable_live_update_old; @@ -427,20 +489,42 @@ gboolean dialogs_workbench_settings(WORKBENCH *workbench) vbox = gtk_vbox_new(FALSE, 0); +#if GTK_CHECK_VERSION(3, 4, 0) + grid = gtk_grid_new (); + gtk_grid_set_row_spacing (GTK_GRID(grid), 5); + gtk_grid_set_column_spacing (GTK_GRID(grid), 10); +#else table = gtk_table_new(5, 2, FALSE); gtk_table_set_row_spacings(GTK_TABLE(table), 5); gtk_table_set_col_spacings(GTK_TABLE(table), 10); +#endif w_rescan_projects_on_open = gtk_check_button_new_with_mnemonic(_("_Rescan all projects on open")); +#if GTK_CHECK_VERSION(3, 4, 0) + gtk_grid_attach (GTK_GRID(grid), w_rescan_projects_on_open, 0, 0, 1, 1); + gtk_widget_set_halign (w_rescan_projects_on_open, GTK_ALIGN_CENTER); + gtk_widget_set_hexpand (w_rescan_projects_on_open, TRUE); + gtk_widget_set_valign (w_rescan_projects_on_open, GTK_ALIGN_CENTER); + gtk_widget_set_vexpand (w_rescan_projects_on_open, TRUE); +#else ui_table_add_row(GTK_TABLE(table), 0, w_rescan_projects_on_open, NULL); +#endif gtk_widget_set_tooltip_text(w_rescan_projects_on_open, _("If the option is activated (default), then all projects will be re-scanned " "on opening of the workbench.")); rescan_projects_on_open_old = workbench_get_rescan_projects_on_open(workbench); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(w_rescan_projects_on_open), rescan_projects_on_open_old); w_enable_live_update = gtk_check_button_new_with_mnemonic(_("_Enable live update")); +#if GTK_CHECK_VERSION(3, 4, 0) + gtk_grid_attach (GTK_GRID(grid), w_enable_live_update, 0, 1, 1, 1); + gtk_widget_set_halign (w_enable_live_update, GTK_ALIGN_CENTER); + gtk_widget_set_hexpand (w_enable_live_update, TRUE); + gtk_widget_set_valign (w_enable_live_update, GTK_ALIGN_CENTER); + gtk_widget_set_vexpand (w_enable_live_update, TRUE); +#else ui_table_add_row(GTK_TABLE(table), 1, w_enable_live_update, NULL); +#endif gtk_widget_set_tooltip_text(w_enable_live_update, _("If the option is activated (default), then the list of files and the sidebar " "will be updated automatically if a file or directory is created, removed or renamed. " @@ -449,14 +533,26 @@ gboolean dialogs_workbench_settings(WORKBENCH *workbench) gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(w_enable_live_update), enable_live_update_old); w_expand_on_hover = gtk_check_button_new_with_mnemonic(_("_Expand on hover")); +#if GTK_CHECK_VERSION(3, 4, 0) + gtk_grid_attach (GTK_GRID(grid), w_expand_on_hover, 0, 2, 1, 1); + gtk_widget_set_halign (w_expand_on_hover, GTK_ALIGN_CENTER); + gtk_widget_set_hexpand (w_expand_on_hover, TRUE); + gtk_widget_set_valign (w_expand_on_hover, GTK_ALIGN_CENTER); + gtk_widget_set_vexpand (w_expand_on_hover, TRUE); +#else ui_table_add_row(GTK_TABLE(table), 2, w_expand_on_hover, NULL); +#endif gtk_widget_set_tooltip_text(w_expand_on_hover, _("If the option is activated, then a tree node in the sidebar " "will be expanded or collapsed by hovering over it with the mouse cursor.")); expand_on_hover_old = workbench_get_expand_on_hover(workbench); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(w_expand_on_hover), expand_on_hover_old); +#if GTK_CHECK_VERSION(3, 4, 0) + gtk_box_pack_start(GTK_BOX(vbox), grid, FALSE, FALSE, 6); +#else gtk_box_pack_start(GTK_BOX(vbox), table, FALSE, FALSE, 6); +#endif hbox = gtk_hbox_new(FALSE, 0); gtk_box_pack_start(GTK_BOX(hbox), vbox, TRUE, TRUE, 6); Modified: workbench/src/popup_menu.c 4 lines changed, 4 insertions(+), 0 deletions(-) =================================================================== @@ -234,8 +234,12 @@ void popup_menu_show(POPUP_CONTEXT context, GdkEventButton *event) gtk_widget_set_sensitive (s_popup_menu.remove_file_or_dir, FALSE); break; } +#if GTK_CHECK_VERSION(3, 22, 0) + gtk_menu_popup_at_pointer(GTK_MENU(s_popup_menu.widget), (GdkEvent *)event); +#else gtk_menu_popup(GTK_MENU(s_popup_menu.widget), NULL, NULL, NULL, NULL, event->button, event->time); +#endif } Modified: workbench/src/sidebar.c 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -28,6 +28,7 @@ #endif #include "wb_globals.h" #include <gtkcompat.h> +#include <gp_gtkcompat.h> #include "sidebar.h" #include "popup_menu.h" -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] 8ee401: Merge pull request #859 from LarsGit223/tableconvert-gtk3
by Frank Lanitz 14 May '19

14 May '19

Branch: refs/heads/master Author: Frank Lanitz <frank(a)frank.uvena.de> Committer: GitHub <noreply(a)github.com> Date: Tue, 14 May 2019 14:58:28 UTC Commit: 8ee401a937874a9404dd2ba8b9ab08bf35378d2b https://github.com/geany/geany-plugins/commit/8ee401a937874a9404dd2ba8b9ab0… Log Message: ----------- Merge pull request #859 from LarsGit223/tableconvert-gtk3 tableconvert: fixed deprecated gtk call for gtk3 Modified Paths: -------------- tableconvert/src/tableconvert_ui.c Modified: tableconvert/src/tableconvert_ui.c 4 lines changed, 4 insertions(+), 0 deletions(-) =================================================================== @@ -49,7 +49,11 @@ void init_menuentries(void) * This is needed for e.g. different wiki-Syntax or differenz stiles * within a special file type */ +#if GTK_CHECK_VERSION(3, 10, 0) + menu_tableconvert = gtk_menu_item_new_with_mnemonic(_("_More TableConvert")); +#else menu_tableconvert = gtk_image_menu_item_new_with_mnemonic(_("_More TableConvert")); +#endif gtk_container_add(GTK_CONTAINER(geany->main_widgets->tools_menu), menu_tableconvert); menu_tableconvert_menu = gtk_menu_new (); -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] f9e2c3: Merge pull request #856 from LarsGit223/lipsum-gtk3
by Frank Lanitz 14 May '19

14 May '19

Branch: refs/heads/master Author: Frank Lanitz <frank(a)frank.uvena.de> Committer: GitHub <noreply(a)github.com> Date: Tue, 14 May 2019 14:57:53 UTC Commit: f9e2c3ca04901144db81c240ebad155c80e7806c https://github.com/geany/geany-plugins/commit/f9e2c3ca04901144db81c240ebad1… Log Message: ----------- Merge pull request #856 from LarsGit223/lipsum-gtk3 lipsum: fixed deprecated gtk call for gtk3 Modified Paths: -------------- lipsum/src/lipsum.c Modified: lipsum/src/lipsum.c 4 lines changed, 4 insertions(+), 0 deletions(-) =================================================================== @@ -219,7 +219,11 @@ plugin_init(G_GNUC_UNUSED GeanyData *data) g_free(config_file); /* Building menu entry */ +#if GTK_CHECK_VERSION(3, 10, 0) + menu_lipsum = gtk_menu_item_new_with_mnemonic(_("_Lipsum...")); +#else menu_lipsum = gtk_image_menu_item_new_with_mnemonic(_("_Lipsum...")); +#endif gtk_widget_set_tooltip_text(menu_lipsum, _("Include Pseudotext to your code")); gtk_widget_show(menu_lipsum); g_signal_connect((gpointer) menu_lipsum, "activate", -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

Plugins-Commits May 2019