Don't try to use xdgmime on Windows where we don't build it. (#157944, J.

2004-11-11  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtkfilefilter.c: Don't try to use xdgmime on
	Windows where we don't build it.   (#157944, J. Ali Harlow)
This commit is contained in:
Matthias Clasen 2004-11-12 03:39:02 +00:00 committed by Matthias Clasen
parent 73b0f2bc45
commit 3411287ebd
5 changed files with 18 additions and 0 deletions

View File

@ -1,5 +1,8 @@
2004-11-11 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkfilefilter.c: Don't try to use xdgmime on
Windows where we don't build it. (#157944, J. Ali Harlow)
* gtk/gtkstatusbar.c (gtk_statusbar_size_allocate): Also
reserve space for the resize grip if the grip_window is not
realized yet. (#158010, Christian Persch)

View File

@ -1,5 +1,8 @@
2004-11-11 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkfilefilter.c: Don't try to use xdgmime on
Windows where we don't build it. (#157944, J. Ali Harlow)
* gtk/gtkstatusbar.c (gtk_statusbar_size_allocate): Also
reserve space for the resize grip if the grip_window is not
realized yet. (#158010, Christian Persch)

View File

@ -1,5 +1,8 @@
2004-11-11 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkfilefilter.c: Don't try to use xdgmime on
Windows where we don't build it. (#157944, J. Ali Harlow)
* gtk/gtkstatusbar.c (gtk_statusbar_size_allocate): Also
reserve space for the resize grip if the grip_window is not
realized yet. (#158010, Christian Persch)

View File

@ -1,5 +1,8 @@
2004-11-11 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkfilefilter.c: Don't try to use xdgmime on
Windows where we don't build it. (#157944, J. Ali Harlow)
* gtk/gtkstatusbar.c (gtk_statusbar_size_allocate): Also
reserve space for the resize grip if the grip_window is not
realized yet. (#158010, Christian Persch)

View File

@ -26,8 +26,10 @@
#include "gtkobject.h"
#include "gtkprivate.h"
#ifdef G_OS_UNIX
#define XDG_PREFIX _gtk_xdg
#include "xdgmime/xdgmime.h"
#endif
typedef struct _GtkFileFilterClass GtkFileFilterClass;
typedef struct _FilterRule FilterRule;
@ -406,7 +408,11 @@ gtk_file_filter_filter (GtkFileFilter *filter,
{
case FILTER_RULE_MIME_TYPE:
if (filter_info->mime_type != NULL
#ifdef G_OS_UNIX
&& xdg_mime_mime_type_subclass (filter_info->mime_type, rule->u.mime_type))
#else
&& strcmp (rule->u.mime_type, filter_info->mime_type) == 0)
#endif
return TRUE;
break;
case FILTER_RULE_PATTERN: