From 61b61c3fb75dee78f362558764149e18df75c96a Mon Sep 17 00:00:00 2001 From: Scott Balneaves Date: Wed, 12 Dec 2012 19:21:20 -0600 Subject: First cut at fixing about-me --- capplets/about-me/mate-about-me-dialog.ui | 1512 +--------------------------- capplets/about-me/mate-about-me-password.c | 9 +- capplets/about-me/mate-about-me.c | 35 +- configure.ac | 10 +- 4 files changed, 88 insertions(+), 1478 deletions(-) diff --git a/capplets/about-me/mate-about-me-dialog.ui b/capplets/about-me/mate-about-me-dialog.ui index fdf79b6e..5324d220 100644 --- a/capplets/about-me/mate-about-me-dialog.ui +++ b/capplets/about-me/mate-about-me-dialog.ui @@ -1,29 +1,59 @@ - + - - + + False 5 About Me dialog - False - + True + False vertical 2 + + + True + False + end + + + gtk-close + True + True + True + False + True + + + False + False + 0 + + + + + False + True + end + 0 + + True + False 5 - vertical 12 True + False True + False 12 @@ -46,6 +76,7 @@ True + False 0 Full Name @@ -57,21 +88,25 @@ + True + True 0 True - vertical + False 6 True + False 12 True + False 0 User name: @@ -84,9 +119,12 @@ True + False 0 + True + True 1 @@ -140,6 +178,7 @@ False + True 1 @@ -151,1466 +190,13 @@ - - True - - - True - True - - - True - 12 - vertical - 18 - - - True - vertical - 6 - - - True - 0 - Email - - - - - - False - False - 0 - - - - - True - - - True - - - - False - False - 0 - - - - - True - 2 - 2 - 12 - 6 - - - True - 0 - _Work: - True - email-work-e - - - GTK_FILL - - - - - - True - 0 - _Home: - True - email-home-e - - - 1 - 2 - GTK_FILL - - - - - - True - True - - - 1 - 2 - - - - - - True - True - - - 1 - 2 - 1 - 2 - - - - - - 1 - - - - - 1 - - - - - False - False - 0 - - - - - True - vertical - 6 - - - True - 0 - Telephone - - - - - - False - False - 0 - - - - - True - - - True - - - - False - False - 0 - - - - - True - 2 - 4 - 12 - 6 - - - True - 0 - Wor_k: - True - phone-work-e - - - GTK_FILL - - - - - - True - 0 - Hom_e: - True - phone-home-e - - - 1 - 2 - GTK_FILL - - - - - - True - True - - - 1 - 2 - - - - - - True - True - - - 1 - 2 - 1 - 2 - - - - - - True - True - - - 3 - 4 - 1 - 2 - - - - - - True - True - - - 3 - 4 - - - - - - True - 0 - _Mobile: - True - phone-mobile-e - - - 2 - 3 - 1 - 2 - GTK_FILL - - - - - - True - 0 - Work _fax: - True - phone-work-fax-e - - - 2 - 3 - GTK_FILL - - - - - - 1 - - - - - 1 - - - - - False - False - 1 - - - - - True - vertical - 6 - - - True - 0 - Instant Messaging - - - - - - False - False - 0 - - - - - True - - - True - - - - False - False - 0 - - - - - True - 3 - 4 - 12 - 6 - - - True - 0 - _XMPP: - True - im-jabber-e - - - GTK_FILL - - - - - - True - True - - - 1 - 2 - - - - - - True - True - - - 1 - 2 - 1 - 2 - - - - - - True - 0 - _Yahoo: - True - im-yahoo-e - - - 2 - 3 - GTK_FILL - - - - - - True - 0 - M_SN: - True - im-msn-e - - - 1 - 2 - GTK_FILL - GTK_FILL - - - - - True - 0 - IC_Q: - True - im-icq-e - - - 2 - 3 - GTK_FILL - - - - - - True - 0 - A_IM/iChat: - True - im-aim-e - - - 2 - 3 - 1 - 2 - GTK_FILL - - - - - - True - 0 - _GroupWise: - True - im-groupwise-e - - - 2 - 3 - 2 - 3 - GTK_FILL - - - - - - True - True - - - 1 - 2 - 2 - 3 - - - - - - True - True - - - 3 - 4 - - - - - - True - True - - - 3 - 4 - 1 - 2 - - - - - - True - True - - - 3 - 4 - 2 - 3 - - - - - - 1 - - - - - 1 - - - - - False - False - 2 - - - - - - - True - Contact - - - False - - - - - True - 12 - vertical - 18 - - - True - vertical - - - True - vertical - - - True - 0 - Home - - - - - - False - False - 0 - - - - - True - - - True - - - - False - False - 0 - - - - - True - 4 - 4 - 12 - 6 - - - True - 0 - _Address: - True - addr-street-1 - - - GTK_FILL - - - - - - True - True - automatic - never - in - - - True - True - False - - - - - 1 - 2 - 3 - GTK_FILL - - - - - True - 0 - C_ity: - True - addr-locality-1 - - - 2 - 3 - GTK_FILL - - - - - - True - 0 - _ZIP/Postal code: - True - addr-code-1 - - - 2 - 3 - 1 - 2 - GTK_FILL - - - - - - True - 0 - _State/Province: - True - addr-region-1 - - - 2 - 3 - 2 - 3 - GTK_FILL - - - - - - True - 0 - Co_untry: - True - addr-country-1 - - - 2 - 3 - 3 - 4 - GTK_FILL - - - - - - True - 0 - P._O. box: - True - addr-po-1 - - - 3 - 4 - GTK_FILL - - - - - - True - True - - - 1 - 2 - 3 - 4 - - - - - - True - True - - - 3 - 4 - - - - - - True - True - - - 3 - 4 - 1 - 2 - - - - - - True - True - - - 3 - 4 - 3 - 4 - - - - - - True - True - - - 3 - 4 - 2 - 3 - - - - - - - - - - - - 1 - - - - - 1 - - - - - False - False - 0 - - - - - False - False - 0 - - - - - True - vertical - 6 - - - True - 0 - Work - - - - - - False - False - 0 - - - - - True - - - True - - - - False - False - 0 - - - - - True - 4 - 4 - 12 - 6 - - - True - 0 - A_ddress: - True - addr-street-2 - - - GTK_FILL - - - - - - True - True - automatic - never - in - - - True - True - False - - - - - 1 - 2 - 3 - GTK_FILL - - - - - True - 0 - ZIP/_Postal code: - True - addr-code-2 - - - 2 - 3 - 1 - 2 - GTK_FILL - - - - - - True - 0 - State/Pro_vince: - True - addr-region-2 - - - 2 - 3 - 2 - 3 - GTK_FILL - - - - - - True - 0 - Cou_ntry: - True - addr-country-2 - - - 2 - 3 - 3 - 4 - GTK_FILL - - - - - - True - 0 - P.O. _box: - True - addr-po-2 - - - 3 - 4 - GTK_FILL - - - - - - True - 0 - Ci_ty: - True - addr-locality-2 - - - 2 - 3 - GTK_FILL - - - - - - True - True - - - 1 - 2 - 3 - 4 - - - - - - True - True - - - 3 - 4 - - - - - - True - True - - - 3 - 4 - 1 - 2 - - - - - - True - True - - - 3 - 4 - 2 - 3 - - - - - - True - True - - - 3 - 4 - 3 - 4 - - - - - - - - - - - - 1 - - - - - 1 - - - - - False - False - 1 - - - - - 1 - - - - - True - Address - - - 1 - False - - - - - True - 12 - vertical - 18 - - - True - vertical - 6 - - - True - 0 - Web - - - - - - False - False - 0 - - - - - True - - - True - - - - False - False - 0 - - - - - True - 3 - 2 - 12 - 6 - - - True - 0 - _Home page: - True - web-homepage-e - - - GTK_FILL - - - - - - True - 0 - Web _log: - True - web-weblog-e - - - 1 - 2 - GTK_FILL - - - - - - True - 0 - Cale_ndar: - True - web-calendar-e - - - 2 - 3 - GTK_FILL - - - - - - True - True - - - 1 - 2 - - - - - - True - True - - - 1 - 2 - 1 - 2 - - - - - - True - True - - - 1 - 2 - 2 - 3 - - - - - - 1 - - - - - 1 - - - - - False - False - 0 - - - - - True - vertical - 6 - - - True - 0 - Job - - - - - - False - False - 0 - - - - - True - - - True - - - - False - False - 0 - - - - - True - 6 - 2 - 12 - 6 - - - True - 0 - _Profession: - True - job-profession-e - - - GTK_FILL - - - - - - True - 0 - C_ompany: - True - job-company-e - - - 1 - 2 - GTK_FILL - - - - - - True - 0 - _Manager: - True - job-manager-e - - - 2 - 3 - GTK_FILL - - - - - - True - 0 - _Title: - True - job-title-e - - - 3 - 4 - GTK_FILL - - - - - - True - 0 - _Department: - True - job-dept-e - - - 4 - 5 - GTK_FILL - - - - - - True - 0 - A_ssistant: - True - job-assistant-e - - - 5 - 6 - GTK_FILL - - - - - - True - True - - - 1 - 2 - - - - - - True - True - - - 1 - 2 - 1 - 2 - - - - - - True - True - - - 1 - 2 - 2 - 3 - - - - - - True - True - - - 1 - 2 - 3 - 4 - - - - - - True - True - - - 1 - 2 - 4 - 5 - - - - - - True - True - - - 1 - 2 - 5 - 6 - - - - - - 1 - - - - - 1 - - - - - False - False - 1 - - - - - 2 - - - - - True - Personal Info - - - 2 - False - - - - - 0 - - - - - 1 - - - - - 1 - - - - - True - end - - - gtk-close - True - True - True - False - True - - - False - False - 0 - + False - end - 0 + True + 1 diff --git a/capplets/about-me/mate-about-me-password.c b/capplets/about-me/mate-about-me-password.c index 80f8e4ca..87bf084c 100644 --- a/capplets/about-me/mate-about-me-password.c +++ b/capplets/about-me/mate-about-me-password.c @@ -210,6 +210,7 @@ spawn_passwd (PasswordDialog *pdialog, GError **error) g_set_error (error, PASSDLG_ERROR, PASSDLG_ERROR_BACKEND, + "%s", strerror (errno)); /* Clean up */ @@ -427,7 +428,7 @@ io_watch_stdout (GIOChannel *source, GIOCondition condition, PasswordDialog *pdi GError *error = NULL; gchar *msg = NULL; /* Status error message */ - GtkBuilder *dialog; + GtkBuilder *dialog = NULL; gboolean reinit = FALSE; @@ -722,13 +723,13 @@ passdlg_error_dialog (GtkWindow *parent, const gchar *title, dialog = gtk_message_dialog_new (parent, GTK_DIALOG_MODAL, GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, - msg); + "%s", msg); if (title) gtk_window_set_title (GTK_WINDOW (dialog), title); if (details) gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog), - details); + "%s", details); gtk_dialog_run (GTK_DIALOG (dialog)); gtk_widget_destroy (dialog); } @@ -872,7 +873,7 @@ passdlg_authenticate (GtkButton *button, PasswordDialog *pdialog) static guint passdlg_validate_passwords (PasswordDialog *pdialog) { - GtkBuilder *dialog; + GtkBuilder *dialog = NULL; const gchar *new_password, *retyped_password; glong nlen, rlen; diff --git a/capplets/about-me/mate-about-me.c b/capplets/about-me/mate-about-me.c index 0ef9156f..235e414b 100644 --- a/capplets/about-me/mate-about-me.c +++ b/capplets/about-me/mate-about-me.c @@ -26,7 +26,9 @@ #include #include #include +#if 0 #include +#endif #include #define MATE_DESKTOP_USE_UNSTABLE_API @@ -45,23 +47,26 @@ #define EMAIL_SLOTS 4 typedef struct { +#if 0 EContact *contact; EBook *book; +#endif GtkBuilder *dialog; GtkWidget *enable_fingerprint_button; GtkWidget *disable_fingerprint_button; - GtkWidget *image_chooser; + GtkWidget *image_chooser; GdkScreen *screen; GtkIconTheme *theme; MateDesktopThumbnailFactory *thumbs; +#if 0 EContactAddress *addr1; EContactAddress *addr2; gchar *email[EMAIL_SLOTS]; const gchar *email_types[EMAIL_SLOTS]; - +#endif gboolean have_image; gboolean image_changed; gboolean create_self; @@ -80,6 +85,7 @@ struct WidToCid { guint cid; }; +#if 0 enum { ADDRESS_STREET = 1, ADDRESS_POBOX, @@ -144,7 +150,7 @@ struct WidToCid ids[] = { #define ATTRIBUTE_OTHER "OTHER" static void about_me_set_address_field (EContactAddress *, guint, gchar *); - +#endif /*** Utility functions ***/ static void @@ -154,7 +160,7 @@ about_me_error (GtkWindow *parent, gchar *str) dialog = gtk_message_dialog_new (parent, GTK_DIALOG_MODAL, GTK_MESSAGE_ERROR, - GTK_BUTTONS_OK, str); + GTK_BUTTONS_OK, "%s", str); gtk_dialog_run (GTK_DIALOG (dialog)); gtk_widget_destroy (dialog); @@ -164,6 +170,7 @@ about_me_error (GtkWindow *parent, gchar *str) static void about_me_destroy (void) { +#if 0 e_contact_address_free (me->addr1); e_contact_address_free (me->addr2); @@ -171,13 +178,16 @@ about_me_destroy (void) g_object_unref (me->contact); if (me->book) g_object_unref (me->book); +#endif if (me->dialog) g_object_unref (me->dialog); +#if 0 g_free (me->email[0]); g_free (me->email[1]); g_free (me->email[2]); g_free (me->email[3]); +#endif g_free (me->person); g_free (me->login); @@ -186,6 +196,7 @@ about_me_destroy (void) me = NULL; } +#if 0 static void about_me_update_email (MateAboutMe *me) { @@ -333,6 +344,7 @@ about_me_focus_out (GtkWidget *widget, GdkEventFocus *event, MateAboutMe *unused return FALSE; } + /* * Helpers */ @@ -497,8 +509,15 @@ about_me_load_string_field (MateAboutMe *me, const gchar *wid, guint cid, guint g_signal_connect (widget, "focus-out-event", G_CALLBACK (about_me_focus_out), me); } +#endif + +#if 0 static void about_me_load_photo (MateAboutMe *me, EContact *contact) +#endif + +static void +about_me_load_photo (MateAboutMe *me) { GtkBuilder *dialog; EContactPhoto *photo; @@ -621,6 +640,7 @@ about_me_update_photo (MateAboutMe *me) static void about_me_load_info (MateAboutMe *me) { +#if 0 gint i; if (me->create_self == FALSE) { @@ -638,7 +658,7 @@ about_me_load_info (MateAboutMe *me) for (i = 0; ids[i].wid != NULL; i++) { about_me_load_string_field (me, ids[i].wid, ids[i].cid, i); } - +#endif set_fingerprint_label (me->enable_fingerprint_button, me->disable_fingerprint_button); } @@ -883,6 +903,7 @@ about_me_setup_dialog (void) main_dialog, G_CONNECT_SWAPPED); +#if 0 /* Get the self contact */ if (!e_book_get_self (&me->contact, &me->book, &error)) { if (error->code == E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED) { @@ -914,6 +935,7 @@ about_me_setup_dialog (void) } else { about_me_setup_email (me); } +#endif me->login = g_strdup (g_get_user_name ()); me->username = g_strdup (g_get_real_name ()); @@ -953,6 +975,7 @@ about_me_setup_dialog (void) g_signal_connect (me->image_chooser, "changed", G_CALLBACK (about_me_image_changed_cb), me); +#if 0 /* Address tab: set up the focus chains */ chain = g_list_prepend (NULL, WID ("addr-country-1")); chain = g_list_prepend (chain, WID ("addr-po-1")); @@ -973,7 +996,7 @@ about_me_setup_dialog (void) widget = WID ("addr-table-2"); gtk_container_set_focus_chain (GTK_CONTAINER (widget), chain); g_list_free (chain); - +#endif about_me_load_info (me); gtk_widget_show_all (main_dialog); diff --git a/configure.ac b/configure.ac index e5b13a93..e345f2ad 100644 --- a/configure.ac +++ b/configure.ac @@ -250,11 +250,11 @@ AC_ARG_ENABLE([aboutme], [enable_aboutme=no]) AC_MSG_RESULT([$enable_aboutme]) -if test "x$enable_aboutme" = "xyes"; then - PKG_CHECK_MODULES(LIBEBOOK, [libebook-1.2 >= 1.7.90], - [AC_DEFINE([HAVE_LIBEBOOK], 1, - [Define if evolution-data-server libebook-1.2 is available])]) -fi +dnl if test "x$enable_aboutme" = "xyes"; then +dnl PKG_CHECK_MODULES(LIBEBOOK, [libebook-1.2 >= 1.7.90], +dnl [AC_DEFINE([HAVE_LIBEBOOK], 1, +dnl [Define if evolution-data-server libebook-1.2 is available])]) +dnl fi AM_CONDITIONAL(BUILD_ABOUTME, test "x$enable_aboutme" = "xyes") -- cgit v1.2.1 From 7542533b7a12b6d5e379707c51ab45a4e314e169 Mon Sep 17 00:00:00 2001 From: Scott Balneaves Date: Thu, 13 Dec 2012 12:10:25 -0600 Subject: Actually remove obviously uneeded code --- capplets/about-me/mate-about-me.c | 491 -------------------------------------- 1 file changed, 491 deletions(-) diff --git a/capplets/about-me/mate-about-me.c b/capplets/about-me/mate-about-me.c index 235e414b..9a0b048b 100644 --- a/capplets/about-me/mate-about-me.c +++ b/capplets/about-me/mate-about-me.c @@ -26,9 +26,6 @@ #include #include #include -#if 0 -#include -#endif #include #define MATE_DESKTOP_USE_UNSTABLE_API @@ -47,10 +44,6 @@ #define EMAIL_SLOTS 4 typedef struct { -#if 0 - EContact *contact; - EBook *book; -#endif GtkBuilder *dialog; GtkWidget *enable_fingerprint_button; @@ -61,12 +54,6 @@ typedef struct { GtkIconTheme *theme; MateDesktopThumbnailFactory *thumbs; -#if 0 - EContactAddress *addr1; - EContactAddress *addr2; - gchar *email[EMAIL_SLOTS]; - const gchar *email_types[EMAIL_SLOTS]; -#endif gboolean have_image; gboolean image_changed; gboolean create_self; @@ -85,73 +72,6 @@ struct WidToCid { guint cid; }; -#if 0 -enum { - ADDRESS_STREET = 1, - ADDRESS_POBOX, - ADDRESS_LOCALITY, - ADDRESS_CODE, - ADDRESS_REGION, - ADDRESS_COUNTRY -}; - -#define EMAIL_WORK 0 -#define EMAIL_HOME 1 -#define ADDRESS_HOME 21 -#define ADDRESS_WORK 27 - -struct WidToCid ids[] = { - - { "email-work-e", 0 }, /* 00 */ - { "email-home-e", 1 }, /* 01 */ - - { "phone-home-e", E_CONTACT_PHONE_HOME }, /* 02 */ - { "phone-mobile-e", E_CONTACT_PHONE_MOBILE }, /* 03 */ - { "phone-work-e", E_CONTACT_PHONE_BUSINESS }, /* 04 */ - { "phone-work-fax-e", E_CONTACT_PHONE_BUSINESS_FAX }, /* 05 */ - - { "im-jabber-e", E_CONTACT_IM_JABBER_HOME_1 }, /* 06 */ - { "im-msn-e", E_CONTACT_IM_MSN_HOME_1 }, /* 07 */ - { "im-icq-e", E_CONTACT_IM_ICQ_HOME_1 }, /* 08 */ - { "im-yahoo-e", E_CONTACT_IM_YAHOO_HOME_1 }, /* 09 */ - { "im-aim-e", E_CONTACT_IM_AIM_HOME_1 }, /* 10 */ - { "im-groupwise-e", E_CONTACT_IM_GROUPWISE_HOME_1 }, /* 11 */ - - { "web-homepage-e", E_CONTACT_HOMEPAGE_URL }, /* 12 */ - { "web-calendar-e", E_CONTACT_CALENDAR_URI }, /* 13 */ - { "web-weblog-e", E_CONTACT_BLOG_URL }, /* 14 */ - - { "job-profession-e", E_CONTACT_ROLE }, /* 15 */ - { "job-title-e", E_CONTACT_TITLE }, /* 16 */ - { "job-dept-e", E_CONTACT_ORG_UNIT }, /* 17 */ - { "job-assistant-e", E_CONTACT_ASSISTANT }, /* 18 */ - { "job-company-e", E_CONTACT_ORG }, /* 19 */ - { "job-manager-e", E_CONTACT_MANAGER }, /* 20 */ - - { "addr-street-1", ADDRESS_STREET }, /* 21 */ - { "addr-po-1", ADDRESS_POBOX }, /* 22 */ - { "addr-locality-1", ADDRESS_LOCALITY }, /* 23 */ - { "addr-code-1", ADDRESS_CODE }, /* 24 */ - { "addr-region-1", ADDRESS_REGION }, /* 25 */ - { "addr-country-1", ADDRESS_COUNTRY }, /* 26 */ - - { "addr-street-2", ADDRESS_STREET }, /* 27 */ - { "addr-po-2", ADDRESS_POBOX }, /* 28 */ - { "addr-locality-2", ADDRESS_LOCALITY }, /* 29 */ - { "addr-code-2", ADDRESS_CODE }, /* 30 */ - { "addr-region-2", ADDRESS_REGION }, /* 31 */ - { "addr-country-2", ADDRESS_COUNTRY }, /* 32 */ - - { NULL, 0 } -}; - -#define ATTRIBUTE_HOME "HOME" -#define ATTRIBUTE_WORK "WORK" -#define ATTRIBUTE_OTHER "OTHER" - -static void about_me_set_address_field (EContactAddress *, guint, gchar *); -#endif - /*** Utility functions ***/ static void about_me_error (GtkWindow *parent, gchar *str) @@ -170,25 +90,9 @@ about_me_error (GtkWindow *parent, gchar *str) static void about_me_destroy (void) { -#if 0 - e_contact_address_free (me->addr1); - e_contact_address_free (me->addr2); - - if (me->contact) - g_object_unref (me->contact); - if (me->book) - g_object_unref (me->book); -#endif if (me->dialog) g_object_unref (me->dialog); -#if 0 - g_free (me->email[0]); - g_free (me->email[1]); - g_free (me->email[2]); - g_free (me->email[3]); -#endif - g_free (me->person); g_free (me->login); g_free (me->username); @@ -196,326 +100,6 @@ about_me_destroy (void) me = NULL; } -#if 0 -static void -about_me_update_email (MateAboutMe *me) -{ - GList *attrs = NULL; - gint i; - - for (i = 0; i < EMAIL_SLOTS; ++i) { - if (me->email[i] != NULL) { - EVCardAttribute *attr; - const gchar *type = me->email_types[i]; - - attr = e_vcard_attribute_new (NULL, EVC_EMAIL); - - e_vcard_attribute_add_param_with_value (attr, - e_vcard_attribute_param_new (EVC_TYPE), - type ? type : ATTRIBUTE_OTHER); - - e_vcard_attribute_add_value (attr, me->email[i]); - attrs = g_list_append (attrs, attr); - } - } - - e_contact_set_attributes (me->contact, E_CONTACT_EMAIL, attrs); - - g_list_foreach (attrs, (GFunc) e_vcard_attribute_free, NULL); - g_list_free (attrs); -} - -static void -about_me_commit (MateAboutMe *me) -{ - EContactName *name; - - char *strings[4], **stringptr; - char *fileas; - - name = NULL; - - if (me->create_self) { - if (me->username == NULL) - fileas = g_strdup ("Myself"); - else { - name = e_contact_name_from_string (me->username); - - stringptr = strings; - if (name->family && *name->family) - *(stringptr++) = name->family; - if (name->given && *name->given) - *(stringptr++) = name->given; - *stringptr = NULL; - fileas = g_strjoinv (", ", strings); - } - - e_contact_set (me->contact, E_CONTACT_FILE_AS, fileas); - e_contact_set (me->contact, E_CONTACT_NICKNAME, me->login); - e_contact_set (me->contact, E_CONTACT_FULL_NAME, me->username); - - e_contact_name_free (name); - g_free (fileas); - } - - about_me_update_email (me); - - if (me->create_self) { - e_book_add_contact (me->book, me->contact, NULL); - e_book_set_self (me->book, me->contact, NULL); - } else { - if (!e_book_commit_contact (me->book, me->contact, NULL)) - g_warning ("Could not save contact information"); - } - - me->create_self = FALSE; -} - -static gboolean -about_me_commit_from_timeout (MateAboutMe *me) -{ - about_me_commit (me); - - return FALSE; -} - -static gboolean -about_me_focus_out (GtkWidget *widget, GdkEventFocus *event, MateAboutMe *unused) -{ - gchar *str; - const gchar *wid; - gint i; - - if (me == NULL) - return FALSE; - - wid = gtk_buildable_get_name (GTK_BUILDABLE (widget)); - - if (wid == NULL) - return FALSE; - - for (i = 0; ids[i].wid != NULL; i++) - if (strcmp (ids[i].wid, wid) == 0) - break; - - if (GTK_IS_ENTRY (widget)) { - str = gtk_editable_get_chars (GTK_EDITABLE (widget), 0, -1); - } else if (GTK_IS_TEXT_VIEW (widget)) { - GtkTextBuffer *buffer; - GtkTextIter iter_start; - GtkTextIter iter_end; - - buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (widget)); - gtk_text_buffer_get_start_iter (buffer, &iter_start); - iter_end = iter_start; - gtk_text_iter_forward_to_end (&iter_end); - str = gtk_text_iter_get_text (&iter_start, &iter_end); - } else { - return FALSE; - } - - if (i == EMAIL_HOME || i == EMAIL_WORK) { - - g_free (me->email[ids[i].cid]); - if (str[0] == '\0') - me->email[ids[i].cid] = NULL; - else - me->email[ids[i].cid] = g_strdup (str); - me->email_types[ids[i].cid] = (i == EMAIL_HOME) ? ATTRIBUTE_HOME : ATTRIBUTE_WORK; - /* FIXME: i'm getting an empty address field in evolution */ - } else if (i >= ADDRESS_HOME && i < ADDRESS_WORK) { - about_me_set_address_field (me->addr1, ids[i].cid, str); - e_contact_set (me->contact, E_CONTACT_ADDRESS_HOME, me->addr1); - } else if (i >= ADDRESS_WORK) { - about_me_set_address_field (me->addr2, ids[i].cid, str); - e_contact_set (me->contact, E_CONTACT_ADDRESS_WORK, me->addr2); - } else { - e_contact_set (me->contact, ids[i].cid, str); - } - - g_free (str); - - if (me->commit_timeout_id) { - g_source_remove (me->commit_timeout_id); - } - - me->commit_timeout_id = g_timeout_add (600, (GSourceFunc) about_me_commit_from_timeout, me); - - return FALSE; -} - - -/* - * Helpers - */ - -static gchar * -about_me_get_address_field (EContactAddress *addr, guint cid) -{ - gchar *str; - - if (addr == NULL) { - return NULL; - } - - switch (cid) { - case ADDRESS_STREET: - str = addr->street; - break; - case ADDRESS_POBOX: - str = addr->po; - break; - case ADDRESS_LOCALITY: - str = addr->locality; - break; - case ADDRESS_CODE: - str = addr->code; - break; - case ADDRESS_REGION: - str = addr->region; - break; - case ADDRESS_COUNTRY: - str = addr->country; - break; - default: - str = NULL; - break; - } - - return str; -} - -static void -about_me_set_address_field (EContactAddress *addr, guint cid, gchar *str) -{ - switch (cid) { - case ADDRESS_STREET: - g_free (addr->street); - addr->street = g_strdup (str); - break; - case ADDRESS_POBOX: - g_free (addr->po); - addr->po = g_strdup (str); - break; - case ADDRESS_LOCALITY: - g_free (addr->locality); - addr->locality = g_strdup (str); - break; - case ADDRESS_CODE: - g_free (addr->code); - addr->code = g_strdup (str); - break; - case ADDRESS_REGION: - g_free (addr->region); - addr->region = g_strdup (str); - break; - case ADDRESS_COUNTRY: - g_free (addr->country); - addr->country = g_strdup (str); - break; - } -} - -static void -about_me_setup_email (MateAboutMe *me) -{ - GList *attrs, *la; - gboolean has_home = FALSE, has_work = FALSE; - guint i; - - attrs = e_contact_get_attributes (me->contact, E_CONTACT_EMAIL); - - for (la = attrs, i = 0; la; la = la->next, ++i) { - EVCardAttribute *a = la->data; - - me->email[i] = e_vcard_attribute_get_value (a); - if (e_vcard_attribute_has_type (a, ATTRIBUTE_HOME)) { - me->email_types[i] = ATTRIBUTE_HOME; - if (!has_home) { - ids[EMAIL_HOME].cid = i; - has_home = TRUE; - } - } else if (e_vcard_attribute_has_type (a, ATTRIBUTE_WORK)) { - me->email_types[i] = ATTRIBUTE_WORK; - if (!has_work) { - ids[EMAIL_WORK].cid = i; - has_work = TRUE; - } - } else { - me->email_types[i] = ATTRIBUTE_OTHER; - } - - e_vcard_attribute_free (a); - } - - g_list_free (attrs); - - if (ids[EMAIL_HOME].cid == ids[EMAIL_WORK].cid) { - if (has_home) - ids[EMAIL_WORK].cid = 1; - else - ids[EMAIL_HOME].cid = 0; - } - - me->email_types[ids[EMAIL_WORK].cid] = ATTRIBUTE_WORK; - me->email_types[ids[EMAIL_HOME].cid] = ATTRIBUTE_HOME; -} - -/** - * about_me_load_string_field: - * - * wid: UI widget name - * cid: id of the field (EDS id) - * aid: position in the array WidToCid - **/ - -static void -about_me_load_string_field (MateAboutMe *me, const gchar *wid, guint cid, guint aid) -{ - GtkWidget *widget; - GtkBuilder *dialog; - const gchar *str; - - dialog = me->dialog; - - 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 == EMAIL_HOME || aid == EMAIL_WORK) { - str = e_contact_get_const (me->contact, E_CONTACT_EMAIL_1 + cid); - } else if (aid >= ADDRESS_HOME && aid < ADDRESS_WORK) { - str = about_me_get_address_field (me->addr1, cid); - } else if (aid >= ADDRESS_WORK) { - str = about_me_get_address_field (me->addr2, cid); - } else { - str = e_contact_get_const (me->contact, cid); - } - - str = str ? str : ""; - - if (GTK_IS_ENTRY (widget)) { - gtk_entry_set_text (GTK_ENTRY (widget), str); - } else if (GTK_IS_TEXT_VIEW (widget)) { - GtkTextBuffer *buffer; - - buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (widget)); - gtk_text_buffer_set_text (buffer, str, -1); - } - - g_signal_connect (widget, "focus-out-event", G_CALLBACK (about_me_focus_out), me); -} - -#endif - -#if 0 -static void -about_me_load_photo (MateAboutMe *me, EContact *contact) -#endif - static void about_me_load_photo (MateAboutMe *me) { @@ -640,25 +224,6 @@ about_me_update_photo (MateAboutMe *me) static void about_me_load_info (MateAboutMe *me) { -#if 0 - gint i; - - 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); - } else { - me->addr1 = g_new0 (EContactAddress, 1); - 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); - } -#endif set_fingerprint_label (me->enable_fingerprint_button, me->disable_fingerprint_button); } @@ -903,40 +468,6 @@ about_me_setup_dialog (void) main_dialog, G_CONNECT_SWAPPED); -#if 0 - /* Get the self contact */ - if (!e_book_get_self (&me->contact, &me->book, &error)) { - if (error->code == E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED) { - about_me_error (NULL, _("There was an error while trying to get the addressbook information\n" \ - "Evolution Data Server can't handle the protocol")); - g_clear_error (&error); - about_me_destroy (); - return -1; - } - - g_clear_error (&error); - - me->create_self = TRUE; - me->contact = e_contact_new (); - - if (me->book == NULL) { - me->book = e_book_new_system_addressbook (&error); - if (me->book == NULL || error != NULL) { - g_error ("%s", error->message); - g_clear_error (&error); - } - - if (e_book_open (me->book, FALSE, NULL) == FALSE) { - about_me_error (GTK_WINDOW (main_dialog), - _("Unable to open address book")); - g_clear_error (&error); - } - } - } else { - about_me_setup_email (me); - } -#endif - me->login = g_strdup (g_get_user_name ()); me->username = g_strdup (g_get_real_name ()); @@ -975,28 +506,6 @@ about_me_setup_dialog (void) g_signal_connect (me->image_chooser, "changed", G_CALLBACK (about_me_image_changed_cb), me); -#if 0 - /* Address tab: set up the focus chains */ - chain = g_list_prepend (NULL, WID ("addr-country-1")); - chain = g_list_prepend (chain, WID ("addr-po-1")); - chain = g_list_prepend (chain, WID ("addr-region-1")); - chain = g_list_prepend (chain, WID ("addr-code-1")); - chain = g_list_prepend (chain, WID ("addr-locality-1")); - chain = g_list_prepend (chain, WID ("addr-scrolledwindow-1")); - widget = WID ("addr-table-1"); - gtk_container_set_focus_chain (GTK_CONTAINER (widget), chain); - g_list_free (chain); - - chain = g_list_prepend (NULL, WID ("addr-country-2")); - chain = g_list_prepend (chain, WID ("addr-po-2")); - chain = g_list_prepend (chain, WID ("addr-region-2")); - chain = g_list_prepend (chain, WID ("addr-code-2")); - chain = g_list_prepend (chain, WID ("addr-locality-2")); - chain = g_list_prepend (chain, WID ("addr-scrolledwindow-2")); - widget = WID ("addr-table-2"); - gtk_container_set_focus_chain (GTK_CONTAINER (widget), chain); - g_list_free (chain); -#endif about_me_load_info (me); gtk_widget_show_all (main_dialog); -- cgit v1.2.1 From d1cbc7503f6ea28e6c220a2a74d0539f285f186b Mon Sep 17 00:00:00 2001 From: Scott Balneaves Date: Thu, 13 Dec 2012 12:25:17 -0600 Subject: Just deal with loading .face --- capplets/about-me/mate-about-me.c | 37 +++++++++++++------------------------ 1 file changed, 13 insertions(+), 24 deletions(-) diff --git a/capplets/about-me/mate-about-me.c b/capplets/about-me/mate-about-me.c index 9a0b048b..331abb45 100644 --- a/capplets/about-me/mate-about-me.c +++ b/capplets/about-me/mate-about-me.c @@ -49,6 +49,7 @@ typedef struct { GtkWidget *enable_fingerprint_button; GtkWidget *disable_fingerprint_button; GtkWidget *image_chooser; + GdkPixbuf *image; GdkScreen *screen; GtkIconTheme *theme; @@ -67,11 +68,6 @@ typedef struct { static MateAboutMe *me = NULL; -struct WidToCid { - gchar *wid; - guint cid; -}; - /*** Utility functions ***/ static void about_me_error (GtkWindow *parent, gchar *str) @@ -96,6 +92,7 @@ about_me_destroy (void) g_free (me->person); g_free (me->login); g_free (me->username); + g_free (me->image); g_free (me); me = NULL; } @@ -103,31 +100,24 @@ about_me_destroy (void) static void about_me_load_photo (MateAboutMe *me) { - GtkBuilder *dialog; - EContactPhoto *photo; - - dialog = me->dialog; + gchar *file; - if (me->person) - e_image_chooser_set_from_file (E_IMAGE_CHOOSER (me->image_chooser), me->person); + file = g_build_filename (g_get_home_dir (), ".face", NULL); + me->image = gdk_pixbuf_new_from_file(file, NULL); - photo = e_contact_get (contact, E_CONTACT_PHOTO); + if (me->image != NULL) + me->have_image = TRUE; + else + me->have_image = FALSE; - if (photo && photo->type == E_CONTACT_PHOTO_TYPE_INLINED) { - me->have_image = TRUE; - e_image_chooser_set_image_data (E_IMAGE_CHOOSER (me->image_chooser), - (char *) photo->data.inlined.data, photo->data.inlined.length); - e_contact_photo_free (photo); - } else { - me->have_image = FALSE; - } + g_free (file); } static void about_me_update_photo (MateAboutMe *me) { GtkBuilder *dialog; - EContactPhoto *photo; + GTKPixbuf *photo; gchar *file; GError *error; @@ -209,8 +199,6 @@ about_me_update_photo (MateAboutMe *me) } else if (me->image_changed && !me->have_image) { /* Update the image in the card */ - e_contact_set (me->contact, E_CONTACT_PHOTO, NULL); - file = g_build_filename (g_get_home_dir (), ".face", NULL); g_unlink (file); @@ -431,6 +419,7 @@ about_me_setup_dialog (void) gchar *str; me = g_new0 (MateAboutMe, 1); + me->image = NULL; dialog = gtk_builder_new (); gtk_builder_add_from_file (dialog, MATECC_UI_DIR "/mate-about-me-dialog.ui", NULL); @@ -472,7 +461,7 @@ about_me_setup_dialog (void) me->username = g_strdup (g_get_real_name ()); /* Contact Tab */ - about_me_load_photo (me, me->contact); + about_me_load_photo (me); widget = WID ("fullname"); str = g_strdup_printf ("%s", me->username); -- cgit v1.2.1 From 23d7eaabbdb414fd2f4d3f1ebb50da2bb6e6f9c7 Mon Sep 17 00:00:00 2001 From: Scott Balneaves Date: Thu, 13 Dec 2012 13:06:02 -0600 Subject: Compiles --- capplets/about-me/mate-about-me.c | 21 +++++---------------- 1 file changed, 5 insertions(+), 16 deletions(-) diff --git a/capplets/about-me/mate-about-me.c b/capplets/about-me/mate-about-me.c index 331abb45..455861d4 100644 --- a/capplets/about-me/mate-about-me.c +++ b/capplets/about-me/mate-about-me.c @@ -117,9 +117,10 @@ static void about_me_update_photo (MateAboutMe *me) { GtkBuilder *dialog; - GTKPixbuf *photo; + GdkPixbuf *photo; gchar *file; GError *error; + gboolean result; guchar *data; gsize length; @@ -173,20 +174,12 @@ about_me_update_photo (MateAboutMe *me) length = scaled_length; } - photo = g_new0 (EContactPhoto, 1); - photo->type = E_CONTACT_PHOTO_TYPE_INLINED; - photo->data.inlined.data = data; - photo->data.inlined.length = length; - e_contact_set (me->contact, E_CONTACT_PHOTO, photo); - /* Save the image for MDM */ /* FIXME: I would have to read the default used by the mdmgreeter program */ error = NULL; file = g_build_filename (g_get_home_dir (), ".face", NULL); - if (g_file_set_contents (file, - (gchar *) photo->data.inlined.data, - photo->data.inlined.length, - &error) != FALSE) { + result = gdk_pixbuf_save (photo, file, "png", &error, NULL); + if (result == TRUE) { g_chmod (file, 0644); } else { g_warning ("Could not create %s: %s", file, error->message); @@ -195,7 +188,7 @@ about_me_update_photo (MateAboutMe *me) g_free (file); - e_contact_photo_free (photo); + g_free (photo); } else if (me->image_changed && !me->have_image) { /* Update the image in the card */ @@ -205,8 +198,6 @@ about_me_update_photo (MateAboutMe *me) g_free (file); } - - about_me_commit (me); } static void @@ -382,7 +373,6 @@ about_me_button_clicked_cb (GtkDialog *dialog, gint response_id, MateAboutMe *me else { if (me->commit_timeout_id) { g_source_remove (me->commit_timeout_id); - about_me_commit (me); } about_me_destroy (); @@ -415,7 +405,6 @@ about_me_setup_dialog (void) GtkIconInfo *icon; GtkBuilder *dialog; GError *error = NULL; - GList *chain; gchar *str; me = g_new0 (MateAboutMe, 1); -- cgit v1.2.1 From 9c36e768c1636dd1e1d68dc7029a6f5918bb55d2 Mon Sep 17 00:00:00 2001 From: Scott Balneaves Date: Thu, 13 Dec 2012 15:43:18 -0600 Subject: Working better --- capplets/about-me/mate-about-me.c | 27 ++++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/capplets/about-me/mate-about-me.c b/capplets/about-me/mate-about-me.c index 455861d4..6362d2f1 100644 --- a/capplets/about-me/mate-about-me.c +++ b/capplets/about-me/mate-about-me.c @@ -88,11 +88,12 @@ about_me_destroy (void) { if (me->dialog) g_object_unref (me->dialog); + if (me->image) + g_object_unref (me->image); g_free (me->person); g_free (me->login); g_free (me->username); - g_free (me->image); g_free (me); me = NULL; } @@ -101,14 +102,19 @@ static void about_me_load_photo (MateAboutMe *me) { gchar *file; + GError *error = NULL; file = g_build_filename (g_get_home_dir (), ".face", NULL); - me->image = gdk_pixbuf_new_from_file(file, NULL); + me->image = gdk_pixbuf_new_from_file(file, &error); - if (me->image != NULL) + if (me->image != NULL) { + e_image_chooser_set_from_file (E_IMAGE_CHOOSER (me->image_chooser), file); me->have_image = TRUE; - else + } else { me->have_image = FALSE; + g_warning ("Could not load %s: %s", file, error->message); + g_error_free (error); + } g_free (file); } @@ -117,10 +123,9 @@ static void about_me_update_photo (MateAboutMe *me) { GtkBuilder *dialog; - GdkPixbuf *photo; gchar *file; GError *error; - gboolean result; + gboolean result; guchar *data; gsize length; @@ -130,7 +135,7 @@ about_me_update_photo (MateAboutMe *me) if (me->image_changed && me->have_image) { GdkPixbufLoader *loader = gdk_pixbuf_loader_new (); - GdkPixbuf *pixbuf, *scaled; + GdkPixbuf *pixbuf = NULL, *scaled = NULL; int height, width; gboolean do_scale = FALSE; float scale; @@ -170,6 +175,7 @@ about_me_update_photo (MateAboutMe *me) "compression", "9", NULL); g_free (data); + g_free (scaled); data = (guchar *) scaled_data; length = scaled_length; } @@ -178,8 +184,7 @@ about_me_update_photo (MateAboutMe *me) /* FIXME: I would have to read the default used by the mdmgreeter program */ error = NULL; file = g_build_filename (g_get_home_dir (), ".face", NULL); - result = gdk_pixbuf_save (photo, file, "png", &error, NULL); - if (result == TRUE) { + if (g_file_set_contents (file, (gchar *)data, length, &error) == TRUE) { g_chmod (file, 0644); } else { g_warning ("Could not create %s: %s", file, error->message); @@ -187,8 +192,8 @@ about_me_update_photo (MateAboutMe *me) } g_free (file); - - g_free (photo); + g_free (data); + g_object_unref (pixbuf); } else if (me->image_changed && !me->have_image) { /* Update the image in the card */ -- cgit v1.2.1 From 0eb2befbdb3b986cfe2a6ac3429951f463a10a7c Mon Sep 17 00:00:00 2001 From: Scott Balneaves Date: Thu, 13 Dec 2012 20:01:54 -0600 Subject: Make the image size correspond to the scaling --- capplets/about-me/mate-about-me-dialog.ui | 4 ++-- capplets/about-me/mate-about-me.c | 6 ++---- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/capplets/about-me/mate-about-me-dialog.ui b/capplets/about-me/mate-about-me-dialog.ui index 5324d220..c57f267c 100644 --- a/capplets/about-me/mate-about-me-dialog.ui +++ b/capplets/about-me/mate-about-me-dialog.ui @@ -57,8 +57,8 @@ 12 - 80 - 80 + 100 + 100 True True False diff --git a/capplets/about-me/mate-about-me.c b/capplets/about-me/mate-about-me.c index 6362d2f1..b48cbdee 100644 --- a/capplets/about-me/mate-about-me.c +++ b/capplets/about-me/mate-about-me.c @@ -38,8 +38,8 @@ #include "capplet-util.h" -#define MAX_HEIGHT 150 -#define MAX_WIDTH 150 +#define MAX_HEIGHT 100 +#define MAX_WIDTH 100 #define EMAIL_SLOTS 4 @@ -175,7 +175,6 @@ about_me_update_photo (MateAboutMe *me) "compression", "9", NULL); g_free (data); - g_free (scaled); data = (guchar *) scaled_data; length = scaled_length; } @@ -192,7 +191,6 @@ about_me_update_photo (MateAboutMe *me) } g_free (file); - g_free (data); g_object_unref (pixbuf); } else if (me->image_changed && !me->have_image) { -- cgit v1.2.1 From 37b7b37e16c6f8067ff213b9436027b362c476a8 Mon Sep 17 00:00:00 2001 From: Scott Balneaves Date: Fri, 14 Dec 2012 08:56:06 -0600 Subject: Remove about-me conditional compile as it has no dependencies --- capplets/Makefile.am | 8 ++------ capplets/about-me/Makefile.am | 5 +---- configure.ac | 19 ------------------- 3 files changed, 3 insertions(+), 29 deletions(-) diff --git a/capplets/Makefile.am b/capplets/Makefile.am index 437e2e45..d1236522 100644 --- a/capplets/Makefile.am +++ b/capplets/Makefile.am @@ -8,7 +8,8 @@ SUBDIRS = \ keybindings \ mouse \ network \ - windows + windows \ + about-me DIST_SUBDIRS = \ common \ @@ -23,9 +24,4 @@ DIST_SUBDIRS = \ display \ about-me - -if BUILD_ABOUTME -SUBDIRS += about-me -endif - -include $(top_srcdir)/git.mk diff --git a/capplets/about-me/Makefile.am b/capplets/about-me/Makefile.am index 6cd5e139..8249a385 100644 --- a/capplets/about-me/Makefile.am +++ b/capplets/about-me/Makefile.am @@ -28,10 +28,9 @@ marshal.h: fprintd-marshal.list marshal.c: fprintd-marshal.list @GLIB_GENMARSHAL@ --prefix=fprintd_marshal $< --body --header > $@ -if BUILD_ABOUTME bin_PROGRAMS = mate-about-me -mate_about_me_LDADD = $(MATECC_CAPPLETS_LIBS) $(LIBEBOOK_LIBS) +mate_about_me_LDADD = $(MATECC_CAPPLETS_LIBS) mate_about_me_LDFLAGS = -export-dynamic @INTLTOOL_DESKTOP_RULE@ @@ -51,8 +50,6 @@ INCLUDES = \ -DMATECC_PIXMAP_DIR="\"$(pkgdatadir)/pixmaps\"" \ -DMATELOCALEDIR="\"$(datadir)/locale\"" -endif # BUILD_ABOUTME - CLEANFILES = $(MATECC_CAPPLETS_CLEANFILES) $(desktop_DATA) $(MARSHALFILES) EXTRA_DIST = $(ui_files) fprintd-marshal.list diff --git a/configure.ac b/configure.ac index e345f2ad..747275a7 100644 --- a/configure.ac +++ b/configure.ac @@ -239,25 +239,6 @@ PKG_CHECK_MODULES(LIBMATEKBDUI, [libmatekbdui >= 1.1.0]) AC_SUBST(LIBMATEKBDUI_CFLAGS) AC_SUBST(LIBMATEKBDUI_LIBS) -dnl ============================================== -dnl About-me -dnl ============================================== - -AC_MSG_CHECKING([whether to enable About Me]) -AC_ARG_ENABLE([aboutme], - AC_HELP_STRING([--enable-aboutme], - [enable about-me capplet]),, - [enable_aboutme=no]) -AC_MSG_RESULT([$enable_aboutme]) - -dnl if test "x$enable_aboutme" = "xyes"; then -dnl PKG_CHECK_MODULES(LIBEBOOK, [libebook-1.2 >= 1.7.90], -dnl [AC_DEFINE([HAVE_LIBEBOOK], 1, -dnl [Define if evolution-data-server libebook-1.2 is available])]) -dnl fi - -AM_CONDITIONAL(BUILD_ABOUTME, test "x$enable_aboutme" = "xyes") - dnl ============================================== dnl End: Check that we meet the dependencies dnl ============================================== -- cgit v1.2.1