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

head ChangeLog

Browse source
This commit is contained in:
Diego González 2005-04-04 19:11:09 +00:00
parent ad155907dd
commit f30b097f60
3 changed files with 48 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
capplets/about-me/ChangeLog
View file

@ -1,3 +1,13 @@
2005-04-01 Diego Gonzalez <diego@pemas.net>
* gnome-about-me.c: fix the case where the self uid is wrong
and the edition when the self contact is created for the
first time.
2005-03-29 Diego Gonzalez <diego@pemas.net>
* Makefile.am: fix tabs
2005-02-09 Sebastien Bacher <seb128@debian.org>
* Makefile.am: build e-util-marshal.c.

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

@ -6,11 +6,24 @@ pixmap_DATA = \
gnome_about_me_LDADD = $(GNOMECC_CAPPLETS_LIBS) $(LIBEBOOK_LIBS) -lutil
gnome_about_me_SOURCES = \
gnome-about-me-password.c \
e-util-marshal.c \
e-util-marshal.h \
gnome-about-me-password.c \
e-image-chooser.c \
gnome-about-me.c
e-util-marshal.h: e-util-marshal.list
( @GLIB_GENMARSHAL@ --prefix=e_util_marshal $(srcdir)/e-util-marshal.list \
--header > util-marshal.tmp \
&& mv util-marshal.tmp e-util-marshal.h ) \
|| ( rm -f util-marshal.tmp && exit 1 )
e-util-marshal.c: e-util-marshal.h
( @GLIB_GENMARSHAL@ --prefix=e_util_marshal $(srcdir)/e-util-marshal.list \
--body > util-marshal.tmp \
&& mv util-marshal.tmp e-util-marshal.c ) \
|| ( rm -f util-marshal.tmp && exit 1 )
@INTLTOOL_DESKTOP_RULE@
desktopdir = $(GNOMECC_DESKTOP_DIR)
@ -20,13 +33,6 @@ desktop_DATA = $(Desktop_in_files:.desktop.in=.desktop)
Gladedir = $(GNOMECC_GLADE_DIR)
Glade_DATA = gnome-about-me.glade
e-util-marshal.h: e-util-marshal.list $(GLIB_GENMARSHAL)
$(GLIB_GENMARSHAL) $< --header --prefix=e_util_marshal > $@
e-util-marshal.c: e-util-marshal.list $(GLIB_GENMARSHAL)
echo "#include \"e-util-marshal.h\"" > $@ && \
$(GLIB_GENMARSHAL) $< --body --prefix=e_util_marshal >> $@
INCLUDES = $(GNOMECC_CAPPLETS_CFLAGS) $(LIBEBOOK_CFLAGS)
CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES)
EXTRA_DIST = $(Glade_DATA) $(Desktop_in_files) $(pixmap_DATA)
EXTRA_DIST = e-util-marshal.list $(Glade_DATA) $(Desktop_in_files) $(pixmap_DATA)

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

@ -146,7 +146,7 @@ about_me_commit (GnomeAboutMe *me)
e_book_set_self (me->book, me->contact, &error);
} else {
if (e_book_commit_contact (me->book, me->contact, &error) == FALSE)
g_print ("hubo error\n");
g_print ("There was an undeterminad error\n");
}
me->create_self = FALSE;
@ -155,7 +155,7 @@ about_me_commit (GnomeAboutMe *me)
static gboolean
about_me_focus_out (GtkWidget *widget, GdkEventFocus *event, GnomeAboutMe *me)
{
gchar *str;
gchar *str = NULL;
const gchar *wid;
gint i;
@ -238,6 +238,9 @@ about_me_get_address_field (EContactAddress *addr, guint cid)
{
gchar *str = NULL;
if (addr == NULL)
return NULL;
switch (cid) {
case ADDRESS_STREET:
str = addr->street;
@ -317,6 +320,11 @@ about_me_load_string_field (GnomeAboutMe *me, const gchar *wid, guint cid, guint
widget = WID (wid);
if (me->create_self == TRUE) {
g_signal_connect (widget, "focus-out-event", G_CALLBACK (about_me_focus_out), me);
return;
}
if (aid >= ADDRESS_HOME && aid < ADDRESS_WORK) {
str = about_me_get_address_field (me->addr1, cid);
} else if (aid >= ADDRESS_WORK) {
@ -375,8 +383,6 @@ about_me_update_photo (GnomeAboutMe *me)
dialog = me->dialog;
g_print ("updating image\n");
if (me->image_changed && me->have_image) {
widget = WID ("image-chooser");
@ -416,8 +422,14 @@ about_me_load_info (GnomeAboutMe *me)
{
gint i;
me->addr1 = e_contact_get (me->contact, E_CONTACT_ADDRESS_HOME);
me->addr2 = e_contact_get (me->contact, E_CONTACT_ADDRESS_WORK);
if (me->create_self == FALSE) {
me->addr1 = e_contact_get (me->contact, E_CONTACT_ADDRESS_HOME);
if (me->addr1 == NULL)
me->addr1 = g_new0 (EContactAddress, 1);
me->addr2 = e_contact_get (me->contact, E_CONTACT_ADDRESS_WORK);
if (me->addr2 == NULL)
me->addr2 = g_new0 (EContactAddress, 1);
}
for (i = 0; ids[i].wid != NULL; i++) {
about_me_load_string_field (me, ids[i].wid, ids[i].cid, i);
@ -614,14 +626,17 @@ about_me_setup_dialog (void)
me->create_self = TRUE;
me->contact = e_contact_new ();
g_print ("%s\n", error->message);
g_clear_error (&error);
if (me->book == NULL) {
g_print ("me->book == NULL, tengo que conseguir un ebook\n");
me->book = e_book_new_system_addressbook (&error);
if (me->book == NULL)
g_print ("error message: %s\n", error->message);
if (e_book_open (me->book, FALSE, NULL) == FALSE)
g_print ("no pude obtener libro\n");
g_print ("unable to open book, bailing out\n");
}
}