From ea7c42162ebbbea6e894b3349e066743bc5a9159 Mon Sep 17 00:00:00 2001 From: Ailin Nemui Date: Tue, 25 Apr 2017 00:23:36 +0200 Subject: [PATCH] compile fixes --- src/gui-keyboard.c | 2 +- src/gui-nicklist-view.c | 2 +- src/gui-tab-move.c | 2 +- src/gui-tab.c | 4 ++-- src/gui-window-activity.c | 3 --- src/gui-window.c | 2 -- src/setup-channels.c | 8 ++++---- src/setup-completion.c | 2 +- src/setup-highlighting-edit.c | 25 ++++++++++++++++++++++++- src/setup-ignores-edit.c | 25 ++++++++++++++++++++++++- src/setup-servers-server.c | 4 ++-- src/setup-servers.c | 6 +++--- 12 files changed, 63 insertions(+), 22 deletions(-) diff --git a/src/gui-keyboard.c b/src/gui-keyboard.c index 86ebcf4..eaf3850 100644 --- a/src/gui-keyboard.c +++ b/src/gui-keyboard.c @@ -80,7 +80,7 @@ char *gui_keyboard_get_event_string(GdkEventKey *event) if (event->keyval > 255) { len = cmd->len; g_string_append(cmd, gdk_keyval_name(event->keyval)); - g_strdown(cmd->str+len); + ascii_strdown(cmd->str+len); } else if (event->keyval == ' ') g_string_append(cmd, "space"); else if (event->keyval == '\n') diff --git a/src/gui-nicklist-view.c b/src/gui-nicklist-view.c index ccf75d4..c1fbc96 100644 --- a/src/gui-nicklist-view.c +++ b/src/gui-nicklist-view.c @@ -348,6 +348,6 @@ void gui_nicklist_views_deinit(void) for (i = 0; i < 256; i++) { if (status_pixbufs[i] != NULL) - gdk_pixbuf_unref(status_pixbufs[i]); + g_object_unref(status_pixbufs[i]); } } diff --git a/src/gui-tab-move.c b/src/gui-tab-move.c index 1576f61..f106413 100644 --- a/src/gui-tab-move.c +++ b/src/gui-tab-move.c @@ -70,7 +70,7 @@ static void create_pixmap_popup(GtkWidget **widget, char **data) pixbuf = gdk_pixbuf_new_from_xpm_data((const char **) data); gdk_pixbuf_render_pixmap_and_mask(pixbuf, &pixmap, &bitmap, 128); - gdk_pixbuf_unref(pixbuf); + g_object_unref(pixbuf); win = gtk_window_new(GTK_WINDOW_POPUP); image = gtk_image_new_from_pixmap(pixmap, bitmap); diff --git a/src/gui-tab.c b/src/gui-tab.c index 4724de0..998fc87 100644 --- a/src/gui-tab.c +++ b/src/gui-tab.c @@ -550,6 +550,6 @@ void gui_tabs_init(void) void gui_tabs_deinit(void) { - gdk_pixbuf_unref(move_pixbuf); - gdk_pixbuf_unref(right_pixbuf); + g_object_unref(move_pixbuf); + g_object_unref(right_pixbuf); } diff --git a/src/gui-window-activity.c b/src/gui-window-activity.c index a17889b..aec6e35 100644 --- a/src/gui-window-activity.c +++ b/src/gui-window-activity.c @@ -50,7 +50,6 @@ static void sig_activity(Window *window) static void tab_update_activity(Tab *tab) { - GdkColor color; GList *tmp; int data_level; @@ -68,8 +67,6 @@ static void tab_update_activity(Tab *tab) static void tab_clear_activity(Tab *tab) { - GList *tmp; - tab->data_level = 0; } diff --git a/src/gui-window.c b/src/gui-window.c index 9bdd6a9..f5c11a5 100644 --- a/src/gui-window.c +++ b/src/gui-window.c @@ -309,11 +309,9 @@ static void sig_window_created(Window *window, void *automatic) static void sig_window_destroyed(Window *window) { WindowGui *gui; - GtkWidget *widget; Frame *frame; gui = WINDOW_GUI(window); - widget = gui->widget; signal_emit("gui window destroyed", 1, gui); diff --git a/src/setup-channels.c b/src/setup-channels.c index f39cf41..528e44e 100644 --- a/src/setup-channels.c +++ b/src/setup-channels.c @@ -133,7 +133,7 @@ static void network_remove_with_channels(const char *network) next = tmp->next; if (channel->chatnet == NULL || - g_strcasecmp(channel->chatnet, network) != 0) + g_ascii_strcasecmp(channel->chatnet, network) != 0) continue; channel_setup_remove(channel); @@ -198,7 +198,7 @@ static gboolean store_find_network_func(GtkTreeModel *model, GtkTreePath *path, return FALSE; gtk_tree_model_get(model, iter, COL_NAME, &iter_name, -1); - if (g_strcasecmp(iter_name, rec->network) == 0) { + if (g_ascii_strcasecmp(iter_name, rec->network) == 0) { rec->found = TRUE; memcpy(rec->iter, iter, sizeof(GtkTreeIter)); } @@ -433,7 +433,7 @@ static void sig_channel_added(ChannelConfig *channel) /* we were below a network */ gtk_tree_model_get(model, &parent, COL_NAME, &name, -1); if (channel->chatnet == NULL || - g_strcasecmp(channel->chatnet, name) != 0) + g_ascii_strcasecmp(channel->chatnet, name) != 0) append = TRUE; g_free(name); } else { @@ -492,7 +492,7 @@ static int network_has_channels(const char *network) CHANNEL_SETUP_REC *rec = tmp->data; if (rec->chatnet != NULL && - g_strcasecmp(rec->chatnet, network) == 0) + g_ascii_strcasecmp(rec->chatnet, network) == 0) return TRUE; } diff --git a/src/setup-completion.c b/src/setup-completion.c index e4646f0..1458791 100644 --- a/src/setup-completion.c +++ b/src/setup-completion.c @@ -109,7 +109,7 @@ static CONFIG_NODE *completion_find_node(const char *key, int create) if (node == NULL) return NULL; - return config_node_section(node, key, create ? NODE_TYPE_BLOCK : -1); + return iconfig_node_section(node, key, create ? NODE_TYPE_BLOCK : -1); } static void completion_edited(GtkCellRendererText *cell, char *path_string, diff --git a/src/setup-highlighting-edit.c b/src/setup-highlighting-edit.c index b289b85..2c7fb6f 100644 --- a/src/setup-highlighting-edit.c +++ b/src/setup-highlighting-edit.c @@ -114,7 +114,13 @@ static void highlight_channels_store_fill(GtkListStore *store, Highlight *highli static void regexp_update_invalid(GtkToggleButton *toggle, GtkEntry *entry, GtkWidget *label) { - regex_t preg; +#ifdef USE_GREGEX + GRegex *preg; + GError *re_error; +#else + regex_t preg; + int regexp_compiled; +#endif const char *text; if (!gtk_toggle_button_get_active(toggle)) { @@ -124,6 +130,22 @@ static void regexp_update_invalid(GtkToggleButton *toggle, GtkEntry *entry, } text = gtk_entry_get_text(entry); +#ifdef USE_GREGEX + re_error = NULL; + preg = g_regex_new(text, G_REGEX_OPTIMIZE | G_REGEX_RAW | G_REGEX_CASELESS, 0, &re_error); + g_error_free(re_error); + + if (preg != NULL) { + /* regexp ok */ + g_regex_unref(preg); + + gtk_widget_hide(label); + } else { + /* invalid regexp - show the error label */ + gtk_widget_show(label); + } + +#else if (regcomp(&preg, text, REG_EXTENDED|REG_ICASE|REG_NOSUB) == 0) { /* regexp ok */ regfree(&preg); @@ -133,6 +155,7 @@ static void regexp_update_invalid(GtkToggleButton *toggle, GtkEntry *entry, /* invalid regexp - show the error label */ gtk_widget_show(label); } +#endif } static gboolean event_text_changed(GtkEntry *entry, GObject *obj) diff --git a/src/setup-ignores-edit.c b/src/setup-ignores-edit.c index e8225a2..ecc68e9 100644 --- a/src/setup-ignores-edit.c +++ b/src/setup-ignores-edit.c @@ -125,7 +125,13 @@ static void ignore_channels_store_fill(GtkListStore *store, Ignore *ignore) static void regexp_update_invalid(GtkToggleButton *toggle, GtkEntry *entry, GtkWidget *label) { - regex_t preg; +#ifdef USE_GREGEX + GRegex *preg; + GError *re_error; +#else + regex_t preg; + int regexp_compiled; +#endif const char *text; if (!gtk_toggle_button_get_active(toggle)) { @@ -135,6 +141,22 @@ static void regexp_update_invalid(GtkToggleButton *toggle, GtkEntry *entry, } text = gtk_entry_get_text(entry); +#ifdef USE_GREGEX + re_error = NULL; + preg = g_regex_new(text, G_REGEX_OPTIMIZE | G_REGEX_RAW | G_REGEX_CASELESS, 0, &re_error); + g_error_free(re_error); + + if (preg != NULL) { + /* regexp ok */ + g_regex_unref(preg); + + gtk_widget_hide(label); + } else { + /* invalid regexp - show the error label */ + gtk_widget_show(label); + } + +#else if (regcomp(&preg, text, REG_EXTENDED|REG_ICASE|REG_NOSUB) == 0) { /* regexp ok */ regfree(&preg); @@ -144,6 +166,7 @@ static void regexp_update_invalid(GtkToggleButton *toggle, GtkEntry *entry, /* invalid regexp - show the error label */ gtk_widget_show(label); } +#endif } static gboolean event_pattern_changed(GtkEntry *entry, GObject *obj) diff --git a/src/setup-servers-server.c b/src/setup-servers-server.c index af2892e..183fc46 100644 --- a/src/setup-servers-server.c +++ b/src/setup-servers-server.c @@ -64,9 +64,9 @@ static void server_save(GObject *obj, ServerConfig *server) entry = g_object_get_data(obj, "ipproto"); value = gtk_entry_get_text(entry); - if (g_strcasecmp(value, "ipv4") == 0) + if (g_ascii_strcasecmp(value, "ipv4") == 0) server->family = AF_INET; - else if (g_strcasecmp(value, "ipv6") == 0) + else if (g_ascii_strcasecmp(value, "ipv6") == 0) server->family = AF_INET6; else server->family = 0; diff --git a/src/setup-servers.c b/src/setup-servers.c index ec40b7e..671db13 100644 --- a/src/setup-servers.c +++ b/src/setup-servers.c @@ -227,7 +227,7 @@ static void network_remove_with_servers(NetworkConfig *network) next = tmp->next; if (server->chatnet == NULL || - g_strcasecmp(server->chatnet, network->name) != 0) + g_ascii_strcasecmp(server->chatnet, network->name) != 0) continue; server_setup_remove(server); @@ -349,7 +349,7 @@ static void server_store_fill_network(GtkTreeStore *store, GtkTreeIter *parent, continue; if (server->chatnet == NULL || - g_strcasecmp(server->chatnet, network->name) != 0) + g_ascii_strcasecmp(server->chatnet, network->name) != 0) continue; gtk_tree_store_append(store, &iter, parent); @@ -606,7 +606,7 @@ static void sig_server_added(ServerConfig *server) gtk_tree_model_get(model, &parent, COL_PTR, &network, -1); if (server->chatnet == NULL || - g_strcasecmp(server->chatnet, network->name) != 0) + g_ascii_strcasecmp(server->chatnet, network->name) != 0) append = TRUE; } else { /* we didn't have network */