From 9d217344cce052732fbee5eb0db7cc2b5f33e904 Mon Sep 17 00:00:00 2001
From: Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>
Date: Tue, 29 Apr 2008 11:46:56 -0400
Subject: [PATCH] Force linkage when existing
---
sflphone-gtk/src/Makefile.am | 4 ++--
sflphone-gtk/src/mainwindow.c | 4 +---
2 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/sflphone-gtk/src/Makefile.am b/sflphone-gtk/src/Makefile.am
index d94ed98968..bc4e59da1a 100644
--- a/sflphone-gtk/src/Makefile.am
+++ b/sflphone-gtk/src/Makefile.am
@@ -35,8 +35,8 @@ AM_CPPFLAGS = $(DEPS_CFLAGS) \
-DCODECS_DIR=\""$(libdir)/sflphone/codecs"
# add symbolic link
-install-exec-hook:
- ln -s $(bindir)/sflphone-gtk $(bindir)/sflphone
+install-exec-local:
+ ln -sf $(bindir)/sflphone-gtk $(bindir)/sflphone
uninstall-local:
-test -h $(bindir)/sflphone && rm $(bindir)/sflphone
diff --git a/sflphone-gtk/src/mainwindow.c b/sflphone-gtk/src/mainwindow.c
index 2bf9370690..ba30ca0a3a 100644
--- a/sflphone-gtk/src/mainwindow.c
+++ b/sflphone-gtk/src/mainwindow.c
@@ -40,13 +40,11 @@ GtkWidget * mic_control = NULL;
GtkWidget * statusBar = NULL;
/**
- * Terminate the main loop.
+ * Minimize the main window.
*/
static gboolean
on_delete (GtkWidget * widget, gpointer data)
{
- /* Must return FALSE to have the window destroyed */
- //return !sflphone_quit();
gtk_widget_hide(GTK_WIDGET( get_main_window() ));
set_minimized( TRUE );
return TRUE;
--
GitLab