diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2009-10-25 05:55:54 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2009-10-27 21:25:01 +0800 |
| commit | 58166e645971a4812fef23702f45cacc8e64e419 (patch) | |
| tree | bedad70e39e2215a53105e0303c168e86140371a /addressbook | |
| parent | c58b70659747967568a536e217b9440424709f92 (diff) | |
| download | gsoc2013-evolution-58166e645971a4812fef23702f45cacc8e64e419.tar gsoc2013-evolution-58166e645971a4812fef23702f45cacc8e64e419.tar.gz gsoc2013-evolution-58166e645971a4812fef23702f45cacc8e64e419.tar.bz2 gsoc2013-evolution-58166e645971a4812fef23702f45cacc8e64e419.tar.lz gsoc2013-evolution-58166e645971a4812fef23702f45cacc8e64e419.tar.xz gsoc2013-evolution-58166e645971a4812fef23702f45cacc8e64e419.tar.zst gsoc2013-evolution-58166e645971a4812fef23702f45cacc8e64e419.zip | |
Prefer G_N_ELEMENTS over sizeof calculations.
Diffstat (limited to 'addressbook')
| -rw-r--r-- | addressbook/gui/widgets/e-minicard-view.c | 3 | ||||
| -rw-r--r-- | addressbook/importers/evolution-ldif-importer.c | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/addressbook/gui/widgets/e-minicard-view.c b/addressbook/gui/widgets/e-minicard-view.c index 5f16ac9a56..cca537d65e 100644 --- a/addressbook/gui/widgets/e-minicard-view.c +++ b/addressbook/gui/widgets/e-minicard-view.c @@ -74,7 +74,6 @@ static GtkTargetEntry drag_types[] = { { (gchar *) SOURCE_VCARD_LIST_TYPE, 0, DND_TARGET_TYPE_SOURCE_VCARD_LIST }, { (gchar *) VCARD_LIST_TYPE, 0, DND_TARGET_TYPE_VCARD_LIST } }; -static gint num_drag_types = sizeof(drag_types) / sizeof(drag_types[0]); static void e_minicard_view_drag_data_get(GtkWidget *widget, @@ -138,7 +137,7 @@ e_minicard_view_drag_begin (EAddressbookReflowAdapter *adapter, GdkEvent *event, g_print ("dragging %d card(s)\n", g_list_length (view->drag_list)); - target_list = gtk_target_list_new (drag_types, num_drag_types); + target_list = gtk_target_list_new (drag_types, G_N_ELEMENTS (drag_types)); context = gtk_drag_begin (GTK_WIDGET (GNOME_CANVAS_ITEM (view)->canvas), target_list, actions, 1/*XXX*/, event); diff --git a/addressbook/importers/evolution-ldif-importer.c b/addressbook/importers/evolution-ldif-importer.c index efc4a2bf71..1e6461a631 100644 --- a/addressbook/importers/evolution-ldif-importer.c +++ b/addressbook/importers/evolution-ldif-importer.c @@ -127,7 +127,6 @@ ldif_fields[] = { { "nsAIMid", E_CONTACT_IM_AIM, FLAG_LIST }, { "mozilla_AimScreenName", E_CONTACT_IM_AIM, FLAG_LIST } }; -static gint num_ldif_fields = sizeof(ldif_fields) / sizeof (ldif_fields[0]); static GString * getValue( gchar **src ) @@ -267,7 +266,7 @@ parseLine (LDIFImporter *gci, EContact *contact, ldif_value = getValue(&value ); field_handled = FALSE; - for (i = 0; i < num_ldif_fields; i ++) { + for (i = 0; i < G_N_ELEMENTS (ldif_fields); i ++) { if (!g_ascii_strcasecmp (ptr, ldif_fields[i].ldif_attribute)) { if (ldif_fields[i].flags & FLAG_WORK_ADDRESS) { populate_contact_address (work_address, ptr, ldif_value->str); |