[beepmp-cvs] bmp/beep about.c,1.4,1.5 bmp.c,1.2,1.3 bmp.h,1.1.1.1,1.2 dirbrowser.c,1.15,1.16 dirbrowser.h,1.3,1.4 dnd.h,1.2,1.3 dock.c,1.3,1.4 dock.h,1.3,1.4 general.c,1.3,1.4 general.h,1.2,1.3

[<des...@us...>]

Update of /cvsroot/beepmp/bmp/beep
In directory sc8-pr-cvs1:/tmp/cvs-serv30901

Modified Files:
	about.c bmp.c bmp.h dirbrowser.c dirbrowser.h dnd.h dock.c 
	dock.h general.c general.h 
Log Message:

- removed '#Include "beep.h"'



Index: about.c
===================================================================
RCS file: /cvsroot/beepmp/bmp/beep/about.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** about.c	24 Dec 2003 17:30:09 -0000	1.4
--- about.c	26 Dec 2003 06:15:51 -0000	1.5
***************
*** 18,22 ****
   *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
   */
! #include "beep.h"
  #include "beep_logo.xpm"
  
--- 18,29 ----
   *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
   */
! 
! #include "config.h"
! 
! #include "about.h"
! 
! #include <glib.h>
! #include <gtk/gtk.h>
! #include "i18n.h"
  #include "beep_logo.xpm"
  

Index: bmp.c
===================================================================
RCS file: /cvsroot/beepmp/bmp/beep/bmp.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** bmp.c	24 Dec 2003 14:03:12 -0000	1.2
--- bmp.c	26 Dec 2003 06:15:51 -0000	1.3
***************
*** 18,22 ****
   *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
   */
! #include "beep.h"
  
  typedef struct tagRGBQUAD {
--- 18,31 ----
   *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
   */
! 
! #include "bmp.h"
! 
! #include <glib.h>
! #include <stdio.h>
! #include <string.h>
! 
! #include "mainwin.h"
! 
! #include <sys/stat.h>
  
  typedef struct tagRGBQUAD {

Index: bmp.h
===================================================================
RCS file: /cvsroot/beepmp/bmp/beep/bmp.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** bmp.h	19 Nov 2003 16:02:53 -0000	1.1.1.1
--- bmp.h	26 Dec 2003 06:15:51 -0000	1.2
***************
*** 20,24 ****
  #define BMP_H
  
! GdkPixmap *read_bmp(char *file);
  
  #endif
--- 20,26 ----
  #define BMP_H
  
! #include <gdk/gdk.h>
! 
! GdkPixmap *read_bmp(gchar * file);
  
  #endif

Index: dirbrowser.c
===================================================================
RCS file: /cvsroot/beepmp/bmp/beep/dirbrowser.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** dirbrowser.c	26 Dec 2003 03:33:06 -0000	1.15
--- dirbrowser.c	26 Dec 2003 06:15:51 -0000	1.16
***************
*** 1,13 ****
! #include "beep.h"
! #include "main.h"
  #include <time.h>
  #include "libbeep/util.h"
  #include "libbeep/configfile.h"
! #include <sys/stat.h>
! #include <unistd.h>
  #include "playlistwin.h"
  #include "pixmaps.h"
! #include <string.h>
! #include <beep_mini.xpm>
  
  #define FILENAME_COL 3
--- 1,28 ----
! #include "config.h"
! 
! #include "dirbrowser.h"
! 
! #include <glib.h>
! #include <gtk/gtk.h>
! #include <gdk/gdk.h>
! #include <gdk/gdkkeysyms.h>
! #include <stdio.h>
! #include <string.h>
  #include <time.h>
+ 
+ #include "i18n.h"
+ #include "input.h"
+ #include "main.h"
  #include "libbeep/util.h"
  #include "libbeep/configfile.h"
! #include "playlist.h"
  #include "playlistwin.h"
  #include "pixmaps.h"
! #include "beep_mini.xpm"
! 
! #include <gdk/gdkx.h>
! #include <sys/stat.h>
! #include <unistd.h>
! #include <dirent.h>
  
  #define FILENAME_COL 3
***************
*** 1398,1402 ****
  }
  
! GtkWidget *bmp_db_create(gchar * current_path)
  {
      static GtkWidget *window;
--- 1413,1417 ----
  }
  
! GtkWidget *bmp_db_create(const gchar * current_path)
  {
      static GtkWidget *window;

Index: dirbrowser.h
===================================================================
RCS file: /cvsroot/beepmp/bmp/beep/dirbrowser.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** dirbrowser.h	26 Dec 2003 05:29:35 -0000	1.3
--- dirbrowser.h	26 Dec 2003 06:15:51 -0000	1.4
***************
*** 5,10 ****
  #include <gtk/gtk.h>
  
! GtkWidget *beep_create_dir_browser(gchar * current_path);
! GtkWidget *bmp_db_create(gchar * current_path);
  
  #endif
--- 5,9 ----
  #include <gtk/gtk.h>
  
! GtkWidget *bmp_db_create(const gchar * current_path);
  
  #endif

Index: dnd.h
===================================================================
RCS file: /cvsroot/beepmp/bmp/beep/dnd.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** dnd.h	24 Dec 2003 14:03:14 -0000	1.2
--- dnd.h	26 Dec 2003 06:15:51 -0000	1.3
***************
*** 17,20 ****
--- 17,22 ----
   */
  
+ #include <gtk/gtk.h>
+ 
  /* Designate dropped data types that we know and care about */
  enum {

Index: dock.c
===================================================================
RCS file: /cvsroot/beepmp/bmp/beep/dock.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** dock.c	24 Dec 2003 14:03:14 -0000	1.3
--- dock.c	26 Dec 2003 06:15:51 -0000	1.4
***************
*** 1,4 ****
! #include "beep.h"
  
  
  typedef struct {
--- 1,10 ----
! #include "dock.h"
! 
! #include <gdk/gdk.h>
! #include <stdlib.h>
! #include "main.h"
  
+ #include <gdk/gdkx.h>
+ #include <X11/Xlib.h>
  
  typedef struct {

Index: dock.h
===================================================================
RCS file: /cvsroot/beepmp/bmp/beep/dock.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** dock.h	24 Dec 2003 14:03:14 -0000	1.3
--- dock.h	26 Dec 2003 06:15:51 -0000	1.4
***************
*** 2,5 ****
--- 2,8 ----
  #define DOCK_H
  
+ #include <glib.h>
+ #include <gtk/gtk.h>
+ 
  void dock_set_uposition(GtkWidget * widget, gint x, gint y);
  GList *dock_add_window(GList * window_list, GtkWidget * window);

Index: general.c
===================================================================
RCS file: /cvsroot/beepmp/bmp/beep/general.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** general.c	24 Dec 2003 14:03:14 -0000	1.3
--- general.c	26 Dec 2003 06:15:51 -0000	1.4
***************
*** 1,3 ****
! #include "beep.h"
  
  #ifndef fixed
--- 1,7 ----
! #include "general.h"
! 
! #include <glib.h>
! #include <string.h>
! #include "plugin.h"
  
  #ifndef fixed

Index: general.h
===================================================================
RCS file: /cvsroot/beepmp/bmp/beep/general.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** general.h	24 Dec 2003 14:03:14 -0000	1.2
--- general.h	26 Dec 2003 06:15:51 -0000	1.3
***************
*** 2,5 ****
--- 2,7 ----
  #define GENERIC_H
  
+ #include <glib.h>
+ 
  struct GeneralPluginData {
      GList *general_list;
***************
*** 9,16 ****
  GList *get_general_list(void);
  GList *get_general_enabled_list(void);
! void enable_general_plugin(int i, gboolean enable);
! void general_about(int i);
! void general_configure(int i);
! gboolean general_enabled(int i);
  gchar *general_stringify_enabled_list(void);
  void general_enable_from_stringified_list(gchar * list);
--- 11,18 ----
  GList *get_general_list(void);
  GList *get_general_enabled_list(void);
! void enable_general_plugin(gint i, gboolean enable);
! void general_about(gint i);
! void general_configure(gint i);
! gboolean general_enabled(gint i);
  gchar *general_stringify_enabled_list(void);
  void general_enable_from_stringified_list(gchar * list);