diff --git a/ChangeLog b/ChangeLog
index 616632033ef8355297e10f9a6ea015be0d2fc172..ed2d832ca453a1813d669be467738e2a8c535878 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2006-06-13	Benedikt Meurer <benny@xfce.org>
+
+	* configure.in.in: Use --as-needed if supported by the linker.
+	* thunar/thunar-properties-dialog.c(thunar_properties_dialog_init):
+	  Use GtkLabel instead of ExoEllipsizedLabel here.
+	* plugins/thunar-sendto/main.c(tse_ask_compress): Initialize info
+	  properly here.
+
 2006-06-11	Benedikt Meurer <benny@xfce.org>
 
 	* plugins/thunar-sendto-email/main.c(tse_ask_compress): Do not try to
diff --git a/configure.in.in b/configure.in.in
index 68c6f0ce8ab04cfc0a96f942947f3df20048f22c..7af7ab67c94d1ad23890251e7ba08b7eb40cc2f4 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -299,6 +299,16 @@ AC_MSG_RESULT([$enable_debug])
 dnl **************************************
 dnl *** Check for linker optimizations ***
 dnl **************************************
+AC_MSG_CHECKING([whether $LD accepts --as-needed])
+case `$LD --as-needed -v 2>&1 </dev/null` in
+*GNU* | *'with BFD'*)
+  LDFLAGS="$LDFLAGS -Wl,--as-needed"
+  AC_MSG_RESULT([yes])
+  ;;
+*)
+  AC_MSG_RESULT([no])
+  ;;
+esac
 AC_MSG_CHECKING([whether $LD accepts -O1])
 case `$LD -O1 -v 2>&1 </dev/null` in
 *GNU* | *'with BFD'*)
diff --git a/plugins/thunar-sendto-email/main.c b/plugins/thunar-sendto-email/main.c
index 7ecfef2ad4afe14105d739f054891c613adb9d0f..75f44f598ff28225233b16c736d143d5598e76ec 100644
--- a/plugins/thunar-sendto-email/main.c
+++ b/plugins/thunar-sendto-email/main.c
@@ -168,6 +168,7 @@ tse_ask_compress (GList *infos)
       if (G_LIKELY (n_infos == 1))
         {
           /* ask the user whether to compress the file */
+          info = (ThunarVfsInfo *) infos->data;
           message = gtk_message_dialog_new (NULL, 0, GTK_MESSAGE_QUESTION, GTK_BUTTONS_NONE,
                                             _("Send \"%s\" as compressed archive?"), info->display_name);
           gtk_dialog_add_button (GTK_DIALOG (message), GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL);
diff --git a/thunar/thunar-progress-dialog.c b/thunar/thunar-progress-dialog.c
index a5bb1a0a5101a3df299c81acfb28e95811e4f208..b1a8a00ec78ee0981f69b1d3fa44bb2847767a82 100644
--- a/thunar/thunar-progress-dialog.c
+++ b/thunar/thunar-progress-dialog.c
@@ -195,7 +195,7 @@ thunar_progress_dialog_init (ThunarProgressDialog *dialog)
   gtk_table_attach (GTK_TABLE (table), label, 1, 2, 0, 1, GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 6);
   gtk_widget_show (label);
 
-  dialog->progress_label = g_object_new (EXO_TYPE_ELLIPSIZED_LABEL, "ellipsize", EXO_PANGO_ELLIPSIZE_START, "xalign", 0.0f, NULL);
+  dialog->progress_label = g_object_new (GTK_TYPE_LABEL, "ellipsize", PANGO_ELLIPSIZE_START, "xalign", 0.0f, NULL);
   gtk_table_attach (GTK_TABLE (table), dialog->progress_label, 0, 2, 1, 2, GTK_EXPAND | GTK_FILL, GTK_FILL, 0, 0);
   gtk_widget_show (dialog->progress_label);