From d469d93dd964bdc3e5b46bddee3bc9813ad43a7b Mon Sep 17 00:00:00 2001 From: Hugo Villeneuve Date: Wed, 23 Aug 2006 03:38:09 +0000 Subject: [PATCH] Removed all dependencies to gdk-pixbuf --- configure.in | 9 --------- src/calendar.c | 1 - src/clock.c | 1 - src/dockapp.c | 3 +-- src/hvclock.c | 14 -------------- 5 files changed, 1 insertion(+), 27 deletions(-) diff --git a/configure.in b/configure.in index 5c06b3c..29d4029 100644 --- a/configure.in +++ b/configure.in @@ -53,15 +53,6 @@ echo "Can't find header file for library Xext" ; exit 1) AC_CHECK_LIB(Xext, XShapeCombineMask, LIBS="${LIBS} -lXext", echo "Can't find Xext library" ; exit 1, "${X_LIBS}") -dnl Checking for gdk-pixbuf library -dnl The path to 'gdk-pixbuf-config' must be in your $PATH environment variable. If not, -dnl you can try setting the $GDK_PIXBUF_CONFIG environment variable to the complete path -dnl and filename where 'gdk-pixbuf-config' is located like in this example: -dnl GDK_PIXBUF_CONFIG="/opt/gnome-1.4/bin/gdk-pixbuf-config" ./configure -AM_PATH_GDK_PIXBUF(0.7.0,,AC_MSG_ERROR([gdk-pixbuf >= 0.7.0 is required])) -CFLAGS="${CFLAGS} ${GDK_PIXBUF_CFLAGS}" -LIBS="${LIBS} ${GDK_PIXBUF_LIBS}" - AC_CHECK_HEADERS(math.h, ,dnl echo "Can't find header file for math library" ; exit 1) dnl Checking for math library diff --git a/src/calendar.c b/src/calendar.c index f2a1ca1..ac9c006 100644 --- a/src/calendar.c +++ b/src/calendar.c @@ -20,7 +20,6 @@ #include #include #include -#include #include "common.h" #include "dockapp.h" diff --git a/src/clock.c b/src/clock.c index 89fc62a..1e9ce46 100644 --- a/src/clock.c +++ b/src/clock.c @@ -23,7 +23,6 @@ #include #include #include -#include #include "common.h" #include "dockapp.h" diff --git a/src/dockapp.c b/src/dockapp.c index 71d5f61..5221e18 100644 --- a/src/dockapp.c +++ b/src/dockapp.c @@ -142,6 +142,7 @@ InitDockAppWindow( int argc, char *argv[], char *pixmap_data[], int status; int gravity = 0; /* Used to store the gravity value returned by XWMGeometry, but not used. */ + char *app_name = "hvclock"; /* Opening a connection to the X server. */ dockapp.display = XOpenDisplay( display_arg ); @@ -196,7 +197,6 @@ InitDockAppWindow( int argc, char *argv[], char *pixmap_data[], /* Setting the WM_CLASS property. */ { - char *app_name = argv[0]; XClassHint wm_class; /* The res_name member contains the application name. @@ -219,7 +219,6 @@ InitDockAppWindow( int argc, char *argv[], char *pixmap_data[], { XTextProperty text_prop; - char *app_name = argv[0]; const int string_count = 1; status = XStringListToTextProperty( &app_name, string_count, &text_prop ); diff --git a/src/hvclock.c b/src/hvclock.c index 910c5c3..410420d 100644 --- a/src/hvclock.c +++ b/src/hvclock.c @@ -29,7 +29,6 @@ #include #include #include -#include #include "common.h" #include "dockapp.h" @@ -163,19 +162,6 @@ main( int argc, char *argv[] ) /* Initialization */ ParseCommandLineOptions( argc, argv ); - /* We must call gdk_init_check() manually. Gtk+ or Gnome applications don't need to do - that because gtk_init() or gnome_init() do it automatically. */ - status = gdk_init_check( &argc, &argv ); - if( status == 0 ) { - fprintf( stderr, - "%s: GDK initialization failed, check your $DISPLAY environment variable\n", - PACKAGE ); - ErrorLocation( __FILE__, __LINE__ ); - exit( EXIT_FAILURE ); - } - - (void) gdk_rgb_init(); - /* Initialize callback function pointers. */ ProcessXlibEventsInit( SingleClick, NULL ); -- 2.20.1