applications/gnome-control-center
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix build in general, with gcc 2 in particular, and also get rid of a few

Browse source 
2007-02-07  Jens Granseuer  <jensgr@gmx.net>

	* Makefile.am:
	* gnome-about-me-password.c: (passdlg_set_auth_state),
	(passdlg_validate_passwords):
	* gnome-about-me.c: (about_me_load_string_field),
	(about_me_setup_dialog): fix build in general, with gcc 2 in particular,
	and also get rid of a few warnings

svn path=/trunk/; revision=7257
This commit is contained in:
Jens Granseuer 2007-02-07 20:46:34 +00:00 • committed by Jens Granseuer
parent dd21a600cc
commit a8497f4c62
4 changed files with 24 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

9
capplets/about-me/ChangeLog
View file

@ -1,3 +1,12 @@
2007-02-07 Jens Granseuer <jensgr@gmx.net>
* Makefile.am:
* gnome-about-me-password.c: (passdlg_set_auth_state),
(passdlg_validate_passwords):
* gnome-about-me.c: (about_me_load_string_field),
(about_me_setup_dialog): fix build in general, with gcc 2 in particular,
and also get rid of a few warnings
2007-01-22 Rodrigo Moya <rodrigo@gnome-db.org> 2007-01-22 Rodrigo Moya <rodrigo@gnome-db.org>
Fixes #376079 Fixes #376079

15
capplets/about-me/Makefile.am
View file

@ -26,9 +26,16 @@ desktopdir = $(datadir)/applications
Desktop_in_files = gnome-about-me.desktop.in Desktop_in_files = gnome-about-me.desktop.in
desktop_DATA = $(Desktop_in_files:.desktop.in=.desktop) desktop_DATA = $(Desktop_in_files:.desktop.in=.desktop)
Gladedir = $(pkgdatadir)/glade gladedir = $(pkgdatadir)/glade
Glade_DATA = gnome-about-me.glade glade_DATA = gnome-about-me.glade
INCLUDES = \
$(GNOMECC_CAPPLETS_CFLAGS) \
$(LIBEBOOK_CFLAGS) \
-DGNOMECC_DATA_DIR="\"$(pkgdatadir)\"" \
-DGNOMECC_GLADE_DIR="\"$(gladedir)\"" \
-DGNOMECC_PIXMAP_DIR="\"$(pixmapdir)\"" \
-DGNOMELOCALEDIR="\"$(datadir)/locale\""
INCLUDES = $(GNOMECC_CAPPLETS_CFLAGS) $(LIBEBOOK_CFLAGS)
CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES) $(Desktop_in_files) $(desktop_DATA) CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES) $(Desktop_in_files) $(desktop_DATA)
EXTRA_DIST = $(Glade_DATA) $(pixmap_DATA) EXTRA_DIST = $(glade_DATA) $(pixmap_DATA)

5
capplets/about-me/gnome-about-me-password.c
View file

@ -738,7 +738,7 @@ passdlg_set_auth_state (PasswordDialog *pdialog, gboolean state)
gtk_widget_grab_focus (GTK_WIDGET (pdialog->new_password)); gtk_widget_grab_focus (GTK_WIDGET (pdialog->new_password));
/* Set open lock image */ /* Set open lock image */
gtk_image_set_from_file (GTK_IMAGE (pdialog->dialog_image), GNOMECC_DATA_DIR "/pixmaps/gnome-about-me-lock-open.png"); gtk_image_set_from_file (GTK_IMAGE (pdialog->dialog_image), GNOMECC_PIXMAP_DIR "/gnome-about-me-lock-open.png");
} else { } else {
/* Not authenticated state */ /* Not authenticated state */
@ -746,7 +746,7 @@ passdlg_set_auth_state (PasswordDialog *pdialog, gboolean state)
gtk_widget_grab_focus (GTK_WIDGET (pdialog->current_password)); gtk_widget_grab_focus (GTK_WIDGET (pdialog->current_password));
/* Set closed lock image */ /* Set closed lock image */
gtk_image_set_from_file (GTK_IMAGE (pdialog->dialog_image), GNOMECC_DATA_DIR "/pixmaps/gnome-about-me-lock.png"); gtk_image_set_from_file (GTK_IMAGE (pdialog->dialog_image), GNOMECC_PIXMAP_DIR "/gnome-about-me-lock.png");
} }
} }
@ -833,7 +833,6 @@ passdlg_validate_passwords (PasswordDialog *pdialog)
GladeXML *dialog; GladeXML *dialog;
const gchar *new_password, *retyped_password; const gchar *new_password, *retyped_password;
glong nlen, rlen; glong nlen, rlen;
gboolean valid = FALSE;
dialog = pdialog->xml; dialog = pdialog->xml;

4
capplets/about-me/gnome-about-me.c
View file

@ -369,7 +369,7 @@ about_me_load_string_field (GnomeAboutMe *me, const gchar *wid, guint cid, guint
{ {
GtkWidget *widget; GtkWidget *widget;
GladeXML *dialog; GladeXML *dialog;
gchar *str; const gchar *str;
dialog = me->dialog; dialog = me->dialog;
@ -727,6 +727,7 @@ about_me_setup_dialog (void)
struct passwd *pwent; struct passwd *pwent;
char *user = NULL; char *user = NULL;
gchar *str; gchar *str;
gchar **tok;
me = g_new0 (GnomeAboutMe, 1); me = g_new0 (GnomeAboutMe, 1);
@ -802,7 +803,6 @@ about_me_setup_dialog (void)
_("Unknown login ID, the user database might be corrupted")); _("Unknown login ID, the user database might be corrupted"));
return -1; return -1;
} }
gchar **tok;
tok = g_strsplit (pwent->pw_gecos, ",", 0); tok = g_strsplit (pwent->pw_gecos, ",", 0);
/************************************************/ /************************************************/