comparison: pidgin/gtkstatusbox.c
pidgin/gtkstatusbox.c
- changeset 23408
- 3dc9e98485aa
- parent 23405
- c07358e00ffc
- child 23869
- e650ca347f69
- child 24147
- b730c8d207e9
equal
deleted
inserted
replaced
| 23407:6f89ce4acd7a | 23408:3dc9e98485aa |
|---|---|
| 207 (char *)purple_status_type_get_id(purple_status_get_type(newstatus))); | 207 (char *)purple_status_type_get_id(purple_status_get_type(newstatus))); |
| 208 | 208 |
| 209 for (l = purple_account_get_status_types(account); l != NULL; l = l->next) { | 209 for (l = purple_account_get_status_types(account); l != NULL; l = l->next) { |
| 210 PurpleStatusType *status_type = (PurpleStatusType *)l->data; | 210 PurpleStatusType *status_type = (PurpleStatusType *)l->data; |
| 211 | 211 |
| 212 if (!purple_status_type_is_user_settable(status_type)) | 212 if (!purple_status_type_is_user_settable(status_type) || |
| 213 purple_status_type_is_independent(status_type)) | |
| 213 continue; | 214 continue; |
| 214 status_no++; | 215 status_no++; |
| 215 if (statustype == status_type) | 216 if (statustype == status_type) |
| 216 break; | 217 break; |
| 217 } | 218 } |
| 767 GList *l = purple_account_get_status_types(account); | 768 GList *l = purple_account_get_status_types(account); |
| 768 gint i; | 769 gint i; |
| 769 | 770 |
| 770 for (i = 0; l; l = l->next) { | 771 for (i = 0; l; l = l->next) { |
| 771 PurpleStatusType *status_type = l->data; | 772 PurpleStatusType *status_type = l->data; |
| 772 if (!purple_status_type_is_user_settable(status_type)) | 773 if (!purple_status_type_is_user_settable(status_type) || |
| 774 purple_status_type_is_independent(status_type)) | |
| 773 continue; | 775 continue; |
| 774 | 776 |
| 775 if (active == i) | 777 if (active == i) |
| 776 return status_type; | 778 return status_type; |
| 777 i++; | 779 i++; |
| 1028 for (l = purple_account_get_status_types(account); l != NULL; l = l->next) | 1030 for (l = purple_account_get_status_types(account); l != NULL; l = l->next) |
| 1029 { | 1031 { |
| 1030 PurpleStatusType *status_type = (PurpleStatusType *)l->data; | 1032 PurpleStatusType *status_type = (PurpleStatusType *)l->data; |
| 1031 PurpleStatusPrimitive prim; | 1033 PurpleStatusPrimitive prim; |
| 1032 | 1034 |
| 1033 if (!purple_status_type_is_user_settable(status_type)) | 1035 if (!purple_status_type_is_user_settable(status_type) || |
| 1036 purple_status_type_is_independent(status_type)) | |
| 1034 continue; | 1037 continue; |
| 1035 | 1038 |
| 1036 prim = purple_status_type_get_primitive(status_type); | 1039 prim = purple_status_type_get_primitive(status_type); |
| 1037 | 1040 |
| 1038 pixbuf = pidgin_status_box_get_pixbuf(status_box, prim); | 1041 pixbuf = pidgin_status_box_get_pixbuf(status_box, prim); |
| 1039 | 1042 |
| 1040 pidgin_status_box_add(PIDGIN_STATUS_BOX(status_box), | 1043 pidgin_status_box_add(PIDGIN_STATUS_BOX(status_box), |
| 1041 PIDGIN_STATUS_BOX_TYPE_PRIMITIVE, pixbuf, | 1044 PIDGIN_STATUS_BOX_TYPE_PRIMITIVE, pixbuf, |
| 1042 purple_status_type_get_name(status_type), | 1045 purple_status_type_get_name(status_type), |
| 1043 NULL, | 1046 NULL, |
