pidgin/pidgin

Replace pidgin_stock_id_from_status_primitive by pidgin_icon_name_from_status_primitive

2021-10-12, Elliott Sales de Andrade
c2471cdf5a4e
Parents a0be5525d8bd
Children 8883d8d17678
Replace pidgin_stock_id_from_status_primitive by pidgin_icon_name_from_status_primitive

Thus reducing the use of stock icons.

Testing Done:
Open saved status dialog, and also the account-specific status, and verified the type drop downs had the correct icons again.

Reviewed at https://reviews.imfreedom.org/r/1038/
4 files changed, 25 insertions(+), 63 deletions(-)
  • +1 -0
    ChangeLog.API
  • +24 -24
    pidgin/gtksavedstatuses.c
  • +0 -29
    pidgin/gtkutils.c
  • +0 -10
    pidgin/gtkutils.h
    • --- a/ChangeLog.API Tue Oct 12 04:38:45 2021 -0500
    +++ b/ChangeLog.API Tue Oct 12 04:46:36 2021 -0500
    @@ -609,6 +609,7 @@
    * purple_status_type_add_attrs_vargs
    * purple_status_type_get_primary_attr
    * purple_status_type_set_primary_attr
    + * pidgin_stock_id_from_status_primitive
    * purple_strlcat
    * purple_strlcpy
    * purple_str_binary_to_ascii
    --- a/pidgin/gtksavedstatuses.c Tue Oct 12 04:38:45 2021 -0500
    +++ b/pidgin/gtksavedstatuses.c Tue Oct 12 04:46:36 2021 -0500
    @@ -30,7 +30,7 @@
    #include "gtkutils.h"
    #include "pidgincore.h"
    #include "pidgindialog.h"
    -#include "pidginstock.h"
    +#include "pidginiconname.h"
    /*
    * TODO: Should attach to the account-deleted and account-added signals
    @@ -359,7 +359,7 @@
    title = purple_savedstatus_get_title(saved_status);
    type = purple_primitive_get_name_from_type(purple_savedstatus_get_primitive_type(saved_status));
    message = purple_markup_strip_html(purple_savedstatus_get_message(saved_status));
    - icon = pidgin_stock_id_from_status_primitive(purple_savedstatus_get_primitive_type(saved_status));
    + icon = pidgin_icon_name_from_status_primitive(purple_savedstatus_get_primitive_type(saved_status), NULL);
    gtk_list_store_append(model, &iter);
    gtk_list_store_set(model, &iter,
    @@ -462,8 +462,8 @@
    gtk_tree_view_append_column(GTK_TREE_VIEW(treeview), column);
    renderer = gtk_cell_renderer_pixbuf_new();
    gtk_tree_view_column_pack_start(column, renderer, TRUE);
    - gtk_tree_view_column_add_attribute(column, renderer, "stock-id",
    - STATUS_WINDOW_COLUMN_ICON);
    + gtk_tree_view_column_add_attribute(column, renderer, "icon-name",
    + STATUS_WINDOW_COLUMN_ICON);
    renderer = gtk_cell_renderer_text_new();
    gtk_tree_view_column_pack_start(column, renderer, TRUE);
    gtk_tree_view_column_add_attribute(column, renderer, "text",
    @@ -851,7 +851,7 @@
    gtk_list_store_append(store, &iter);
    gtk_list_store_set(store, &iter,
    - STATUS_COLUMN_ICON, pidgin_stock_id_from_status_primitive(i),
    + STATUS_COLUMN_ICON, pidgin_icon_name_from_status_primitive(i, NULL),
    STATUS_COLUMN_STATUS_ID, purple_primitive_get_id_from_type(i),
    STATUS_COLUMN_STATUS_NAME, purple_primitive_get_name_from_type(i),
    -1);
    @@ -862,7 +862,7 @@
    renderer = gtk_cell_renderer_pixbuf_new();
    gtk_cell_layout_pack_start(GTK_CELL_LAYOUT(dropdown), renderer, FALSE);
    gtk_cell_layout_set_attributes(GTK_CELL_LAYOUT(dropdown), renderer,
    - "stock-id", STATUS_COLUMN_ICON,
    + "icon-name", STATUS_COLUMN_ICON,
    NULL);
    renderer = gtk_cell_renderer_text_new();
    @@ -1026,7 +1026,7 @@
    STATUS_EDITOR_COLUMN_STATUS_ID, id,
    STATUS_EDITOR_COLUMN_STATUS_NAME, name,
    STATUS_EDITOR_COLUMN_STATUS_MESSAGE, message,
    - STATUS_EDITOR_COLUMN_STATUS_ICON, pidgin_stock_id_from_status_primitive(prim),
    + STATUS_EDITOR_COLUMN_STATUS_ICON, pidgin_icon_name_from_status_primitive(prim, NULL),
    -1);
    if (pixbuf != NULL)
    @@ -1313,7 +1313,7 @@
    PurpleStatusType *type;
    char *id = NULL;
    char *message = NULL;
    - const char *name = NULL, *stock = NULL;
    + const gchar *name = NULL, *icon_name = NULL;
    if (!gtk_combo_box_get_active_iter(dialog->box, &iter))
    {
    @@ -1329,20 +1329,20 @@
    message = talkatu_markup_get_html(dialog->message_buffer, NULL);
    }
    name = purple_status_type_get_name(type);
    - stock = pidgin_stock_id_from_status_primitive(purple_status_type_get_primitive(type));
    + icon_name = pidgin_icon_name_from_status_primitive(purple_status_type_get_primitive(type), NULL);
    status_editor = dialog->status_editor;
    if (status_editor_find_account_in_treemodel(&iter, status_editor, dialog->account))
    {
    gtk_list_store_set(status_editor->model, &iter,
    - STATUS_EDITOR_COLUMN_ENABLE_SUBSTATUS, TRUE,
    - STATUS_EDITOR_COLUMN_STATUS_ID, id,
    - STATUS_EDITOR_COLUMN_STATUS_NAME, name,
    - STATUS_EDITOR_COLUMN_STATUS_MESSAGE, message,
    - STATUS_EDITOR_COLUMN_WINDOW, NULL,
    - STATUS_EDITOR_COLUMN_STATUS_ICON, stock,
    - -1);
    + STATUS_EDITOR_COLUMN_ENABLE_SUBSTATUS, TRUE,
    + STATUS_EDITOR_COLUMN_STATUS_ID, id,
    + STATUS_EDITOR_COLUMN_STATUS_NAME, name,
    + STATUS_EDITOR_COLUMN_STATUS_MESSAGE, message,
    + STATUS_EDITOR_COLUMN_WINDOW, NULL,
    + STATUS_EDITOR_COLUMN_STATUS_ICON, icon_name,
    + -1);
    }
    gtk_widget_destroy(dialog->window);
    @@ -1442,7 +1442,7 @@
    rend = GTK_CELL_RENDERER(gtk_cell_renderer_pixbuf_new());
    gtk_cell_layout_pack_start(GTK_CELL_LAYOUT(combo), rend, FALSE);
    gtk_cell_layout_set_attributes(GTK_CELL_LAYOUT(combo), rend,
    - "stock-id", STATUS_COLUMN_ICON, NULL);
    + "icon-name", STATUS_COLUMN_ICON, NULL);
    rend = GTK_CELL_RENDERER(gtk_cell_renderer_text_new());
    gtk_cell_layout_pack_start(GTK_CELL_LAYOUT(combo), rend, TRUE);
    @@ -1523,10 +1523,10 @@
    gtk_list_store_append(dialog->model, &iter);
    gtk_list_store_set(dialog->model, &iter,
    - STATUS_COLUMN_ICON, pidgin_stock_id_from_status_primitive(prim),
    - STATUS_COLUMN_STATUS_ID, id,
    - STATUS_COLUMN_STATUS_NAME, name,
    - -1);
    + STATUS_COLUMN_ICON, pidgin_icon_name_from_status_primitive(prim, NULL),
    + STATUS_COLUMN_STATUS_ID, id,
    + STATUS_COLUMN_STATUS_NAME, name,
    + -1);
    if ((status_id != NULL) && purple_strequal(status_id, id))
    {
    gtk_combo_box_set_active_iter(GTK_COMBO_BOX(combo), &iter);
    @@ -1637,7 +1637,7 @@
    gtk_list_store_append(model, &iter);
    gtk_list_store_set(model, &iter,
    SS_MENU_TYPE_COLUMN, SS_MENU_ENTRY_TYPE_PRIMITIVE,
    - SS_MENU_ICON_COLUMN, pidgin_stock_id_from_status_primitive(primitive),
    + SS_MENU_ICON_COLUMN, pidgin_icon_name_from_status_primitive(primitive, NULL),
    SS_MENU_TEXT_COLUMN, purple_primitive_get_name_from_type(primitive),
    SS_MENU_DATA_COLUMN, GINT_TO_POINTER(primitive),
    SS_MENU_EMBLEM_VISIBLE_COLUMN, FALSE,
    @@ -1663,7 +1663,7 @@
    primitive = purple_savedstatus_get_primitive_type(status);
    gtk_list_store_set(store, iter,
    SS_MENU_TYPE_COLUMN, SS_MENU_ENTRY_TYPE_SAVEDSTATUS,
    - SS_MENU_ICON_COLUMN, pidgin_stock_id_from_status_primitive(primitive),
    + SS_MENU_ICON_COLUMN, pidgin_icon_name_from_status_primitive(primitive, NULL),
    SS_MENU_TEXT_COLUMN, purple_savedstatus_get_title(status),
    SS_MENU_DATA_COLUMN, GINT_TO_POINTER(purple_savedstatus_get_creation_time(status)),
    SS_MENU_EMBLEM_COLUMN, "document-save",
    @@ -1797,7 +1797,7 @@
    gtk_cell_layout_pack_start(GTK_CELL_LAYOUT(combobox), icon_rend, FALSE);
    gtk_cell_layout_pack_start(GTK_CELL_LAYOUT(combobox), text_rend, TRUE);
    gtk_cell_layout_pack_start(GTK_CELL_LAYOUT(combobox), emblem_rend, FALSE);
    - gtk_cell_layout_set_attributes(GTK_CELL_LAYOUT(combobox), icon_rend, "stock-id", SS_MENU_ICON_COLUMN, NULL);
    + gtk_cell_layout_set_attributes(GTK_CELL_LAYOUT(combobox), icon_rend, "icon-name", SS_MENU_ICON_COLUMN, NULL);
    gtk_cell_layout_set_attributes(GTK_CELL_LAYOUT(combobox), text_rend, "markup", SS_MENU_TEXT_COLUMN, NULL);
    gtk_cell_layout_set_attributes(GTK_CELL_LAYOUT(combobox), emblem_rend,
    "icon-name", SS_MENU_EMBLEM_COLUMN, "visible", SS_MENU_EMBLEM_VISIBLE_COLUMN, NULL);
    --- a/pidgin/gtkutils.c Tue Oct 12 04:38:45 2021 -0500
    +++ b/pidgin/gtkutils.c Tue Oct 12 04:46:36 2021 -0500
    @@ -906,35 +906,6 @@
    *height = 100;
    }
    -const gchar *
    -pidgin_stock_id_from_status_primitive(PurpleStatusPrimitive prim) {
    - const gchar *stock = NULL;
    - switch (prim) {
    - case PURPLE_STATUS_UNSET:
    - stock = NULL;
    - break;
    - case PURPLE_STATUS_UNAVAILABLE:
    - stock = PIDGIN_STOCK_STATUS_BUSY;
    - break;
    - case PURPLE_STATUS_AWAY:
    - stock = PIDGIN_STOCK_STATUS_AWAY;
    - break;
    - case PURPLE_STATUS_EXTENDED_AWAY:
    - stock = PIDGIN_STOCK_STATUS_XA;
    - break;
    - case PURPLE_STATUS_INVISIBLE:
    - stock = PIDGIN_STOCK_STATUS_INVISIBLE;
    - break;
    - case PURPLE_STATUS_OFFLINE:
    - stock = PIDGIN_STOCK_STATUS_OFFLINE;
    - break;
    - default:
    - stock = PIDGIN_STOCK_STATUS_AVAILABLE;
    - break;
    - }
    - return stock;
    -}
    -
    GdkPixbuf *
    pidgin_create_protocol_icon(PurpleAccount *account, PidginProtocolIconSize size)
    {
    --- a/pidgin/gtkutils.h Tue Oct 12 04:38:45 2021 -0500
    +++ b/pidgin/gtkutils.h Tue Oct 12 04:46:36 2021 -0500
    @@ -294,16 +294,6 @@
    GdkPixbuf *pidgin_create_icon_from_protocol(PurpleProtocol *protocol, PidginProtocolIconSize size, PurpleAccount *account);
    /**
    - * pidgin_stock_id_from_status_primitive:
    - * @prim: The status primitive
    - *
    - * Returns an appropriate stock-id for a status primitive.
    - *
    - * Returns: The stock-id
    - */
    -const char *pidgin_stock_id_from_status_primitive(PurpleStatusPrimitive prim);
    -
    -/**
    * pidgin_append_menu_action:
    * @menu: The menu to append to.
    * @act: The PurpleActionMenu to append.