[balsa] Fix the build
- From: Peter Bloomfield <peterb src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [balsa] Fix the build
- Date: Thu, 6 Jun 2019 02:18:11 +0000 (UTC)
commit 2469a94e14be5eb5b372c44c79696b90c0b7af77
Author: Peter Bloomfield <PeterBloomfield bellsouth net>
Date: Wed Jun 5 22:17:08 2019 -0400
Fix the build
libbalsa/address-book-rubrica.c | 4 ++--
libbalsa/address-view.c | 18 ++++++++++++------
libbalsa/address.c | 14 +++++++-------
libbalsa/address.h | 14 +++++++-------
src/store-address.c | 6 +++---
src/store-address.h | 2 +-
6 files changed, 32 insertions(+), 26 deletions(-)
---
diff --git a/libbalsa/address-book-rubrica.c b/libbalsa/address-book-rubrica.c
index bb890dbe3..d6693b449 100644
--- a/libbalsa/address-book-rubrica.c
+++ b/libbalsa/address-book-rubrica.c
@@ -68,7 +68,7 @@ libbalsa_address_book_rubrica_modify_address(LibBalsaAddressBook * ab,
static LibBalsaABErr lbab_rubrica_load_xml(LibBalsaAddressBookRubrica *
ab_rubrica, xmlDocPtr * docptr);
-static void lbab_insert_address_node(const LibBalsaAddress * address,
+static void lbab_insert_address_node(LibBalsaAddress * address,
xmlNodePtr parent);
static gboolean lbab_rubrica_starts_from(const gchar * str,
const gchar * filter_hi);
@@ -500,7 +500,7 @@ lbab_rubrica_load_xml(LibBalsaAddressBookRubrica * ab_rubrica,
}
static void
-lbab_insert_address_node(const LibBalsaAddress * address,
+lbab_insert_address_node(LibBalsaAddress * address,
xmlNodePtr parent)
{
xmlNodePtr new_addr;
diff --git a/libbalsa/address-view.c b/libbalsa/address-view.c
index 8d1fe3a48..57f0e27fe 100644
--- a/libbalsa/address-view.c
+++ b/libbalsa/address-view.c
@@ -1273,19 +1273,25 @@ libbalsa_address_view_get_list(LibBalsaAddressView * address_view,
}
void
-libbalsa_address_view_set_book_icon(GdkPixbuf * book_icon)
+libbalsa_address_view_set_book_icon(GdkPixbuf * icon)
{
- lbav_book_icon = book_icon;
+ g_return_if_fail(GDK_IS_PIXBUF(icon));
+
+ lbav_book_icon = icon;
}
void
-libbalsa_address_view_set_close_icon(GdkPixbuf * close_icon)
+libbalsa_address_view_set_close_icon(GdkPixbuf * icon)
{
- lbav_close_icon = close_icon;
+ g_return_if_fail(GDK_IS_PIXBUF(icon));
+
+ lbav_close_icon = icon;
}
void
-libbalsa_address_view_set_drop_down_icon(GdkPixbuf * drop_down_icon)
+libbalsa_address_view_set_drop_down_icon(GdkPixbuf * icon)
{
- lbav_drop_down_icon = drop_down_icon;
+ g_return_if_fail(GDK_IS_PIXBUF(icon));
+
+ lbav_drop_down_icon = icon;
}
diff --git a/libbalsa/address.c b/libbalsa/address.c
index 267125c79..71b18f31a 100644
--- a/libbalsa/address.c
+++ b/libbalsa/address.c
@@ -1107,7 +1107,7 @@ libbalsa_address_compare(LibBalsaAddress *a, LibBalsaAddress *b)
*/
const gchar *
-libbalsa_address_get_full_name(const LibBalsaAddress * address)
+libbalsa_address_get_full_name(LibBalsaAddress * address)
{
g_return_val_if_fail(LIBBALSA_IS_ADDRESS(address), NULL);
@@ -1115,7 +1115,7 @@ libbalsa_address_get_full_name(const LibBalsaAddress * address)
}
const gchar *
-libbalsa_address_get_first_name(const LibBalsaAddress * address)
+libbalsa_address_get_first_name(LibBalsaAddress * address)
{
g_return_val_if_fail(LIBBALSA_IS_ADDRESS(address), NULL);
@@ -1123,7 +1123,7 @@ libbalsa_address_get_first_name(const LibBalsaAddress * address)
}
const gchar *
-libbalsa_address_get_last_name(const LibBalsaAddress * address)
+libbalsa_address_get_last_name(LibBalsaAddress * address)
{
g_return_val_if_fail(LIBBALSA_IS_ADDRESS(address), NULL);
@@ -1131,7 +1131,7 @@ libbalsa_address_get_last_name(const LibBalsaAddress * address)
}
const gchar *
-libbalsa_address_get_nick_name(const LibBalsaAddress * address)
+libbalsa_address_get_nick_name(LibBalsaAddress * address)
{
g_return_val_if_fail(LIBBALSA_IS_ADDRESS(address), NULL);
@@ -1139,7 +1139,7 @@ libbalsa_address_get_nick_name(const LibBalsaAddress * address)
}
const gchar *
-libbalsa_address_get_organization(const LibBalsaAddress * address)
+libbalsa_address_get_organization(LibBalsaAddress * address)
{
g_return_val_if_fail(LIBBALSA_IS_ADDRESS(address), NULL);
@@ -1147,7 +1147,7 @@ libbalsa_address_get_organization(const LibBalsaAddress * address)
}
const gchar *
-libbalsa_address_get_addr(const LibBalsaAddress * address)
+libbalsa_address_get_addr(LibBalsaAddress * address)
{
g_return_val_if_fail(LIBBALSA_IS_ADDRESS(address), NULL);
@@ -1155,7 +1155,7 @@ libbalsa_address_get_addr(const LibBalsaAddress * address)
}
GList *
-libbalsa_address_get_addr_list(const LibBalsaAddress * address)
+libbalsa_address_get_addr_list(LibBalsaAddress * address)
{
g_return_val_if_fail(LIBBALSA_IS_ADDRESS(address), NULL);
diff --git a/libbalsa/address.h b/libbalsa/address.h
index 60fabe863..244b44994 100644
--- a/libbalsa/address.h
+++ b/libbalsa/address.h
@@ -95,13 +95,13 @@ gint libbalsa_address_compare(LibBalsaAddress *a,
* Getters
*/
-const gchar * libbalsa_address_get_full_name (const LibBalsaAddress * address);
-const gchar * libbalsa_address_get_first_name (const LibBalsaAddress * address);
-const gchar * libbalsa_address_get_last_name (const LibBalsaAddress * address);
-const gchar * libbalsa_address_get_nick_name (const LibBalsaAddress * address);
-const gchar * libbalsa_address_get_organization(const LibBalsaAddress * address);
-const gchar * libbalsa_address_get_addr (const LibBalsaAddress * address);
-GList * libbalsa_address_get_addr_list (const LibBalsaAddress * address);
+const gchar * libbalsa_address_get_full_name (LibBalsaAddress * address);
+const gchar * libbalsa_address_get_first_name (LibBalsaAddress * address);
+const gchar * libbalsa_address_get_last_name (LibBalsaAddress * address);
+const gchar * libbalsa_address_get_nick_name (LibBalsaAddress * address);
+const gchar * libbalsa_address_get_organization(LibBalsaAddress * address);
+const gchar * libbalsa_address_get_addr (LibBalsaAddress * address);
+GList * libbalsa_address_get_addr_list (LibBalsaAddress * address);
/*
* Setters
diff --git a/src/store-address.c b/src/store-address.c
index fb444bec1..aa4babe96 100644
--- a/src/store-address.c
+++ b/src/store-address.c
@@ -60,7 +60,7 @@ static void store_address_add_address(StoreAddressInfo * info,
InternetAddress * address,
InternetAddress * group);
static void store_address_add_lbaddress(StoreAddressInfo * info,
- const LibBalsaAddress *address);
+ LibBalsaAddress *address);
static void store_address_add_list(StoreAddressInfo * info,
const gchar * label,
InternetAddressList * list);
@@ -120,7 +120,7 @@ balsa_store_address_from_messages(GList * messages)
}
void
-balsa_store_address(const LibBalsaAddress *address)
+balsa_store_address(LibBalsaAddress *address)
{
StoreAddressInfo *info = NULL;
@@ -411,7 +411,7 @@ store_address_add_address(StoreAddressInfo * info,
static void
store_address_add_lbaddress(StoreAddressInfo * info,
- const LibBalsaAddress *address)
+ LibBalsaAddress *address)
{
gchar *label_text;
GtkWidget **entries, *ew;
diff --git a/src/store-address.h b/src/store-address.h
index b050dbbbf..ef5dc59a0 100644
--- a/src/store-address.h
+++ b/src/store-address.h
@@ -24,6 +24,6 @@
#include "libbalsa.h"
void balsa_store_address_from_messages(GList * messages);
-void balsa_store_address(const LibBalsaAddress *address);
+void balsa_store_address(LibBalsaAddress *address);
#endif
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]