rewtguy/pidgin

Convert the status box to use icon names instead of stock IDs

2021-10-01, Elliott Sales de Andrade
b46de1b53654
Parents c5ef99d267c3
Children 00e6bda3ef95
Convert the status box to use icon names instead of stock IDs

Testing Done:
Compiled and looked at status box. Not sure if the fallback should be 'user-offline' or something else.

Reviewed at https://reviews.imfreedom.org/r/971/
1 files changed, 11 insertions(+), 11 deletions(-)
  • +11 -11
    pidgin/gtkstatusbox.c
    • --- a/pidgin/gtkstatusbox.c Fri Oct 01 01:02:39 2021 -0500
    +++ b/pidgin/gtkstatusbox.c Fri Oct 01 01:04:00 2021 -0500
    @@ -49,7 +49,7 @@
    #include "gtkutils.h"
    #include "pidgincore.h"
    #include "pidgingdkpixbuf.h"
    -#include "pidginstock.h"
    +#include "pidginiconname.h"
    /* Timeout for typing notifications in seconds */
    #define TYPING_TIMEOUT 4
    @@ -145,8 +145,8 @@
    /* A PidginStatusBoxItemType */
    TYPE_COLUMN,
    - /* This is the stock-id for the icon. */
    - ICON_STOCK_COLUMN,
    + /* This is the icon-name for the icon. */
    + ICON_NAME_COLUMN,
    /*
    * This is a GdkPixbuf (the other columns are strings).
    @@ -398,7 +398,7 @@
    const char *aa_color;
    PurpleSavedStatus *saved_status;
    char *primary, *secondary, *text;
    - const char *stock = NULL;
    + const char *icon_name = NULL;
    GdkPixbuf *emblem = NULL;
    GtkTreePath *path;
    gboolean account_status = FALSE;
    @@ -452,7 +452,7 @@
    prim = purple_savedstatus_get_primitive_type(saved_status);
    }
    - stock = pidgin_stock_id_from_status_primitive(prim);
    + icon_name = pidgin_icon_name_from_status_primitive(prim, "user-offline");
    }
    aa_color = pidgin_get_dim_grey_string(GTK_WIDGET(status_box));
    @@ -475,7 +475,7 @@
    * really need to be a list store?)
    */
    gtk_list_store_set(status_box->store, &(status_box->iter),
    - ICON_STOCK_COLUMN, (gpointer)stock,
    + ICON_NAME_COLUMN, icon_name,
    TEXT_COLUMN, text,
    EMBLEM_COLUMN, emblem,
    EMBLEM_VISIBLE_COLUMN, (emblem != NULL),
    @@ -1318,7 +1318,7 @@
    gtk_tree_view_column_pack_start(status_box->column, icon_rend, FALSE);
    gtk_tree_view_column_pack_start(status_box->column, text_rend, TRUE);
    gtk_tree_view_column_pack_start(status_box->column, emblem_rend, FALSE);
    - gtk_tree_view_column_set_attributes(status_box->column, icon_rend, "stock-id", ICON_STOCK_COLUMN, NULL);
    + gtk_tree_view_column_set_attributes(status_box->column, icon_rend, "icon-name", ICON_NAME_COLUMN, NULL);
    gtk_tree_view_column_set_attributes(status_box->column, text_rend, "markup", TEXT_COLUMN, NULL);
    gtk_tree_view_column_set_attributes(status_box->column, emblem_rend, "icon-name", EMBLEM_COLUMN, "visible", EMBLEM_VISIBLE_COLUMN, NULL);
    @@ -1339,7 +1339,7 @@
    gtk_cell_layout_pack_start(GTK_CELL_LAYOUT(status_box->cell_view), status_box->icon_rend, FALSE);
    gtk_cell_layout_pack_start(GTK_CELL_LAYOUT(status_box->cell_view), status_box->text_rend, TRUE);
    gtk_cell_layout_pack_start(GTK_CELL_LAYOUT(status_box->cell_view), emblem_rend, FALSE);
    - gtk_cell_layout_set_attributes(GTK_CELL_LAYOUT(status_box->cell_view), status_box->icon_rend, "stock-id", ICON_STOCK_COLUMN, NULL);
    + gtk_cell_layout_set_attributes(GTK_CELL_LAYOUT(status_box->cell_view), status_box->icon_rend, "icon-name", ICON_NAME_COLUMN, NULL);
    gtk_cell_layout_set_attributes(GTK_CELL_LAYOUT(status_box->cell_view), status_box->text_rend, "markup", TEXT_COLUMN, NULL);
    gtk_cell_layout_set_attributes(GTK_CELL_LAYOUT(status_box->cell_view), emblem_rend, "pixbuf", EMBLEM_COLUMN, "visible", EMBLEM_VISIBLE_COLUMN, NULL);
    g_object_set(status_box->text_rend, "ellipsize", PANGO_ELLIPSIZE_END, NULL);
    @@ -1538,7 +1538,7 @@
    {
    GtkTreeIter iter;
    char *text;
    - const char *stock = NULL;
    + const char *icon_name = NULL;
    if (desc == NULL)
    {
    @@ -1572,13 +1572,13 @@
    }
    }
    - stock = pidgin_stock_id_from_status_primitive(prim);
    + icon_name = pidgin_icon_name_from_status_primitive(prim, "user-offline");
    }
    gtk_list_store_append(status_box->dropdown_store, &iter);
    gtk_list_store_set(status_box->dropdown_store, &iter,
    TYPE_COLUMN, type,
    - ICON_STOCK_COLUMN, stock,
    + ICON_NAME_COLUMN, icon_name,
    TEXT_COLUMN, text,
    TITLE_COLUMN, title,
    DESC_COLUMN, desc,