From f4abb089617da22d4df6c50bdcc649202a2294b2 Mon Sep 17 00:00:00 2001 From: Sagar Chalise Date: Fri, 19 Feb 2016 19:30:16 +0545 Subject: [PATCH 1/4] Macro gtk3 compatibility [Needs testing] --- geanymacro/src/geanymacro.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/geanymacro/src/geanymacro.c b/geanymacro/src/geanymacro.c index 18386d9ef..02d2566ec 100644 --- a/geanymacro/src/geanymacro.c +++ b/geanymacro/src/geanymacro.c @@ -174,12 +174,12 @@ enum GEANY_MACRO_BUTTON { GeanyPlugin *geany_plugin; GeanyData *geany_data; +GeanyFunctions *geany_functions; -PLUGIN_VERSION_CHECK(224) +PLUGIN_VERSION_CHECK(147) -PLUGIN_SET_TRANSLATABLE_INFO(LOCALEDIR, GETTEXT_PACKAGE, - _("Macros"),_("Macros for Geany"), - "1.1","William Fraser ") +PLUGIN_SET_INFO(_("Macros"),_("Macros for Geany"), + "1.1","William Fraser ") /* Plugin user alterable settings */ static gboolean bSaveMacros=TRUE; @@ -1399,10 +1399,10 @@ static void EditSearchOptions(GtkTreeModel *model,GtkTreeIter *iter) gtk_widget_show(vbox); /* create combobox to hold search direction */ - gtkcb=gtk_combo_box_text_new(); - gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(gtkcb),_("Search Forwards")); - gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(gtkcb),_("Search Backwards")); - gtk_combo_box_set_active(GTK_COMBO_BOX(gtkcb),(mde->message==SCI_SEARCHNEXT)?0:1); + gtkcb=gtk_combo_box_new_text(); + gtk_combo_box_append_text((GtkComboBox*)gtkcb,_("Search Forwards")); + gtk_combo_box_append_text((GtkComboBox*)gtkcb,_("Search Backwards")); + gtk_combo_box_set_active((GtkComboBox*)gtkcb,(mde->message==SCI_SEARCHNEXT)?0:1); gtk_box_pack_start(GTK_BOX(vbox),gtkcb,FALSE,FALSE,2); gtk_widget_show(gtkcb); @@ -1808,8 +1808,8 @@ static void EditMacroElements(Macro *m) GTK_SELECTION_SINGLE); /* add table to dialog */ - gtk_container_add(GTK_CONTAINER(gtk_dialog_get_content_area(GTK_DIALOG(dialog))),table); -/* gtk_box_pack_start(GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(dialog))),table,FALSE,FALSE,2);*/ + gtk_container_add(GTK_CONTAINER(GTK_DIALOG(dialog)->vbox),table); +/* gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog)->vbox),table,FALSE,FALSE,2);*/ gtk_widget_show(table); /* add buttons */ From 433d2b118f74424f5df9e153f9029c8d28d28bdc Mon Sep 17 00:00:00 2001 From: Sagar Chalise Date: Sat, 18 Jun 2016 16:09:47 +0545 Subject: [PATCH 2/4] upstream compatibility --- geanymacro/src/geanymacro.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/geanymacro/src/geanymacro.c b/geanymacro/src/geanymacro.c index 02d2566ec..18386d9ef 100644 --- a/geanymacro/src/geanymacro.c +++ b/geanymacro/src/geanymacro.c @@ -174,12 +174,12 @@ enum GEANY_MACRO_BUTTON { GeanyPlugin *geany_plugin; GeanyData *geany_data; -GeanyFunctions *geany_functions; -PLUGIN_VERSION_CHECK(147) +PLUGIN_VERSION_CHECK(224) -PLUGIN_SET_INFO(_("Macros"),_("Macros for Geany"), - "1.1","William Fraser ") +PLUGIN_SET_TRANSLATABLE_INFO(LOCALEDIR, GETTEXT_PACKAGE, + _("Macros"),_("Macros for Geany"), + "1.1","William Fraser ") /* Plugin user alterable settings */ static gboolean bSaveMacros=TRUE; @@ -1399,10 +1399,10 @@ static void EditSearchOptions(GtkTreeModel *model,GtkTreeIter *iter) gtk_widget_show(vbox); /* create combobox to hold search direction */ - gtkcb=gtk_combo_box_new_text(); - gtk_combo_box_append_text((GtkComboBox*)gtkcb,_("Search Forwards")); - gtk_combo_box_append_text((GtkComboBox*)gtkcb,_("Search Backwards")); - gtk_combo_box_set_active((GtkComboBox*)gtkcb,(mde->message==SCI_SEARCHNEXT)?0:1); + gtkcb=gtk_combo_box_text_new(); + gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(gtkcb),_("Search Forwards")); + gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(gtkcb),_("Search Backwards")); + gtk_combo_box_set_active(GTK_COMBO_BOX(gtkcb),(mde->message==SCI_SEARCHNEXT)?0:1); gtk_box_pack_start(GTK_BOX(vbox),gtkcb,FALSE,FALSE,2); gtk_widget_show(gtkcb); @@ -1808,8 +1808,8 @@ static void EditMacroElements(Macro *m) GTK_SELECTION_SINGLE); /* add table to dialog */ - gtk_container_add(GTK_CONTAINER(GTK_DIALOG(dialog)->vbox),table); -/* gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog)->vbox),table,FALSE,FALSE,2);*/ + gtk_container_add(GTK_CONTAINER(gtk_dialog_get_content_area(GTK_DIALOG(dialog))),table); +/* gtk_box_pack_start(GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(dialog))),table,FALSE,FALSE,2);*/ gtk_widget_show(table); /* add buttons */ From 280902ad73fdee54c9df8dbbf79956652b73304f Mon Sep 17 00:00:00 2001 From: Sagar Chalise Date: Thu, 21 Jul 2016 21:13:31 +0545 Subject: [PATCH 3/4] Gtk3 support --- build/geanydoc.m4 | 1 - geanydoc/src/geanydoc.c | 24 +++++++++++------------- 2 files changed, 11 insertions(+), 14 deletions(-) diff --git a/build/geanydoc.m4 b/build/geanydoc.m4 index 25fddd1cc..6d203cf0a 100644 --- a/build/geanydoc.m4 +++ b/build/geanydoc.m4 @@ -1,7 +1,6 @@ AC_DEFUN([GP_CHECK_GEANYDOC], [ GP_ARG_DISABLE([GeanyDoc], [auto]) - GP_CHECK_PLUGIN_GTK2_ONLY([GeanyDoc]) GP_COMMIT_PLUGIN_STATUS([GeanyDoc]) AC_CONFIG_FILES([ geanydoc/Makefile diff --git a/geanydoc/src/geanydoc.c b/geanydoc/src/geanydoc.c index 4446dddbc..089c4ac07 100644 --- a/geanydoc/src/geanydoc.c +++ b/geanydoc/src/geanydoc.c @@ -256,7 +256,7 @@ on_comboboxType_changed(GtkComboBox * combobox, G_GNUC_UNUSED gpointer user_data GKeyFile *config = (GKeyFile *) g_object_get_data(G_OBJECT(combobox), "config"); from = g_object_get_data(G_OBJECT(combobox), "current"); - to = gtk_combo_box_get_active_text(combobox); + to = gtk_combo_box_text_get_active_text(combobox); if (from != NULL) { @@ -284,7 +284,7 @@ on_comboboxType_changed(GtkComboBox * combobox, G_GNUC_UNUSED gpointer user_data #define GLADE_HOOKUP_OBJECT(component,widget,name) \ g_object_set_data_full (G_OBJECT (component), name, \ - gtk_widget_ref (widget), (GDestroyNotify) gtk_widget_unref) + g_object_ref (widget), (GDestroyNotify) gtk_widget_destroy) #define GLADE_HOOKUP_OBJECT_NO_REF(component,widget,name) \ g_object_set_data (G_OBJECT (component), name, widget) @@ -292,7 +292,6 @@ on_comboboxType_changed(GtkComboBox * combobox, G_GNUC_UNUSED gpointer user_data GtkWidget * create_Interactive(void) { - GtkWidget *dialog_vbox1; GtkWidget *entry_word; GtkWidget *dialog = gtk_dialog_new_with_buttons("Document interactive", GTK_WINDOW(geany->main_widgets->window), @@ -303,12 +302,9 @@ create_Interactive(void) GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT, NULL); - dialog_vbox1 = GTK_DIALOG(dialog)->vbox; - entry_word = gtk_entry_new(); gtk_widget_show(entry_word); - gtk_box_pack_start(GTK_BOX(dialog_vbox1), entry_word, TRUE, TRUE, 0); - + gtk_container_add(GTK_CONTAINER(gtk_dialog_get_content_area(GTK_DIALOG(dialog))), entry_word); GLADE_HOOKUP_OBJECT(dialog, entry_word, "entry_word"); return dialog; @@ -336,7 +332,9 @@ create_Configure(void) gtk_window_set_title(GTK_WINDOW(Configure), _("Doc")); gtk_window_set_type_hint(GTK_WINDOW(Configure), GDK_WINDOW_TYPE_HINT_DIALOG); - dialog_vbox1 = GTK_DIALOG(Configure)->vbox; + dialog_vbox1 = gtk_vbox_new(FALSE, 6); + gtk_container_add(GTK_CONTAINER(gtk_dialog_get_content_area(GTK_DIALOG(Configure))), dialog_vbox1); + gtk_widget_show(dialog_vbox1); vbox1 = gtk_vbox_new(FALSE, 0); @@ -347,7 +345,7 @@ create_Configure(void) gtk_widget_show(cbIntern); gtk_box_pack_start(GTK_BOX(vbox1), cbIntern, FALSE, FALSE, 0); - comboboxType = gtk_combo_box_new_text(); + comboboxType = gtk_combo_box_text_new(); gtk_widget_show(comboboxType); gtk_box_pack_start(GTK_BOX(vbox1), comboboxType, FALSE, FALSE, 0); @@ -383,19 +381,19 @@ create_Configure(void) gtk_widget_show(label2); gtk_box_pack_start(GTK_BOX(dialog_vbox1), label2, FALSE, FALSE, 0); - dialog_action_area1 = GTK_DIALOG(Configure)->action_area; + dialog_action_area1 = gtk_dialog_get_action_area(GTK_DIALOG(Configure)); gtk_widget_show(dialog_action_area1); gtk_button_box_set_layout(GTK_BUTTON_BOX(dialog_action_area1), GTK_BUTTONBOX_END); cancelbutton1 = gtk_button_new_from_stock("gtk-cancel"); gtk_widget_show(cancelbutton1); gtk_dialog_add_action_widget(GTK_DIALOG(Configure), cancelbutton1, GTK_RESPONSE_CANCEL); - GTK_WIDGET_SET_FLAGS(cancelbutton1, GTK_CAN_DEFAULT); + gtk_widget_set_can_default(cancelbutton1, TRUE); okbutton1 = gtk_button_new_from_stock("gtk-ok"); gtk_widget_show(okbutton1); gtk_dialog_add_action_widget(GTK_DIALOG(Configure), okbutton1, GTK_RESPONSE_OK); - GTK_WIDGET_SET_FLAGS(okbutton1, GTK_CAN_DEFAULT); + gtk_widget_set_can_default(okbutton1, TRUE); g_signal_connect_after((gpointer) comboboxType, "changed", G_CALLBACK(on_comboboxType_changed), NULL); @@ -452,7 +450,7 @@ init_Configure(GtkWidget * dialog) for (i = 0; i < geany->filetypes_array->len; i++) { - gtk_combo_box_append_text(GTK_COMBO_BOX(cbTypes), + gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(cbTypes), ((struct GeanyFiletype *) (filetypes[i]))-> name); } From 34e015bd34e8f17237d3d1a9c6fd73419c4c4cd6 Mon Sep 17 00:00:00 2001 From: Sagar Chalise Date: Thu, 21 Jul 2016 23:25:27 +0545 Subject: [PATCH 4/4] Changes according to pr comment --- geanydoc/src/geanydoc.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/geanydoc/src/geanydoc.c b/geanydoc/src/geanydoc.c index 089c4ac07..bfaa5bbe4 100644 --- a/geanydoc/src/geanydoc.c +++ b/geanydoc/src/geanydoc.c @@ -284,7 +284,7 @@ on_comboboxType_changed(GtkComboBox * combobox, G_GNUC_UNUSED gpointer user_data #define GLADE_HOOKUP_OBJECT(component,widget,name) \ g_object_set_data_full (G_OBJECT (component), name, \ - g_object_ref (widget), (GDestroyNotify) gtk_widget_destroy) + g_object_ref (widget), (GDestroyNotify) g_object_unref) #define GLADE_HOOKUP_OBJECT_NO_REF(component,widget,name) \ g_object_set_data (G_OBJECT (component), name, widget) @@ -292,6 +292,7 @@ on_comboboxType_changed(GtkComboBox * combobox, G_GNUC_UNUSED gpointer user_data GtkWidget * create_Interactive(void) { + GtkWidget *dialog_vbox1; GtkWidget *entry_word; GtkWidget *dialog = gtk_dialog_new_with_buttons("Document interactive", GTK_WINDOW(geany->main_widgets->window), @@ -302,9 +303,12 @@ create_Interactive(void) GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT, NULL); + dialog_vbox1 = gtk_dialog_get_content_area(GTK_DIALOG(dialog)); + entry_word = gtk_entry_new(); gtk_widget_show(entry_word); - gtk_container_add(GTK_CONTAINER(gtk_dialog_get_content_area(GTK_DIALOG(dialog))), entry_word); + gtk_box_pack_start(GTK_BOX(dialog_vbox1), entry_word, TRUE, TRUE, 0); + GLADE_HOOKUP_OBJECT(dialog, entry_word, "entry_word"); return dialog; @@ -332,9 +336,7 @@ create_Configure(void) gtk_window_set_title(GTK_WINDOW(Configure), _("Doc")); gtk_window_set_type_hint(GTK_WINDOW(Configure), GDK_WINDOW_TYPE_HINT_DIALOG); - dialog_vbox1 = gtk_vbox_new(FALSE, 6); - gtk_container_add(GTK_CONTAINER(gtk_dialog_get_content_area(GTK_DIALOG(Configure))), dialog_vbox1); - + dialog_vbox1 = gtk_dialog_get_content_area(GTK_DIALOG(Configure)); gtk_widget_show(dialog_vbox1); vbox1 = gtk_vbox_new(FALSE, 0);