diff options
| author | sje <sje@4f64403b-2f21-0410-a795-97e2b3489a10> | 2007-10-03 05:29:08 +0000 |
|---|---|---|
| committer | sje <sje@4f64403b-2f21-0410-a795-97e2b3489a10> | 2007-10-03 05:29:08 +0000 |
| commit | c6a2d1cb7f370fe7a64928610a6235505aea7c2d (patch) | |
| tree | a7a4e1aeac95db482c1c3fa4eb07e12499a88d24 | |
| parent | 3a457e91d83d929856305a70448e8c4c87ea0179 (diff) | |
nothing of note
git-svn-id: https://server.scottellis.com.au/svn/mim_plugs@340 4f64403b-2f21-0410-a795-97e2b3489a10
| -rw-r--r-- | metacontacts/MetaContacts.rc | 14 | ||||
| -rw-r--r-- | metacontacts/icons.c | 24 | ||||
| -rw-r--r-- | metacontacts/meta_services.c | 3 |
3 files changed, 16 insertions, 25 deletions
diff --git a/metacontacts/MetaContacts.rc b/metacontacts/MetaContacts.rc index 0c925da..b1f3722 100644 --- a/metacontacts/MetaContacts.rc +++ b/metacontacts/MetaContacts.rc @@ -7,7 +7,7 @@ //
// Generated from the TEXTINCLUDE 2 resource.
//
-#include <windows.h>
+#include "afxres.h"
/////////////////////////////////////////////////////////////////////////////
#undef APSTUDIO_READONLY_SYMBOLS
@@ -34,7 +34,7 @@ BEGIN LEFTMARGIN, 3
RIGHTMARGIN, 252
TOPMARGIN, 4
- BOTTOMMARGIN, 196
+ BOTTOMMARGIN, 252
END
IDD_METAEDIT, DIALOG
@@ -53,17 +53,17 @@ END // Dialog
//
-IDD_METASELECT DIALOGEX 0, 0, 256, 203
+IDD_METASELECT DIALOGEX 0, 0, 256, 259
STYLE DS_SETFONT | DS_MODALFRAME | DS_SETFOREGROUND | DS_3DLOOK | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
EXSTYLE WS_EX_CONTROLPARENT
CAPTION "Add to Existing MetaContact"
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
CTEXT "Please select a MetaContact:",IDC_STATIC,27,11,201,14
- DEFPUSHBUTTON "&Ok",IDOK,73,182,48,14
- PUSHBUTTON "&Cancel",IDCANCEL,133,182,48,14
- LISTBOX IDC_METALIST,44,28,168,120,LBS_NOINTEGRALHEIGHT | WS_VSCROLL
- CONTROL "Sort Alphabetically",IDC_CHK_SRT,"Button",BS_AUTOCHECKBOX | BS_VCENTER | WS_TABSTOP,86,153,124,13
+ DEFPUSHBUTTON "&Ok",IDOK,73,238,48,14
+ PUSHBUTTON "&Cancel",IDCANCEL,133,238,48,14
+ LISTBOX IDC_METALIST,44,28,168,168,LBS_NOINTEGRALHEIGHT | WS_VSCROLL
+ CONTROL "Sort Alphabetically",IDC_CHK_SRT,"Button",BS_AUTOCHECKBOX | BS_VCENTER | WS_TABSTOP,78,210,124,13
END
IDD_METAEDIT DIALOGEX 0, 0, 383, 260
diff --git a/metacontacts/icons.c b/metacontacts/icons.c index 20d0f9b..f10739c 100644 --- a/metacontacts/icons.c +++ b/metacontacts/icons.c @@ -3,15 +3,13 @@ HANDLE hIcoLibIconsChanged = NULL;
-typedef struct
-{
+typedef struct {
char* szDescr;
char* szName;
int defIconID;
} IconStruct;
-static IconStruct iconList[] =
-{
+static IconStruct iconList[] = {
{ "Toggle Off", "mc_off", IDI_MCMENUOFF },
{ "Toggle On", "mc_on", IDI_MCMENU },
{ "Convert to MetaContact", "mc_convert", IDI_MCCONVERT },
@@ -22,30 +20,26 @@ static IconStruct iconList[] = };
-HICON LoadIconEx(IconIndex i)
-{
+HICON LoadIconEx(IconIndex i) {
HICON hIcon;
if (hIcoLibIconsChanged)
hIcon = (HICON)CallService(MS_SKIN2_GETICON, 0, (LPARAM)iconList[(int)i].szName);
else
- hIcon = (HICON)LoadImage(hInstance, MAKEINTRESOURCE(iconList[(int)i].defIconID),
- IMAGE_ICON, 0, 0, 0);
+ hIcon = (HICON)LoadImage(hInstance, MAKEINTRESOURCE(iconList[(int)i].defIconID), IMAGE_ICON, 0, 0, 0);
return hIcon;
}
-void ReleaseIconEx(HICON hIcon)
-{
+void ReleaseIconEx(HICON hIcon) {
if (hIcoLibIconsChanged)
CallService(MS_SKIN2_RELEASEICON, (WPARAM)hIcon, 0);
else
DestroyIcon(hIcon);
}
-int ReloadIcons(WPARAM wParam, LPARAM lParam)
-{
+int ReloadIcons(WPARAM wParam, LPARAM lParam) {
// fix menu icons
CLISTMENUITEM menu = {0};
@@ -79,8 +73,7 @@ int ReloadIcons(WPARAM wParam, LPARAM lParam) return 0;
}
-void InitIcons(void)
-{
+void InitIcons(void) {
SKINICONDESC sid = {0};
char path[MAX_PATH];
int i;
@@ -103,7 +96,6 @@ void InitIcons(void) ReloadIcons(0, 0);
}
-void DeinitIcons(void)
-{
+void DeinitIcons(void) {
if (hIcoLibIconsChanged) UnhookEvent(hIcoLibIconsChanged);
}
diff --git a/metacontacts/meta_services.c b/metacontacts/meta_services.c index 88410ca..56dbddb 100644 --- a/metacontacts/meta_services.c +++ b/metacontacts/meta_services.c @@ -1708,8 +1708,7 @@ int Meta_FileSend(WPARAM wParam, LPARAM lParam) _snprintf(szServiceName, sizeof(szServiceName), "%s%s", proto, PSS_FILE);
if (ServiceExists(szServiceName)) {
- strncpy(szServiceName, PSS_FILE, sizeof(szServiceName));
- return (int)(CallContactService(ccs->hContact, szServiceName, ccs->wParam, ccs->lParam));
+ return (int)(CallContactService(ccs->hContact, PSS_FILE, ccs->wParam, ccs->lParam));
}
}
}
|