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

Added a GTK3-only icon loader that maps stock names to non-stock icon theme names and uses the icon theme to populate cached DCC pixbufs.

Browse Source 
Guarded the GTK2 gtk_widget_render_icon() usage with #if !HAVE_GTK3 while keeping cached pix_up/pix_dn logic intact.
This commit is contained in:
deepend
2026-01-30 18:09:31 -07:00
parent 8c9f193114
commit d0d6a573a7
1 changed files with 28 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/fe-gtk/dccgui.c
View File

@@ -116,6 +116,26 @@ static short view_mode; /* 1=download 2=upload 3=both */
#define VIEW_UPLOAD 2 #define VIEW_UPLOAD 2
#define VIEW_BOTH 3 #define VIEW_BOTH 3
#if HAVE_GTK3
static GdkPixbuf *
dcc_load_icon (const char *stock_name)
{
GtkIconTheme *theme = gtk_icon_theme_get_default ();
const char *icon_name = gtkutil_icon_name_from_stock (stock_name);
int width = 16;
int height = 16;
if (g_strcmp0 (stock_name, "gtk-go-up") == 0)
icon_name = "go-up";
else if (g_strcmp0 (stock_name, "gtk-go-down") == 0)
icon_name = "go-down";
gtk_icon_size_lookup (GTK_ICON_SIZE_MENU, &width, &height);
return gtk_icon_theme_load_icon (theme, icon_name, width, 0, NULL);
}
#endif
static void static void
proper_unit (guint64 size, char *buf, size_t buf_len) proper_unit (guint64 size, char *buf, size_t buf_len)
@@ -220,8 +240,12 @@ dcc_prepare_row_send (struct DCC *dcc, GtkListStore *store, GtkTreeIter *iter,
float per; float per;
if (!pix_up) if (!pix_up)
#if HAVE_GTK3
pix_up = dcc_load_icon ("gtk-go-up");
#elif !HAVE_GTK3
pix_up = gtk_widget_render_icon (dccfwin.window, "gtk-go-up", pix_up = gtk_widget_render_icon (dccfwin.window, "gtk-go-up",
GTK_ICON_SIZE_MENU, NULL); GTK_ICON_SIZE_MENU, NULL);
#endif
/* percentage ack'ed */ /* percentage ack'ed */
per = (float) ((dcc->ack * 100.00) / dcc->size); per = (float) ((dcc->ack * 100.00) / dcc->size);
@@ -270,8 +294,12 @@ dcc_prepare_row_recv (struct DCC *dcc, GtkListStore *store, GtkTreeIter *iter,
int to_go; int to_go;
if (!pix_dn) if (!pix_dn)
#if HAVE_GTK3
pix_dn = dcc_load_icon ("gtk-go-down");
#elif !HAVE_GTK3
pix_dn = gtk_widget_render_icon (dccfwin.window, "gtk-go-down", pix_dn = gtk_widget_render_icon (dccfwin.window, "gtk-go-down",
GTK_ICON_SIZE_MENU, NULL); GTK_ICON_SIZE_MENU, NULL);
#endif
proper_unit (dcc->size, size, sizeof (size)); proper_unit (dcc->size, size, sizeof (size));
if (dcc->dccstat == STAT_QUEUED) if (dcc->dccstat == STAT_QUEUED)