mirror of
https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git
synced 2026-04-24 06:50:47 +02:00
2005-01-24 Dan Williams <dcbw@redhat.com>
* panel-applet/gtkcellview.[ch]
panel-applet/menu-info.c
- Fix GTK version checks to be <= rather than <
* test/Makefile.am
- Include the libtool archive of libnm_glib rather than
trying to pull in the .so
git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@397 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
parent
2ba55c0e32
commit
65f570b0a0
5 changed files with 17 additions and 3 deletions
10
ChangeLog
10
ChangeLog
|
|
@ -1,3 +1,13 @@
|
|||
2005-01-24 Dan Williams <dcbw@redhat.com>
|
||||
|
||||
* panel-applet/gtkcellview.[ch]
|
||||
panel-applet/menu-info.c
|
||||
- Fix GTK version checks to be <= rather than <
|
||||
|
||||
* test/Makefile.am
|
||||
- Include the libtool archive of libnm_glib rather than
|
||||
trying to pull in the .so
|
||||
|
||||
2005-01-24 Dan Williams <dcbw@redhat.com>
|
||||
|
||||
* src/NetworkManagerDevice.c
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@
|
|||
|
||||
#include <gtk/gtkversion.h>
|
||||
|
||||
#if (GTK_MAJOR_VERSION < 2 && GTK_MINOR_VERSION < 6)
|
||||
#if (GTK_MAJOR_VERSION <= 2 && GTK_MINOR_VERSION < 6)
|
||||
|
||||
#include "gtkcellview.h"
|
||||
#include <gtk/gtksignal.h>
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@
|
|||
|
||||
#include <gtk/gtkversion.h>
|
||||
|
||||
#if (GTK_MAJOR_VERSION < 2 && GTK_MINOR_VERSION < 6)
|
||||
#if (GTK_MAJOR_VERSION <= 2 && GTK_MINOR_VERSION < 6)
|
||||
|
||||
#ifndef __GTK_CELL_VIEW_H__
|
||||
#define __GTK_CELL_VIEW_H__
|
||||
|
|
|
|||
|
|
@ -33,7 +33,11 @@
|
|||
#include <libintl.h>
|
||||
#include <string.h>
|
||||
#include "menu-info.h"
|
||||
|
||||
#if (GTK_MAJOR_VERSION <= 2 && GTK_MINOR_VERSION < 6)
|
||||
#include "gtkcellview.h"
|
||||
#endif
|
||||
|
||||
#include "gtkcellrendererprogress.h"
|
||||
#include "NMWirelessAppletDbus.h"
|
||||
|
||||
|
|
|
|||
|
|
@ -20,4 +20,4 @@ nmtestdevices_SOURCES = nmtestdevices.c
|
|||
nmtestdevices_LDADD = $(DBUS_LIBS) $(GTHREAD_LIBS)
|
||||
|
||||
libnm_glib_test_SOURCES = libnm_glib_test.c
|
||||
libnm_glib_test_LDADD = $(DBUS_LIBS) $(GTHREAD_LIBS) -L${top_srcdir}/libnm_glib -lnm_glib
|
||||
libnm_glib_test_LDADD = $(DBUS_LIBS) $(GTHREAD_LIBS) ../libnm_glib/libnm_glib.la
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue