Merge branch 'warning-fixes' into 'master'
user-selector: Fix some const-to-non-const cast warnings See merge request pwithnall/malcontent!27
This commit is contained in:
commit
48b9839d04
|
@ -309,8 +309,8 @@ sort_users (gconstpointer a,
|
||||||
ActUser *ua, *ub;
|
ActUser *ua, *ub;
|
||||||
gint result;
|
gint result;
|
||||||
|
|
||||||
ua = ACT_USER (a);
|
ua = ACT_USER ((gpointer) a);
|
||||||
ub = ACT_USER (b);
|
ub = ACT_USER ((gpointer) b);
|
||||||
|
|
||||||
/* Make sure the current user is shown first */
|
/* Make sure the current user is shown first */
|
||||||
if (act_user_get_uid (ua) == getuid ())
|
if (act_user_get_uid (ua) == getuid ())
|
||||||
|
@ -344,7 +344,7 @@ user_compare (gconstpointer i,
|
||||||
gint result;
|
gint result;
|
||||||
|
|
||||||
item = (MctCarouselItem *) i;
|
item = (MctCarouselItem *) i;
|
||||||
user = ACT_USER (u);
|
user = ACT_USER ((gpointer) u);
|
||||||
|
|
||||||
uid_a = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (item), "uid"));
|
uid_a = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (item), "uid"));
|
||||||
uid_b = act_user_get_uid (user);
|
uid_b = act_user_get_uid (user);
|
||||||
|
|
Loading…
Reference in New Issue