diff options
| author |  Tom Willemsen | 2010-10-21 19:31:54 +0200 |
|---|---|---|
| committer | Tom Willemsen | 2010-10-21 19:31:54 +0200 |
| commit | 4b153e25e4b51a1cd4d7876bf6cd1dfb14744344 (patch) | |
| tree | d75368042e589d89f6a12dd9234ab7f170bfed83 | |
| parent | dcf562d835ecefb527b2138339e50e0720115069 (diff) | |
| parent | e963880636c53d1ecd11b62f1be8a3e3c0dd9160 (diff) | |
| download | eye-on-manga-4b153e25e4b51a1cd4d7876bf6cd1dfb14744344.tar.gz eye-on-manga-4b153e25e4b51a1cd4d7876bf6cd1dfb14744344.zip | |
Merge branch 'data' into eye-on-manga
Conflicts:
src/c-edit-window.c
| -rw-r--r-- | src/c-edit-window.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/c-edit-window.c b/src/c-edit-window.c index 1c03701..999daf7 100644 --- a/src/c-edit-window.c +++ b/src/c-edit-window.c @@ -137,7 +137,7 @@ static void c_edit_window_set_collection_id(CEditWindow *self, struct collection *col; gint *items; - col = data_get_collection_by_id(collection_id); + col = data_get_series_by_id(collection_id); items = data_get_items_by_collection_id(collection_id); gtk_label_set_text(GTK_LABEL(self->name_label), col->name); |