Familiar GPE interface support fixes. Only Manage() function does not seem to work...

diff --git a/configure.ac.in b/configure.ac.in
index d65dd369c83c1ea5a30914f066617e58eccac2a8..13552c3124be0f5678424caead820e97580353f8 100644 (file)
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -2205,7 +2205,6 @@ then
     if test "x${ac_cv_gtk_headers}" = "xyes"
     then
       PLUGINS="${PLUGINS} familiar"
-      NEED_GTK_MAIN=yes
     fi
     CPPFLAGS="${CPPFLAGS_save}"
 
@@ -2232,8 +2231,9 @@ then
       then
         CFLAGS_familiar="${CFLAGS_familiar} ${CFLAGS_gpe}"
         LDFLAGS_familiar="${LDFLAGS_familiar} ${LDFLAGS_gpe}"
-        NEED_GTK_MAIN=no
       fi
+    else
+       NEED_GTK_MAIN=yes
     fi # end gpe support
   fi # end gtk+ support
 fi

diff --git a/modules/gui/familiar/familiar.c b/modules/gui/familiar/familiar.c
index 0b79da40b8561bb6bb7f634706ce28eef3238ff6..3ee55816d8cee1d7771cfbe0f6bb59b834d1f4e1 100644 (file)
--- a/modules/gui/familiar/familiar.c
+++ b/modules/gui/familiar/familiar.c
@@ -2,7 +2,7 @@
  * familiar.c : familiar plugin for vlc
  *****************************************************************************
  * Copyright (C) 2002 VideoLAN
- * $Id: familiar.c,v 1.18 2002/12/20 21:33:40 jpsaman Exp $
+ * $Id: familiar.c,v 1.19 2002/12/22 21:08:36 jpsaman Exp $
  *
  * Authors: Jean-Paul Saman <jpsaman@wxs.nl>
  *
@@ -60,10 +60,6 @@ static int Manage        ( intf_thread_t *p_intf );
 #define AUTOPLAYFILE_LONGTEXT N_("automatically play a file when selected in the "\
         "file selection list")
 
-#ifndef NEED_GTK_MAIN
-#define NEED_GTK_MAIN
-#endif
-
 /*****************************************************************************
  * Module descriptor
  *****************************************************************************/
@@ -138,13 +134,13 @@ static void Close( vlc_object_t *p_this )
  *****************************************************************************/
 static void Run( intf_thread_t *p_intf )
 {
-#ifndef NEED_GTK_MAIN
+#ifndef NEED_GTK_MAIN 
     /* gtk_init needs to know the command line. We don't care, so we
      * give it an empty one */
     char  *p_args[] = { "" };
     char **pp_args  = p_args;
     int    i_args   = 1;
-       int    i_dummy;
+    int    i_dummy;
 #endif
 
 #ifdef HAVE_GPE_INIT_H