comparison: pidgin/pidginprotocolstore.c
pidgin/pidginprotocolstore.c
- changeset 41280
- 9d5a101a7663
- parent 40741
- 850137e8737c
equal
deleted
inserted
replaced
| 41279:e199eaa8d89f | 41280:9d5a101a7663 |
|---|---|
| 35 static void | 35 static void |
| 36 pidgin_protocol_store_add_protocol(PidginProtocolStore *store, | 36 pidgin_protocol_store_add_protocol(PidginProtocolStore *store, |
| 37 PurpleProtocol *protocol) | 37 PurpleProtocol *protocol) |
| 38 { | 38 { |
| 39 GtkTreeIter iter; | 39 GtkTreeIter iter; |
| 40 GdkPixbuf *pixbuf = NULL; | 40 const gchar *icon_name = NULL; |
| 41 | 41 |
| 42 pixbuf = pidgin_create_icon_from_protocol(protocol, | 42 icon_name = purple_protocol_get_icon_name(protocol); |
| 43 PIDGIN_PROTOCOL_ICON_SMALL, NULL); | |
| 44 | 43 |
| 45 gtk_list_store_append(GTK_LIST_STORE(store), &iter); | 44 gtk_list_store_append(GTK_LIST_STORE(store), &iter); |
| 46 gtk_list_store_set( | 45 gtk_list_store_set( |
| 47 GTK_LIST_STORE(store), | 46 GTK_LIST_STORE(store), |
| 48 &iter, | 47 &iter, |
| 49 PIDGIN_PROTOCOL_STORE_COLUMN_PROTOCOL, protocol, | 48 PIDGIN_PROTOCOL_STORE_COLUMN_PROTOCOL, protocol, |
| 50 PIDGIN_PROTOCOL_STORE_COLUMN_ID, purple_protocol_get_id(protocol), | 49 PIDGIN_PROTOCOL_STORE_COLUMN_ID, purple_protocol_get_id(protocol), |
| 51 PIDGIN_PROTOCOL_STORE_COLUMN_NAME, purple_protocol_get_name(protocol), | 50 PIDGIN_PROTOCOL_STORE_COLUMN_NAME, purple_protocol_get_name(protocol), |
| 52 PIDGIN_PROTOCOL_STORE_COLUMN_ICON, pixbuf, | 51 PIDGIN_PROTOCOL_STORE_COLUMN_ICON_NAME, icon_name, |
| 53 -1 | 52 -1 |
| 54 ); | 53 ); |
| 55 | |
| 56 g_clear_object(&pixbuf); | |
| 57 } | 54 } |
| 58 | 55 |
| 59 static void | 56 static void |
| 60 pidgin_protocol_store_add_protocol_helper(gpointer data, gpointer user_data) { | 57 pidgin_protocol_store_add_protocol_helper(gpointer data, gpointer user_data) { |
| 61 if(PURPLE_IS_PROTOCOL(data)) { | 58 if(PURPLE_IS_PROTOCOL(data)) { |
| 137 PurpleProtocolManager *manager = NULL; | 134 PurpleProtocolManager *manager = NULL; |
| 138 GType types[PIDGIN_PROTOCOL_STORE_N_COLUMNS] = { | 135 GType types[PIDGIN_PROTOCOL_STORE_N_COLUMNS] = { |
| 139 PURPLE_TYPE_PROTOCOL, | 136 PURPLE_TYPE_PROTOCOL, |
| 140 G_TYPE_STRING, | 137 G_TYPE_STRING, |
| 141 G_TYPE_STRING, | 138 G_TYPE_STRING, |
| 142 GDK_TYPE_PIXBUF, | 139 G_TYPE_STRING, |
| 143 }; | 140 }; |
| 144 | 141 |
| 145 gtk_list_store_set_column_types( | 142 gtk_list_store_set_column_types( |
| 146 GTK_LIST_STORE(store), | 143 GTK_LIST_STORE(store), |
| 147 PIDGIN_PROTOCOL_STORE_N_COLUMNS, | 144 PIDGIN_PROTOCOL_STORE_N_COLUMNS, |
