diff options
| author | Christopher James Lahey <clahey@ximian.com> | 2001-06-11 17:29:36 +0800 |
|---|---|---|
| committer | Chris Lahey <clahey@src.gnome.org> | 2001-06-11 17:29:36 +0800 |
| commit | 4b58038f453d5d84169611269e57160e65e9f569 (patch) | |
| tree | 76b488ec336d61b02dcf14af5b0317027eaeb3a5 /addressbook/gui | |
| parent | 538e971cd862655c725b5b5ba5d020efcd949eef (diff) | |
| download | gsoc2013-evolution-4b58038f453d5d84169611269e57160e65e9f569.tar.gz gsoc2013-evolution-4b58038f453d5d84169611269e57160e65e9f569.tar.zst gsoc2013-evolution-4b58038f453d5d84169611269e57160e65e9f569.zip | |
Made e_card_simple_get_id return const char *.
2001-06-11 Christopher James Lahey <clahey@ximian.com>
* backend/ebook/e-card-simple.c, backend/ebook/e-card-simple.h:
Made e_card_simple_get_id return const char *.
* backend/ebook/e-card.c, backend/ebook/e-card.h: Made
e_card_get_id return const char *.
* gui/component/e-cardlist-model.c (e_cardlist_model_add): Made id
variable const here. Added a break to make it slightly more
efficient.
* gui/widgets/e-minicard.c, gui/widgets/e-minicard.h: Made
e_minicard_get_card_id return const char *.
svn path=/trunk/; revision=10183
Diffstat (limited to 'addressbook/gui')
| -rw-r--r-- | addressbook/gui/component/e-cardlist-model.c | 3 | ||||
| -rw-r--r-- | addressbook/gui/widgets/e-minicard.c | 2 | ||||
| -rw-r--r-- | addressbook/gui/widgets/e-minicard.h | 10 |
3 files changed, 9 insertions, 6 deletions
diff --git a/addressbook/gui/component/e-cardlist-model.c b/addressbook/gui/component/e-cardlist-model.c index 007aa395d9..9c5ca84379 100644 --- a/addressbook/gui/component/e-cardlist-model.c +++ b/addressbook/gui/component/e-cardlist-model.c @@ -121,10 +121,11 @@ e_cardlist_model_add(ECardlistModel *model, model->data = g_realloc(model->data, model->data_count + count * sizeof(ECard *)); for (i = 0; i < count; i++) { gboolean found = FALSE; - gchar *id = e_card_get_id(cards[i]); + const gchar *id = e_card_get_id(cards[i]); for ( i = 0; i < model->data_count; i++) { if ( !strcmp(e_card_simple_get_id(model->data[i]), id) ) { found = TRUE; + break; } } if (!found) { diff --git a/addressbook/gui/widgets/e-minicard.c b/addressbook/gui/widgets/e-minicard.c index cf93f52423..1627dd722a 100644 --- a/addressbook/gui/widgets/e-minicard.c +++ b/addressbook/gui/widgets/e-minicard.c @@ -802,7 +802,7 @@ e_minicard_reflow( GnomeCanvasItem *item, int flags ) } } -char * +const char * e_minicard_get_card_id (EMinicard *minicard) { g_return_val_if_fail(minicard != NULL, NULL); diff --git a/addressbook/gui/widgets/e-minicard.h b/addressbook/gui/widgets/e-minicard.h index 3480d9d071..ec78e24be2 100644 --- a/addressbook/gui/widgets/e-minicard.h +++ b/addressbook/gui/widgets/e-minicard.h @@ -101,11 +101,13 @@ struct _EMinicardClass }; -GtkType e_minicard_get_type (void); -char *e_minicard_get_card_id (EMinicard *minicard); -int e_minicard_compare (EMinicard *minicard1, EMinicard *minicard2); +GtkType e_minicard_get_type (void); +const char *e_minicard_get_card_id (EMinicard *minicard); +int e_minicard_compare (EMinicard *minicard1, + EMinicard *minicard2); -int e_minicard_selected (EMinicard *minicard, GdkEvent *event); +int e_minicard_selected (EMinicard *minicard, + GdkEvent *event); #ifdef __cplusplus } |