summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKirill Volinsky <mataes2007@gmail.com>2012-05-30 16:07:12 +0000
committerKirill Volinsky <mataes2007@gmail.com>2012-05-30 16:07:12 +0000
commit91cae4936714bc356a3686daf444d672734da13d (patch)
tree9b6f32daf9b8b398771fe7b6755d65da9613f222
parentebc5381c5e46dc9c51d75fad2afc66fbe96919ab (diff)
changed default settings for proto menus
git-svn-id: http://svn.miranda-ng.org/main/trunk@236 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
-rw-r--r--src/modules/clist/clistcore.cpp2
-rw-r--r--src/modules/clist/clistmenus.cpp2
-rw-r--r--src/modules/clist/genmenu.cpp2
-rw-r--r--src/modules/clist/genmenuopt.cpp2
-rw-r--r--src/modules/protocols/protoopts.cpp7
5 files changed, 7 insertions, 8 deletions
diff --git a/src/modules/clist/clistcore.cpp b/src/modules/clist/clistcore.cpp
index 2fe4a288e9..27121d6515 100644
--- a/src/modules/clist/clistcore.cpp
+++ b/src/modules/clist/clistcore.cpp
@@ -56,7 +56,7 @@ static void fnOnCreateClc( void )
static void fnReloadProtoMenus( void )
{
RebuildMenuOrder();
- if (DBGetContactSettingByte(NULL, "CList", "MoveProtoMenus", FALSE))
+ if (DBGetContactSettingByte(NULL, "CList", "MoveProtoMenus", TRUE))
BuildProtoMenus();
cli.pfnCluiProtocolStatusChanged(0,0);
}
diff --git a/src/modules/clist/clistmenus.cpp b/src/modules/clist/clistmenus.cpp
index 6c2a4f7a3f..1b01f51ea3 100644
--- a/src/modules/clist/clistmenus.cpp
+++ b/src/modules/clist/clistmenus.cpp
@@ -1294,7 +1294,7 @@ static INT_PTR HotkeySetStatus(WPARAM wParam,LPARAM lParam)
static INT_PTR AddProtoMenuItem(WPARAM wParam,LPARAM lParam)
{
- if ( DBGetContactSettingByte( NULL, "CList", "MoveProtoMenus", FALSE ))
+ if ( DBGetContactSettingByte( NULL, "CList", "MoveProtoMenus", TRUE ))
return AddStatusMenuItem( wParam, lParam );
return AddMainMenuItem( wParam, lParam );
diff --git a/src/modules/clist/genmenu.cpp b/src/modules/clist/genmenu.cpp
index 92ec6d3edc..8d795e67a5 100644
--- a/src/modules/clist/genmenu.cpp
+++ b/src/modules/clist/genmenu.cpp
@@ -236,7 +236,7 @@ INT_PTR MO_GetProtoRootMenu(WPARAM wParam,LPARAM lParam)
if ( szProto == NULL )
return 0;
- if ( DBGetContactSettingByte( NULL, "CList", "MoveProtoMenus", FALSE ))
+ if ( DBGetContactSettingByte( NULL, "CList", "MoveProtoMenus", TRUE ))
return ( INT_PTR )cli.pfnGetProtocolMenu( szProto );
int objidx = GetMenuObjbyId(( int )hMainMenuObject );
diff --git a/src/modules/clist/genmenuopt.cpp b/src/modules/clist/genmenuopt.cpp
index 7fefbf8dcb..9ee1e6c5b4 100644
--- a/src/modules/clist/genmenuopt.cpp
+++ b/src/modules/clist/genmenuopt.cpp
@@ -432,7 +432,7 @@ static INT_PTR CALLBACK GenMenuOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARA
dat=(struct OrderData*)mir_alloc(sizeof(struct OrderData));
SetWindowLongPtr(GetDlgItem(hwndDlg,IDC_MENUITEMS),GWLP_USERDATA,(LONG_PTR)dat);
dat->dragging = 0;
- dat->iInitMenuValue = DBGetContactSettingByte( NULL, "CList", "MoveProtoMenus", FALSE );
+ dat->iInitMenuValue = DBGetContactSettingByte( NULL, "CList", "MoveProtoMenus", TRUE );
MyOldWindowProc = (WNDPROC)GetWindowLongPtr(GetDlgItem(hwndDlg,IDC_MENUITEMS),GWLP_WNDPROC);
SetWindowLongPtr(GetDlgItem(hwndDlg,IDC_MENUITEMS),GWLP_WNDPROC,(LONG_PTR)&LBTNDOWNProc);
{
diff --git a/src/modules/protocols/protoopts.cpp b/src/modules/protocols/protoopts.cpp
index 3d9c0a2b36..d1212c3790 100644
--- a/src/modules/protocols/protoopts.cpp
+++ b/src/modules/protocols/protoopts.cpp
@@ -192,7 +192,7 @@ static INT_PTR CALLBACK AccFormDlgProc(HWND hwndDlg,UINT message, WPARAM wParam,
if ( ActivateAccount( pa )) {
pa->ppro->OnEvent( EV_PROTO_ONLOAD, 0, 0 );
- if (!DBGetContactSettingByte(NULL, "CList", "MoveProtoMenus", FALSE))
+ if (!DBGetContactSettingByte(NULL, "CList", "MoveProtoMenus", TRUE))
pa->ppro->OnEvent( EV_PROTO_ONMENU, 0, 0 );
}
else pa->type = PROTOTYPE_DISPROTO;
@@ -779,11 +779,10 @@ INT_PTR CALLBACK AccMgrDlgProc(HWND hwndDlg,UINT message, WPARAM wParam, LPARAM
if ( pa->bIsEnabled ) {
if ( ActivateAccount( pa )) {
pa->ppro->OnEvent( EV_PROTO_ONLOAD, 0, 0 );
- if (!DBGetContactSettingByte(NULL, "CList", "MoveProtoMenus", FALSE))
+ if (!DBGetContactSettingByte(NULL, "CList", "MoveProtoMenus", TRUE))
pa->ppro->OnEvent( EV_PROTO_ONMENU, 0, 0 );
}
- else pa->type = PROTOTYPE_DISPROTO;
- }
+ else pa->type = PROTOTYPE_DISPROTO; }
else {
DWORD dwStatus = CallProtoService(pa->szModuleName, PS_GETSTATUS, 0, 0);
if (dwStatus >= ID_STATUS_ONLINE) {