diff options
| author | George Hazan <george.hazan@gmail.com> | 2013-04-07 21:13:14 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2013-04-07 21:13:14 +0000 |
| commit | 8c760ecefaf5085cb8cae48fccf07f3115c99287 (patch) | |
| tree | 5553c4bea09090fa7103eab6c249ffee154e5034 | |
| parent | 3ab11e1d7ceea5ef5fa18091cf44349a8ecf2210 (diff) | |
duplicate file removed
git-svn-id: http://svn.miranda-ng.org/main/trunk@4379 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
| -rw-r--r-- | plugins/AvatarHistory/src/AvatarHistory.h | 2 | ||||
| -rw-r--r-- | plugins/ExternalAPI/m_avatarhist.h | 51 | ||||
| -rw-r--r-- | plugins/ExternalAPI/m_avatarhistory.h | 2 |
3 files changed, 2 insertions, 53 deletions
diff --git a/plugins/AvatarHistory/src/AvatarHistory.h b/plugins/AvatarHistory/src/AvatarHistory.h index 70ac3dfd1e..20dcd8f518 100644 --- a/plugins/AvatarHistory/src/AvatarHistory.h +++ b/plugins/AvatarHistory/src/AvatarHistory.h @@ -22,7 +22,7 @@ #include <m_folders.h>
#include <m_metacontacts.h>
-#include <m_avatarhist.h>
+#include <m_avatarhistory.h>
#include "../utils/mir_options.h"
diff --git a/plugins/ExternalAPI/m_avatarhist.h b/plugins/ExternalAPI/m_avatarhist.h deleted file mode 100644 index 7f19c1f420..0000000000 --- a/plugins/ExternalAPI/m_avatarhist.h +++ /dev/null @@ -1,51 +0,0 @@ -/*
-Copyright (C) 2006 MattJ, Ricardo Pescuma Domenecci
-
-This is free software; you can redistribute it and/or
-modify it under the terms of the GNU Library General Public
-License as published by the Free Software Foundation; either
-version 2 of the License, or (at your option) any later version.
-
-This is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-Library General Public License for more details.
-
-You should have received a copy of the GNU Library General Public
-License along with this file; see the file license.txt. If
-not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.
-*/
-
-
-#ifndef __M_AVATARHISTORY_H__
-# define __M_AVATARHISTORY_H__
-
-#define EVENTTYPE_AVATAR_CHANGE 9003
-
-
-/*
-Return TRUE is Avatar History is enabled for this contact
-
-wParam: hContact
-lParam: ignored
-*/
-#define MS_AVATARHISTORY_ENABLED "AvatarHistory/IsEnabled"
-
-
-/*
-Get cached avatar
-
-wParam: (char *) protocol name
-lParam: (TCHAR *) hash
-return: (TCHAR *) NULL if none is found or the path to the avatar. You need to free this string
- with mir_free.
-*/
-#define MS_AVATARHISTORY_GET_CACHED_AVATAR "AvatarHistory/GetCachedAvatar"
-
-
-#define MS_AVATARHISTORY_SHOWDIALOG "AvatarHistory/ShowDialog"
-
-
-
-#endif // __M_AVATARHISTORY_H__
diff --git a/plugins/ExternalAPI/m_avatarhistory.h b/plugins/ExternalAPI/m_avatarhistory.h index 2613dee3b4..1ef28edf76 100644 --- a/plugins/ExternalAPI/m_avatarhistory.h +++ b/plugins/ExternalAPI/m_avatarhistory.h @@ -21,7 +21,6 @@ Boston, MA 02111-1307, USA. #ifndef __M_AVATARHISTORY_H__
# define __M_AVATARHISTORY_H__
-
#define EVENTTYPE_AVATAR_CHANGE 9003
@@ -45,6 +44,7 @@ return: (TCHAR *) NULL if none is found or the path to the avatar. You need to f #define MS_AVATARHISTORY_GET_CACHED_AVATAR "AvatarHistory/GetCachedAvatar"
+#define MS_AVATARHISTORY_SHOWDIALOG "AvatarHistory/ShowDialog"
|