pidgin/pidgin

Clean up pidgin_stock_id_from_status_primitive which is on its way out.

2021-08-12, Gary Kramlich
4cf487837afc
Parents f1bdc43bf086
Children 74367ae3c5c3
Clean up pidgin_stock_id_from_status_primitive which is on its way out.

Clean up `pidgin_stock_id_from_status_primitive` which is on its way out.

Testing Done:
Verified the status menu in preferences was unchanged.

Reviewed at https://reviews.imfreedom.org/r/890/
1 files changed, 8 insertions(+), 15 deletions(-)
  • +8 -15
    pidgin/gtkutils.c
    • --- a/pidgin/gtkutils.c Sat Aug 07 04:03:59 2021 -0500
    +++ b/pidgin/gtkutils.c Thu Aug 12 00:50:00 2021 -0500
    @@ -917,42 +917,35 @@
    *height = 100;
    }
    -static const char *
    -stock_id_from_status_primitive_idle(PurpleStatusPrimitive prim, gboolean idle)
    -{
    - const char *stock = NULL;
    +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 = idle ? PIDGIN_STOCK_STATUS_BUSY_I : PIDGIN_STOCK_STATUS_BUSY;
    + stock = PIDGIN_STOCK_STATUS_BUSY;
    break;
    case PURPLE_STATUS_AWAY:
    - stock = idle ? PIDGIN_STOCK_STATUS_AWAY_I : PIDGIN_STOCK_STATUS_AWAY;
    + stock = PIDGIN_STOCK_STATUS_AWAY;
    break;
    case PURPLE_STATUS_EXTENDED_AWAY:
    - stock = idle ? PIDGIN_STOCK_STATUS_XA_I : PIDGIN_STOCK_STATUS_XA;
    + stock = PIDGIN_STOCK_STATUS_XA;
    break;
    case PURPLE_STATUS_INVISIBLE:
    stock = PIDGIN_STOCK_STATUS_INVISIBLE;
    break;
    case PURPLE_STATUS_OFFLINE:
    - stock = idle ? PIDGIN_STOCK_STATUS_OFFLINE_I : PIDGIN_STOCK_STATUS_OFFLINE;
    + stock = PIDGIN_STOCK_STATUS_OFFLINE;
    break;
    default:
    - stock = idle ? PIDGIN_STOCK_STATUS_AVAILABLE_I : PIDGIN_STOCK_STATUS_AVAILABLE;
    + stock = PIDGIN_STOCK_STATUS_AVAILABLE;
    break;
    }
    return stock;
    }
    -const char *
    -pidgin_stock_id_from_status_primitive(PurpleStatusPrimitive prim)
    -{
    - return stock_id_from_status_primitive_idle(prim, FALSE);
    -}
    -
    GdkPixbuf *
    pidgin_create_protocol_icon(PurpleAccount *account, PidginProtocolIconSize size)
    {