[Commits] [SCM] claws branch, master, updated. 3.16.0-244-g0050d6e

ticho at claws-mail.org ticho at claws-mail.org
Sun Jul 22 21:06:40 CEST 2018


The branch, master has been updated
       via  0050d6e5ba1cc3aaf5faa541e011794d49259caa (commit)
      from  67583f39b58f302959d215a48734a5167f7c50ef (commit)

Summary of changes:
 src/account.c                           |    4 ----
 src/addressbook_foldersel.c             |   22 ----------------------
 src/editaddress_other_attributes_ldap.c |   16 ----------------
 src/plugins/libravatar/libravatar.c     |    8 --------
 src/plugins/pgpcore/select-keys.c       |   13 -------------
 src/summary_search.c                    |    6 ------
 6 files changed, 69 deletions(-)


- Log -----------------------------------------------------------------
commit 0050d6e5ba1cc3aaf5faa541e011794d49259caa
Author: Andrej Kacian <ticho at claws-mail.org>
Date:   Sun Jul 22 21:06:26 2018 +0200

    Removed a few obsolete and unused functions.

diff --git a/src/account.c b/src/account.c
index 6fb22b6..cf28983 100644
--- a/src/account.c
+++ b/src/account.c
@@ -156,10 +156,6 @@ static void account_get_all_toggled		(GtkCellRendererToggle	*widget,
 						 gchar			*path, 
 						 GtkWidget		*list_view);
 
-static void account_autocheck_toggled		(GtkCellRendererToggle	*widget,
-						 gchar			*path,
-						 GtkWidget		*list_view);
-
 static void account_double_clicked		(GtkTreeView		*list_view,
 						 GtkTreePath		*path,
 						 GtkTreeViewColumn	*column,
diff --git a/src/addressbook_foldersel.c b/src/addressbook_foldersel.c
index 6b8c41f..14ca696 100644
--- a/src/addressbook_foldersel.c
+++ b/src/addressbook_foldersel.c
@@ -54,13 +54,6 @@ typedef struct {
 	ItemFolder	*folder;
 } FolderInfo;
 
-typedef struct {
-	gchar **folder_path;
-	gboolean matched;
-	gint index;
-	GtkCMCTreeNode *node;
-} FolderPathMatch;
-
 static struct _AddressBookFolderSel_dlg {
 	GtkWidget *window;
 	GtkWidget *view_folder;
@@ -135,21 +128,6 @@ static void addressbook_foldersel_row_activated(GtkTreeView *view,
 	addressbook_foldersel_ok(NULL, NULL);
 }
 
-static gboolean addressbook_foldersel_tree_button( GtkCMCTree *ctree, GdkEventButton *event, gpointer data )
-{
-	if ( ! event )
-		return FALSE;
-	if ( event->button == 1 ) {
-		/* Handle double click */
-		if ( event->type == GDK_2BUTTON_PRESS ) {
-			addressbook_foldersel_cancelled = FALSE;
-			gtk_main_quit();
-		}
-	}
-
-	return FALSE;
-}
-
 static void addressbook_foldersel_size_allocate_cb(GtkWidget *widget,
 					 GtkAllocation *allocation)
 {
diff --git a/src/editaddress_other_attributes_ldap.c b/src/editaddress_other_attributes_ldap.c
index 0ede96a..e4c9650 100644
--- a/src/editaddress_other_attributes_ldap.c
+++ b/src/editaddress_other_attributes_ldap.c
@@ -95,22 +95,6 @@ static gboolean list_find_attribute(const gchar *attr)
 	return FALSE;
 }
 
-/*
-* Comparison using cell contents (text in first column). Used for sort
-* address index widget.
-*/
-static gint edit_person_attrib_compare_func(GtkCMCList *clist, gconstpointer ptr1, gconstpointer ptr2) {
-	GtkCMCell *cell1 = ((GtkCMCListRow *)ptr1)->cell;
-	GtkCMCell *cell2 = ((GtkCMCListRow *)ptr2)->cell;
-	gchar *name1 = NULL, *name2 = NULL;
-
-	if (cell1) name1 = cell1->u.text;
-	if (cell2) name2 = cell2->u.text;
-	if (!name1) return (name2 != NULL);
-	if (!name2) return -1;
-	return g_utf8_collate(name1, name2);
-}
-
 static void edit_person_combo_box_changed(GtkComboBox *opt_menu, gpointer data)
 {
 	GtkWidget *view = GTK_WIDGET(data);
diff --git a/src/plugins/libravatar/libravatar.c b/src/plugins/libravatar/libravatar.c
index 41290aa..dee85bb 100644
--- a/src/plugins/libravatar/libravatar.c
+++ b/src/plugins/libravatar/libravatar.c
@@ -146,14 +146,6 @@ static gchar *cache_name_for_md5(const gchar *md5)
 	return g_strconcat(cache_dir, md5, NULL);
 }
 
-static size_t write_image_data_cb(void *ptr, size_t size, size_t nmemb, void *stream)
-{
-	size_t written = fwrite(ptr, size, nmemb, (FILE *)stream);
-	debug_print("received %zu bytes from avatar server\n", written);
-
-	return written;
-}
-
 static GtkWidget *image_widget_from_url(const gchar *url, const gchar *md5)
 {
 	GtkWidget *image = NULL;
diff --git a/src/plugins/pgpcore/select-keys.c b/src/plugins/pgpcore/select-keys.c
index 76b3ebd..677c6f7 100644
--- a/src/plugins/pgpcore/select-keys.c
+++ b/src/plugins/pgpcore/select-keys.c
@@ -85,9 +85,6 @@ static void select_btn_cb (GtkWidget *widget, gpointer data);
 static void cancel_btn_cb (GtkWidget *widget, gpointer data);
 static void dont_encrypt_btn_cb (GtkWidget *widget, gpointer data);
 static void other_btn_cb (GtkWidget *widget, gpointer data);
-static void sort_keys (struct select_keys_s *sk, enum col_titles column);
-static void sort_keys_name (GtkWidget *widget, gpointer data);
-static void sort_keys_email (GtkWidget *widget, gpointer data);
 
 static gboolean use_untrusted (gpgme_key_t, gpgme_user_id_t uid, gpgme_protocol_t proto);
 
@@ -175,16 +172,6 @@ gpgmegtk_recipient_selection (GSList *recp_names, SelectionResult *result,
 } 
 
 static void
-destroy_key (gpointer data)
-{
-    gpgme_key_t key = data;
-
-    debug_print("unref key %p\n", key);
-
-    gpgme_key_unref (key);
-}
-
-static void
 set_row (GtkListStore *store, gpgme_key_t key, gpgme_protocol_t proto)
 {
     const gchar *s;
diff --git a/src/summary_search.c b/src/summary_search.c
index 9d05951..654d881 100644
--- a/src/summary_search.c
+++ b/src/summary_search.c
@@ -131,7 +131,6 @@ static void subject_changed			(void);
 static void body_changed			(void);
 static void adv_condition_changed	(void);
 static void case_changed			(GtkToggleButton *togglebutton, gpointer user_data);
-static void adv_search_changed		(GtkToggleButton *togglebutton, gpointer user_data);
 
 static gboolean from_entry_focus_evt_in(GtkWidget *widget, GdkEventFocus *event,
 			      	  gpointer data);
@@ -966,11 +965,6 @@ static void case_changed(GtkToggleButton *togglebutton, gpointer user_data)
 	search_window.matcher_is_outdated = TRUE;
 }
 
-static void adv_search_changed(GtkToggleButton *togglebutton, gpointer user_data)
-{
-	search_window.matcher_is_outdated = TRUE;
-}
-
 static gboolean from_entry_focus_evt_in(GtkWidget *widget, GdkEventFocus *event,
 			      	  gpointer data)
 {

-----------------------------------------------------------------------


hooks/post-receive
-- 
Claws Mail


More information about the Commits mailing list