2005-02-16 William Jon McCann <mccann@jhu.edu>

* panel-applet/gtkcellrendererprogress.[ch]: Only compile these
	files for GTK 2.4 or lower, since now public in GTK 2.6.

	* panel-applet/essid.glade: Don't specify window size.


git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@456 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
William Jon McCann 2005-02-18 03:59:10 +00:00 committed by Dan Williams
parent d943bf1ea0
commit 2870a71c96
4 changed files with 25 additions and 1 deletions

View file

@ -1,3 +1,10 @@
2005-02-16 William Jon McCann <mccann@jhu.edu>
* panel-applet/gtkcellrendererprogress.[ch]: Only compile these
files for GTK 2.4 or lower, since now public in GTK 2.6.
* panel-applet/essid.glade: Don't specify window size.
2005-02-17 Dan Williams <dcbw@redhat.com>
Caught by Bill Moss:

View file

@ -5,7 +5,6 @@
<widget class="GtkDialog" id="custom_essid_dialog">
<property name="border_width">6</property>
<property name="width_request">488</property>
<property name="visible">True</property>
<property name="title" translatable="yes"></property>
<property name="type">GTK_WINDOW_TOPLEVEL</property>

View file

@ -25,6 +25,13 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
/* GtkCellRendererProgress is public in GTK 2.6, but not in GTK 2.4.
*/
#include <gtk/gtkversion.h>
#if (GTK_MAJOR_VERSION <= 2 && GTK_MINOR_VERSION < 6)
#include <stdlib.h>
#include "gtkcellrendererprogress.h"
@ -377,3 +384,4 @@ gtk_cell_renderer_progress_render (GtkCellRenderer *cell,
g_object_unref (G_OBJECT (gc));
}
#endif /* GTK < 2.6 check */

View file

@ -24,6 +24,14 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
/* GtkCellRendererProgress is public in GTK 2.6, but not in GTK 2.4.
*/
#include <gtk/gtkversion.h>
#if (GTK_MAJOR_VERSION <= 2 && GTK_MINOR_VERSION < 6)
#ifndef __GTK_CELL_RENDERER_PROGRESS_H__
#define __GTK_CELL_RENDERER_PROGRESS_H__
@ -67,3 +75,5 @@ GtkCellRenderer* gtk_cell_renderer_progress_new (void);
G_END_DECLS
#endif /* __GTK_CELL_RENDERER_PROGRESS_H__ */
#endif /* GTK < 2.6 check */