pidgin/pidgin

Replace get_stock_icon_from_primitive with the function it was calling

2020-11-12, Gary Kramlich
e57d4b9303ee
Parents d7e28f8a0994
Children fa308dd62f4c
Replace get_stock_icon_from_primitive with the function it was calling

Testing Done:
Compile only.

Reviewed at https://reviews.imfreedom.org/r/211/
1 files changed, 4 insertions(+), 10 deletions(-)
  • +4 -10
    pidgin/gtksavedstatuses.c
    • --- a/pidgin/gtksavedstatuses.c Tue Nov 10 03:30:53 2020 -0600
    +++ b/pidgin/gtksavedstatuses.c Thu Nov 12 20:14:37 2020 -0600
    @@ -350,12 +350,6 @@
    g_list_free(sel_paths);
    }
    -static const gchar *
    -get_stock_icon_from_primitive(PurpleStatusPrimitive type)
    -{
    - return pidgin_stock_id_from_status_primitive(type);
    -}
    -
    static void
    add_status_to_saved_status_list(GtkListStore *model, PurpleSavedStatus *saved_status)
    {
    @@ -371,7 +365,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 = get_stock_icon_from_primitive(purple_savedstatus_get_primitive_type(saved_status));
    + icon = pidgin_stock_id_from_status_primitive(purple_savedstatus_get_primitive_type(saved_status));
    gtk_list_store_append(model, &iter);
    gtk_list_store_set(model, &iter,
    @@ -842,7 +836,7 @@
    gtk_list_store_append(store, &iter);
    gtk_list_store_set(store, &iter,
    - STATUS_COLUMN_ICON, get_stock_icon_from_primitive(i),
    + STATUS_COLUMN_ICON, pidgin_stock_id_from_status_primitive(i),
    STATUS_COLUMN_STATUS_ID, purple_primitive_get_id_from_type(i),
    STATUS_COLUMN_STATUS_NAME, purple_primitive_get_name_from_type(i),
    -1);
    @@ -1017,7 +1011,7 @@
    STATUS_EDITOR_COLUMN_STATUS_ID, id,
    STATUS_EDITOR_COLUMN_STATUS_NAME, name,
    STATUS_EDITOR_COLUMN_STATUS_MESSAGE, message,
    - STATUS_EDITOR_COLUMN_STATUS_ICON, get_stock_icon_from_primitive(prim),
    + STATUS_EDITOR_COLUMN_STATUS_ICON, pidgin_stock_id_from_status_primitive(prim),
    -1);
    if (pixbuf != NULL)
    @@ -1341,7 +1335,7 @@
    message = talkatu_markup_get_html(dialog->message_buffer, NULL);
    }
    name = purple_status_type_get_name(type);
    - stock = get_stock_icon_from_primitive(purple_status_type_get_primitive(type));
    + stock = pidgin_stock_id_from_status_primitive(purple_status_type_get_primitive(type));
    status_editor = dialog->status_editor;