deepend/zoitechat
1
0
Fork 0
mirror of https://github.com/ZoiteChat/zoitechat.git synced 2026-03-10 07:50:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #78 from ZoiteChat/gtk2-cleanup

Browse Source 
Gtk2 cleanup
This commit is contained in:
deepend-tildeclub
2026-02-23 19:59:49 +00:00
committed by GitHub
parent 0081d5c492 a79d34bcc0
commit aed21ffcae
2 changed files with 1 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/fe-gtk/banlist.c
View File

@@ -488,7 +488,6 @@ banlist_unban_inner (gpointer none, banlist_info *banl, int mode_num)
int num_sel, i; int num_sel, i;
/* grab the list of selected items */
model = GTK_TREE_MODEL (get_store (sess)); model = GTK_TREE_MODEL (get_store (sess));
sel = gtk_tree_view_get_selection (get_view (sess)); sel = gtk_tree_view_get_selection (get_view (sess));
@@ -501,14 +500,11 @@ banlist_unban_inner (gpointer none, banlist_info *banl, int mode_num)
{ {
if (gtk_tree_selection_iter_is_selected (sel, &iter)) if (gtk_tree_selection_iter_is_selected (sel, &iter))
{ {
/* Get the mask part of this selected line */
gtk_tree_model_get (model, &iter, TYPE_COLUMN, &type, MASK_COLUMN, &mask, -1); gtk_tree_model_get (model, &iter, TYPE_COLUMN, &type, MASK_COLUMN, &mask, -1);
/* If it's the wrong type of mask, just continue */
if (strcmp (_(modes[mode_num].type), type) != 0) if (strcmp (_(modes[mode_num].type), type) != 0)
continue; continue;
/* Otherwise add it to our array of mask pointers */
masks[num_sel++] = g_strdup (mask); masks[num_sel++] = g_strdup (mask);
g_free (mask); g_free (mask);
g_free (type); g_free (type);
@@ -516,11 +512,9 @@ banlist_unban_inner (gpointer none, banlist_info *banl, int mode_num)
} }
while (gtk_tree_model_iter_next (model, &iter)); while (gtk_tree_model_iter_next (model, &iter));
/* and send to server */
if (num_sel) if (num_sel)
send_channel_modes (sess, tbuf, masks, 0, num_sel, '-', modes[mode_num].letter, 0); send_channel_modes (sess, tbuf, masks, 0, num_sel, '-', modes[mode_num].letter, 0);
/* now free everything */
for (i=0; i < num_sel; i++) for (i=0; i < num_sel; i++)
g_free (masks[i]); g_free (masks[i]);
g_free (masks); g_free (masks);
@@ -536,7 +530,6 @@ banlist_unban (GtkWidget * wid, banlist_info *banl)
for (i = 0; i < MODE_CT; i++) for (i = 0; i < MODE_CT; i++)
num += banlist_unban_inner (wid, banl, i); num += banlist_unban_inner (wid, banl, i);
/* This really should not occur with the redesign */
if (num < 1) if (num < 1)
{ {
fe_message (_("You must select some bans."), FE_MSG_ERROR); fe_message (_("You must select some bans."), FE_MSG_ERROR);
@@ -602,14 +595,11 @@ banlist_crop (GtkWidget * wid, banlist_info *banl)
GSList *list = NULL, *node; GSList *list = NULL, *node;
int num_sel; int num_sel;
/* remember which bans are selected */
select = gtk_tree_view_get_selection (get_view (sess)); select = gtk_tree_view_get_selection (get_view (sess));
/* gtk_tree_selected_get_selected_rows() isn't present in gtk 2.0.x */
gtk_tree_selection_selected_foreach (select, banlist_add_selected_cb, gtk_tree_selection_selected_foreach (select, banlist_add_selected_cb,
&list); &list);
num_sel = g_slist_length (list); num_sel = g_slist_length (list);
/* select all, then unselect those that we remembered */
if (num_sel) if (num_sel)
{ {
gtk_tree_selection_select_all (select); gtk_tree_selection_select_all (select);
@@ -638,7 +628,7 @@ banlist_toggle (GtkWidget *item, gpointer data)
break; break;
} }
if (bit) /* Should be gassert() */ if (bit)
{ {
banl->checked &= ~bit; banl->checked &= ~bit;
banl->checked |= (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (item)))? bit: 0; banl->checked |= (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (item)))? bit: 0;

3
src/fe-gtk/xtext.h
View File

@@ -21,9 +21,6 @@
#define ZOITECHAT_XTEXT_H #define ZOITECHAT_XTEXT_H
#include <gtk/gtk.h> #include <gtk/gtk.h>
#if !defined(GTK_MAJOR_VERSION) || GTK_MAJOR_VERSION < 3
#include <gtk/gtkobject.h>
#endif
#include <cairo.h> #include <cairo.h>
#include "xtext-color.h" #include "xtext-color.h"