comparison: pidgin/gtkstatusbox.c
pidgin/gtkstatusbox.c
- changeset 34308
- cdb187c27360
- parent 34276
- 2b602f67f875
- child 34331
- c8486462bb63
- child 34892
- 65e25c679ca5
equal
deleted
inserted
replaced
| 34307:398577183905 | 34308:cdb187c27360 |
|---|---|
| 525 | 525 |
| 526 static void | 526 static void |
| 527 pidgin_status_box_finalize(GObject *obj) | 527 pidgin_status_box_finalize(GObject *obj) |
| 528 { | 528 { |
| 529 PidginStatusBox *statusbox = PIDGIN_STATUS_BOX(obj); | 529 PidginStatusBox *statusbox = PIDGIN_STATUS_BOX(obj); |
| 530 int i; | 530 gsize i; |
| 531 | 531 |
| 532 purple_signals_disconnect_by_handle(statusbox); | 532 purple_signals_disconnect_by_handle(statusbox); |
| 533 purple_prefs_disconnect_by_handle(statusbox); | 533 purple_prefs_disconnect_by_handle(statusbox); |
| 534 | 534 |
| 535 destroy_icon_box(statusbox); | 535 destroy_icon_box(statusbox); |
| 829 -1); | 829 -1); |
| 830 | 830 |
| 831 /* This is a special case because Primitives for the token_status_account are actually | 831 /* This is a special case because Primitives for the token_status_account are actually |
| 832 * saved statuses with substatuses for the enabled accounts */ | 832 * saved statuses with substatuses for the enabled accounts */ |
| 833 if (status_box->token_status_account && purple_savedstatus_is_transient(saved_status) | 833 if (status_box->token_status_account && purple_savedstatus_is_transient(saved_status) |
| 834 && type == PIDGIN_STATUS_BOX_TYPE_PRIMITIVE && primitive == GPOINTER_TO_INT(data)) | 834 && type == PIDGIN_STATUS_BOX_TYPE_PRIMITIVE && primitive == (PurpleStatusPrimitive)GPOINTER_TO_INT(data)) |
| 835 { | 835 { |
| 836 char *name; | 836 char *name; |
| 837 const char *acct_status_name = purple_status_get_name( | 837 const char *acct_status_name = purple_status_get_name( |
| 838 purple_account_get_active_status(status_box->token_status_account)); | 838 purple_account_get_active_status(status_box->token_status_account)); |
| 839 | 839 |
| 1155 | 1155 |
| 1156 static void | 1156 static void |
| 1157 cache_pixbufs(PidginStatusBox *status_box) | 1157 cache_pixbufs(PidginStatusBox *status_box) |
| 1158 { | 1158 { |
| 1159 GtkIconSize icon_size; | 1159 GtkIconSize icon_size; |
| 1160 int i; | 1160 gsize i; |
| 1161 | 1161 |
| 1162 g_object_set(G_OBJECT(status_box->icon_rend), "xpad", 3, NULL); | 1162 g_object_set(G_OBJECT(status_box->icon_rend), "xpad", 3, NULL); |
| 1163 icon_size = gtk_icon_size_from_name(PIDGIN_ICON_SIZE_TANGO_EXTRA_SMALL); | 1163 icon_size = gtk_icon_size_from_name(PIDGIN_ICON_SIZE_TANGO_EXTRA_SMALL); |
| 1164 | 1164 |
| 1165 for (i = 0; i < G_N_ELEMENTS(status_box->connecting_pixbufs); i++) { | 1165 for (i = 0; i < G_N_ELEMENTS(status_box->connecting_pixbufs); i++) { |
