It's not clear if 0.8 will be released for GNOME 3.6 so the release team
prefers to stick with 0.6 for now.
And yeah, gee-1.0 is the 0.6.x series and gee-0.8 the 0.7.x, nice work
guys...
Revert "gee_iterator_first is no more in libgee 0.8"
This reverts commit
24d30e15b34b654eff96f4a358801290ebe09ec0.
Revert "libempathy: Port empathy to libgee 0.8."
This reverts commit
d563fa078b2a13b3c06b1de626105e0510568e57.
libpulse-mainloop-glib
webkitgtk-3.0 >= $WEBKIT_REQUIRED
libsoup-2.4
- gee-0.8
+ gee-1.0
])
PKG_CHECK_MODULES(EMPATHY_CALL,
GeeSet *personas;
GeeIterator *iter;
guint persona_count = 0;
+ gboolean c;
g_return_if_fail (GTK_IS_MENU (menu));
g_return_if_fail (FOLKS_IS_INDIVIDUAL (individual));
gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
gtk_widget_show (item);
- iter = gee_iterable_iterator (GEE_ITERABLE (personas));
- while (gee_iterator_next (iter))
+ for (c = gee_iterator_first (iter); c; c = gee_iterator_next (iter))
{
GtkWidget *image;
GtkWidget *contact_item;
}
else if (!was_showing_personas && will_show_personas)
{
+ gboolean c;
+
/* Remove the old Individual grid */
individual_grid_destroy (self);
/* Set up all the Persona grids instead */
- iter = gee_iterable_iterator (GEE_ITERABLE (personas));
- while (gee_iterator_next (iter))
+ for (c = gee_iterator_first (iter); c; c = gee_iterator_next (iter))
{
FolksPersona *persona = gee_iterator_get (iter);
add_persona (self, persona);
}
else if (was_showing_personas && !will_show_personas)
{
+ gboolean c;
+
/* Remove all Personas */
- iter = gee_iterable_iterator (GEE_ITERABLE (personas));
- while (gee_iterator_next (iter))
+ for (c = gee_iterator_first (iter); c; c = gee_iterator_next (iter))
{
FolksPersona *persona = gee_iterator_get (iter);
remove_persona (self, persona);
if (priv->groups == NULL)
{
priv->groups = gee_hash_set_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup,
- g_free, NULL, NULL, NULL, NULL, NULL, NULL);
+ g_free, g_str_hash, g_str_equal);
}
gee_collection_add (GEE_COLLECTION (priv->groups), group);
personas = GEE_SET (
gee_hash_set_new (FOLKS_TYPE_PERSONA, g_object_ref, g_object_unref,
- NULL, NULL, NULL, NULL, NULL, NULL));
+ g_direct_hash, g_direct_equal));
gee_collection_add (GEE_COLLECTION (personas), persona);