Skip to content

Commit

Permalink
Remove compilation warnings for user-group.c
Browse files Browse the repository at this point in the history
  • Loading branch information
zhuyaliang committed Jun 15, 2019
1 parent 3bfc8a8 commit a08d421
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion src/user-base.c
Expand Up @@ -205,7 +205,7 @@ void DisplayUserSetOther(GtkWidget *Hbox,UserAdmin *ua)
GtkWidget *ButtonGroup;
UserInfo *user;
char *lang;
char *lang_id;
const char *lang_id;

user = GetIndexUser(ua->UsersList,0);
fixed = gtk_fixed_new();
Expand Down
10 changes: 5 additions & 5 deletions src/user-group.c
Expand Up @@ -185,7 +185,7 @@ static gboolean QuitGroupWindow (GtkWidget *widget,
gpointer data)
{
GroupsManage *gm = (GroupsManage *)data;
g_free(gm->username);
g_free((gpointer)gm->username);
if(gm->GroupsList != NULL)
g_slist_free_full (gm->GroupsList,g_object_unref);
if(gm->NewGroupUsers != NULL)
Expand All @@ -198,7 +198,7 @@ static gboolean QuitGroupWindow (GtkWidget *widget,
static void CloseGroupWindow (GtkWidget *widget, gpointer data)
{
GroupsManage *gm = (GroupsManage *)data;
g_free(gm->username);
g_free((gpointer)gm->username);
gm->Permission = NULL;
g_slist_free_full (gm->GroupsList,g_object_unref);
if(gm->NewGroupUsers != NULL)
Expand Down Expand Up @@ -298,11 +298,11 @@ static guint GetRemoveListGid(GtkWidget *widget)
GtkTreeView *treeview = GTK_TREE_VIEW(widget);
GtkTreeModel *model;
GtkTreeIter iter;
uint gid;
uint gid = 0;

GtkTreeSelection *selection = gtk_tree_view_get_selection (treeview);
model = gtk_tree_view_get_model (treeview);
if(gtk_tree_selection_get_selected (selection, NULL, &iter))
if(gtk_tree_selection_get_selected (selection, NULL, &iter) == TRUE)
{
gtk_tree_model_get (model, &iter, COLUMN_REMOVEID, &gid, -1);
}
Expand Down Expand Up @@ -481,7 +481,7 @@ static void NewGroupSelectUsers (GtkCellRendererToggle *cell,
gtk_tree_model_get (model, &iter, COLUMN_USERNAME, &name, -1);
if(fixed == FALSE)
{
gm->NewGroupUsers = g_slist_prepend(gm->NewGroupUsers,name);
gm->NewGroupUsers = g_slist_prepend(gm->NewGroupUsers,(gpointer)name);
}
else
{
Expand Down

0 comments on commit a08d421

Please sign in to comment.