From c554190ffe6ade73009846ba6729bb79413c5346 Mon Sep 17 00:00:00 2001
From: hiro <hiro@ee746299-78ed-0310-b773-934348b2243d>
Date: Fri, 18 Apr 2014 07:01:37 +0000
Subject: applied OS X fixes.

git-svn-id: svn://sylpheed.sraoss.jp/sylpheed/trunk@3388 ee746299-78ed-0310-b773-934348b2243d
---
 ChangeLog         | 4 ++++
 src/addr_compl.c  | 7 ++++++-
 src/addressbook.c | 6 +++---
 src/compose.c     | 2 ++
 src/gtkutils.c    | 8 ++++++++
 5 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index d62c89f7..3ad2bc83 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,10 @@
 2014-04-18
 
 	* configure.in: added -lgtkmacintegration check.
+	* src/compose.c
+	  src/addressbook.c
+	  src/gtkutils.c
+	  src/addr_compl.c: applied OS X fixes.
 
 2014-04-18
 
diff --git a/src/addr_compl.c b/src/addr_compl.c
index f4e8fa06..1fcc5135 100644
--- a/src/addr_compl.c
+++ b/src/addr_compl.c
@@ -594,8 +594,13 @@ static void completion_window_advance_selection(GtkCList *clist, gboolean forwar
 			(row - 1) < 0 ? completion_count - 1 : row - 1;
 
 	gtk_clist_freeze(clist);
-	completion_window_advance_to_row(clist, row);					
+	completion_window_advance_to_row(clist, row);
 	gtk_clist_thaw(clist);
+
+#ifdef __APPLE__
+	/* workaround for a draw bug in OS X */
+	gtk_widget_queue_draw(GTK_WIDGET(clist));
+#endif
 }
 
 #if 0
diff --git a/src/addressbook.c b/src/addressbook.c
index dc6c83a2..d830ac2c 100644
--- a/src/addressbook.c
+++ b/src/addressbook.c
@@ -509,7 +509,7 @@ void addressbook_open(Compose *target)
 			gtk_tree_path_free(path);
 		}
 		addressbook_menuitem_set_sensitive();
-		gtk_widget_show_all(addrbook.window);
+		gtk_widget_show(addrbook.window);
 	} 
 
 	gtk_window_present(GTK_WINDOW(addrbook.window));
@@ -4073,10 +4073,10 @@ static void ldapsearch_callback(SyldapServer *sls)
 			server = ds->rawDataSource;
 			if (server == sls) {
 				/* Read from cache */
-				gtk_widget_show_all(addrbook.window);
+				gtk_widget_show(addrbook.window);
 				addressbook_set_list(obj);
 				addressbook_ldap_show_message(sls);
-				gtk_widget_show_all(addrbook.window);
+				gtk_widget_show(addrbook.window);
 				gtk_entry_set_text(GTK_ENTRY(addrbook.entry), "");
 			}
 		}
diff --git a/src/compose.c b/src/compose.c
index a0cfb510..9c62e04d 100644
--- a/src/compose.c
+++ b/src/compose.c
@@ -5333,6 +5333,7 @@ static Compose *compose_create(PrefsAccount *account, ComposeMode mode)
 
 	gtk_table_set_col_spacings(GTK_TABLE(table), 4);
 
+#ifndef __APPLE__
 	g_signal_connect(G_OBJECT(to_entry), "activate",
 			 G_CALLBACK(to_activated), compose);
 	g_signal_connect(G_OBJECT(newsgroups_entry), "activate",
@@ -5347,6 +5348,7 @@ static Compose *compose_create(PrefsAccount *account, ComposeMode mode)
 			 G_CALLBACK(followupto_activated), compose);
 	g_signal_connect(G_OBJECT(subject_entry), "activate",
 			 G_CALLBACK(subject_activated), compose);
+#endif
 
 	g_signal_connect(G_OBJECT(to_entry), "grab_focus",
 			 G_CALLBACK(compose_grab_focus_cb), compose);
diff --git a/src/gtkutils.c b/src/gtkutils.c
index bb234078..f57d1bd4 100644
--- a/src/gtkutils.c
+++ b/src/gtkutils.c
@@ -355,6 +355,11 @@ static void vadjustment_changed(GtkAdjustment *adj, gpointer data)
 
 	gtk_widget_queue_draw(widget);
 }
+#elif defined(__APPLE__)
+static void clist_select_row(GtkCList *clist, gint row, gint column, GdkEventButton *event, gpointer data)
+{
+	gtk_widget_queue_draw(GTK_WIDGET(clist));
+}
 #endif
 
 void gtkut_clist_set_redraw(GtkCList *clist)
@@ -364,6 +369,9 @@ void gtkut_clist_set_redraw(GtkCList *clist)
 		g_signal_connect(G_OBJECT(clist->vadjustment), "changed",
 				 G_CALLBACK(vadjustment_changed), clist);
 	}
+#elif defined(__APPLE__)
+	g_signal_connect(G_OBJECT(clist), "select-row",
+			 G_CALLBACK(clist_select_row), NULL);
 #endif
 }
 
-- 
cgit v1.2.3