[accounts-dialog] Fixed some compiler warnings
- From: Jonh Wendell <jwendell src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [accounts-dialog] Fixed some compiler warnings
- Date: Tue, 9 Feb 2010 14:26:56 +0000 (UTC)
commit 95936e81f256eee43bb8a992c36101db45e86a9b
Author: Jonh Wendell <jwendell gnome org>
Date: Fri Feb 5 16:38:32 2010 -0300
Fixed some compiler warnings
src/gdm-languages.c | 2 +-
src/um-language-dialog.c | 29 +----------------------------
src/um-password-dialog.c | 3 ++-
3 files changed, 4 insertions(+), 30 deletions(-)
---
diff --git a/src/gdm-languages.c b/src/gdm-languages.c
index d778852..2c99e15 100644
--- a/src/gdm-languages.c
+++ b/src/gdm-languages.c
@@ -464,7 +464,7 @@ collect_locales_from_archive (void)
locales_collected = TRUE;
out:
- g_mapped_file_free (mapped);
+ g_mapped_file_unref (mapped);
return locales_collected;
}
diff --git a/src/um-language-dialog.c b/src/um-language-dialog.c
index fa5fc6c..a4b0772 100644
--- a/src/um-language-dialog.c
+++ b/src/um-language-dialog.c
@@ -173,33 +173,6 @@ select_language (UmLanguageDialog *um,
}
static void
-cancel_language_chooser (GtkButton *button,
- UmLanguageDialog *um)
-{
- select_language (um, um->language);
-}
-
-static void
-accept_language_chooser (GtkButton *button,
- UmLanguageDialog *um)
-{
- GtkTreeSelection *selection;
- GtkTreeModel *model;
- GtkTreeIter iter;
- char *language;
-
- selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (um->chooser_list));
- if (gtk_tree_selection_get_selected (selection, &model, &iter)) {
- gtk_tree_model_get (model, &iter, LOCALE_COL, &language, -1);
- select_language (um, language);
- g_free (language);
- }
- else {
- select_language (um, um->language);
- }
-}
-
-static void
row_activated (GtkTreeView *tree_view,
GtkTreePath *path,
GtkTreeViewColumn *column,
@@ -391,7 +364,7 @@ um_language_chooser_new (void)
chooser = (GtkWidget *) gtk_builder_get_object (builder, "dialog");
list = (GtkWidget *) gtk_builder_get_object (builder, "language-list");
- g_object_set_data (chooser, "list", list);
+ g_object_set_data (G_OBJECT (chooser), "list", list);
g_signal_connect (list, "row-activated",
G_CALLBACK (row_activated), chooser);
diff --git a/src/um-password-dialog.c b/src/um-password-dialog.c
index e6c47ff..af2853d 100644
--- a/src/um-password-dialog.c
+++ b/src/um-password-dialog.c
@@ -21,6 +21,7 @@
#include "config.h"
+#include <unistd.h>
#include <stdlib.h>
#include <sys/types.h>
#include <sys/wait.h>
@@ -295,7 +296,7 @@ accept_password_dialog (GtkButton *button,
* use passwd directly, to preserve the audit trail
* and to e.g. update the keyring password.
*/
- passwd_change_password (um->passwd_handler, password, password_changed_cb, um);
+ passwd_change_password (um->passwd_handler, password, (PasswdCallback) password_changed_cb, um);
gtk_widget_set_sensitive (um->dialog, FALSE);
display = gtk_widget_get_display (um->dialog);
cursor = gdk_cursor_new_for_display (display, GDK_WATCH);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]