Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

A few GeanyCtags (suggested) fixes #167

Closed
wants to merge 4 commits into from
Closed

A few GeanyCtags (suggested) fixes #167

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
67b3dda
geanyctags: Remove unnecessary trailing semicolons
b4n Oct 20, 2014
903438b
geanyctags: Add a missing initializer
b4n Oct 20, 2014
732faae
geanyctags: Use proper C prototypes for functions without arguments
b4n Oct 20, 2014
5e680b1
geanyctags: Fix GTK3 compatibility
b4n Oct 20, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 18 additions & 10 deletions geanyctags/src/geanyctags.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,11 +38,19 @@
#include <signal.h>


PLUGIN_VERSION_CHECK(211);
/* Pre-GTK 2.24 compatibility */
#ifndef GTK_COMBO_BOX_TEXT
# define GTK_COMBO_BOX_TEXT GTK_COMBO_BOX
# define gtk_combo_box_text_new gtk_combo_box_new_text
# define gtk_combo_box_text_append_text gtk_combo_box_append_text
#endif


PLUGIN_VERSION_CHECK(211)
PLUGIN_SET_INFO("GeanyCtags",
_("Ctags generation and search plugin for geany projects"),
VERSION,
"Jiri Techet <techet@gmail.com>");
"Jiri Techet <techet@gmail.com>")

GeanyPlugin *geany_plugin;
GeanyData *geany_data;
Expand All @@ -60,7 +68,7 @@ static struct
GtkWidget *combo_match;
GtkWidget *case_sensitive;
GtkWidget *declaration;
} s_ft_dialog = {NULL, NULL, NULL, NULL};
} s_ft_dialog = {NULL, NULL, NULL, NULL, NULL};


enum
Expand Down Expand Up @@ -167,7 +175,7 @@ static void spawn_cmd(const gchar *cmd, const gchar *dir)
g_free(out);
}

static gchar *get_tags_filename()
static gchar *get_tags_filename(void)
{
gchar *ret = NULL;

Expand Down Expand Up @@ -288,7 +296,7 @@ static void show_entry(tagEntry *entry)
}


static gchar *get_selection()
static gchar *get_selection(void)
{
gchar *ret = NULL;
GeanyDocument *doc = document_get_current();
Expand Down Expand Up @@ -496,7 +504,7 @@ static void on_find_definition(GtkMenuItem *menuitem, gpointer user_data)
g_free(name);
}

static void create_dialog_find_file()
static void create_dialog_find_file(void)
{
GtkWidget *label, *vbox, *ebox, *entry;
GtkSizeGroup *size_group;
Expand Down Expand Up @@ -538,10 +546,10 @@ static void create_dialog_find_file()
gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
gtk_size_group_add_widget(size_group, label);

s_ft_dialog.combo_match = gtk_combo_box_new_text();
gtk_combo_box_append_text(GTK_COMBO_BOX(s_ft_dialog.combo_match), "full");
gtk_combo_box_append_text(GTK_COMBO_BOX(s_ft_dialog.combo_match), "prefix");
gtk_combo_box_append_text(GTK_COMBO_BOX(s_ft_dialog.combo_match), "pattern");
s_ft_dialog.combo_match = gtk_combo_box_text_new();
gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(s_ft_dialog.combo_match), "full");
gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(s_ft_dialog.combo_match), "prefix");
gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(s_ft_dialog.combo_match), "pattern");
gtk_combo_box_set_active(GTK_COMBO_BOX(s_ft_dialog.combo_match), 1);
gtk_label_set_mnemonic_widget(GTK_LABEL(label), s_ft_dialog.combo_match);

Expand Down