From 5fed4b4afd515c81022e0357f5e01240327c170b Mon Sep 17 00:00:00 2001 From: Manish Singh Date: Tue, 1 Mar 2005 22:00:03 +0000 Subject: [PATCH] revert previous change, maintain ABI. Tue Mar 1 13:53:56 2005 Manish Singh * gtk/xdgmime/xdgmime.[ch]: revert previous change, maintain ABI. --- ChangeLog | 4 ++++ ChangeLog.pre-2-10 | 4 ++++ ChangeLog.pre-2-8 | 4 ++++ gtk/xdgmime/xdgmime.c | 2 +- gtk/xdgmime/xdgmime.h | 2 +- 5 files changed, 14 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index b97f3831af..69b38b68ac 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Tue Mar 1 13:53:56 2005 Manish Singh + + * gtk/xdgmime/xdgmime.[ch]: revert previous change, maintain ABI. + 2005-03-01 Matthias Clasen * gtk/gtkmenutoolbutton.c (button_state_changed_cb): diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index b97f3831af..69b38b68ac 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,7 @@ +Tue Mar 1 13:53:56 2005 Manish Singh + + * gtk/xdgmime/xdgmime.[ch]: revert previous change, maintain ABI. + 2005-03-01 Matthias Clasen * gtk/gtkmenutoolbutton.c (button_state_changed_cb): diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index b97f3831af..69b38b68ac 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,7 @@ +Tue Mar 1 13:53:56 2005 Manish Singh + + * gtk/xdgmime/xdgmime.[ch]: revert previous change, maintain ABI. + 2005-03-01 Matthias Clasen * gtk/gtkmenutoolbutton.c (button_state_changed_cb): diff --git a/gtk/xdgmime/xdgmime.c b/gtk/xdgmime/xdgmime.c index a63791b251..46798aea33 100644 --- a/gtk/xdgmime/xdgmime.c +++ b/gtk/xdgmime/xdgmime.c @@ -55,7 +55,7 @@ static XdgAliasList *alias_list = NULL; static XdgParentList *parent_list = NULL; static XdgDirTimeList *dir_time_list = NULL; static XdgCallbackList *callback_list = NULL; -const char xdg_mime_type_unknown[] = "application/octet-stream"; +const char *xdg_mime_type_unknown = "application/octet-stream"; enum diff --git a/gtk/xdgmime/xdgmime.h b/gtk/xdgmime/xdgmime.h index 4bd14ee38f..db69b1243f 100644 --- a/gtk/xdgmime/xdgmime.h +++ b/gtk/xdgmime/xdgmime.h @@ -63,7 +63,7 @@ typedef void (*XdgMimeDestroy) (void *user_data); #define xdg_mime_dump XDG_ENTRY(dump) #endif -extern const char xdg_mime_type_unknown[]; +extern const char *xdg_mime_type_unknown; #define XDG_MIME_TYPE_UNKNOWN xdg_mime_type_unknown const char *xdg_mime_get_mime_type_for_data (const void *data,