Re: [fr-cvs] mghie/src/gui MainFrame.cpp,1.66,1.67

classic Classic list List threaded Threaded
3 messages Options
Reply | Threaded
Open this post in threaded view
|

Re: [fr-cvs] mghie/src/gui MainFrame.cpp,1.66,1.67

Michael Hieke-2
Milan,

Milan Babuskov wrote:

> Modified Files:
> MainFrame.cpp
> Log Message:
> fixed disconnect problem for some linux distros
>
> Index: MainFrame.cpp
> ===================================================================
> RCS file: /cvsroot/fbmanager/mghie/src/gui/MainFrame.cpp,v
> retrieving revision 1.66
> retrieving revision 1.67
> diff -C2 -d -r1.66 -r1.67
> *** MainFrame.cpp 17 Nov 2005 10:36:41 -0000 1.66
> --- MainFrame.cpp 17 Nov 2005 11:21:49 -0000 1.67
> ***************
> *** 500,506 ****

[snip]

> ***************
> *** 821,826 ****
>       DatabaseRegistrationDialog drd(this, -1, _("Database Registration Info"));
>       drd.setDatabase(d);
> !     if (drd.ShowModal())
> !         getGlobalRoot().save();
>  
>       FR_CATCH
> --- 831,835 ----
>       DatabaseRegistrationDialog drd(this, -1, _("Database Registration Info"));
>       drd.setDatabase(d);
> !     drd.ShowModal();
>  
>       FR_CATCH
> ***************
> *** 885,890 ****
>       ServerRegistrationDialog srd(this, -1, _("Server Registration Info"));
>       srd.setServer(s);
> !     if (srd.ShowModal())
> !         getGlobalRoot().save();
>  
>       FR_CATCH
> --- 894,898 ----
>       ServerRegistrationDialog srd(this, -1, _("Server Registration Info"));
>       srd.setServer(s);
> !     srd.ShowModal();
>  
>       FR_CATCH

I will recommit those changes, because I assume it was not your
intention to remove them.

Thanks

--
Michael Hieke


-------------------------------------------------------
This SF.Net email is sponsored by the JBoss Inc.  Get Certified Today
Register for a JBoss Training Course.  Free Certification Exam
for All Training Attendees Through End of 2005. For more info visit:
http://ads.osdn.com/?ad_id=7628&alloc_id=16845&op=click
_______________________________________________
Flamerobin-devel mailing list
[hidden email]
https://lists.sourceforge.net/lists/listinfo/flamerobin-devel
Reply | Threaded
Open this post in threaded view
|

Re: [fr-cvs] mghie/src/gui MainFrame.cpp,1.66,1.67

Milan Babuskov-5
Whoops.

Guys, did I just overwrite some changes made by others?

I updated and changed the code. Than it complained something about my
clock being wrong and didn't want to commit. So, I did a diff against
CVS version, and it only shown my changes as differences. So, I
overwrite the file in CVS with my local version. And now I see some
changes that weren't in diff:

Milan Babuskov wrote:

> Update of /cvsroot/fbmanager/mghie/src/gui
> In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3517
>
> Modified Files:
> MainFrame.cpp
> ***************
> *** 821,826 ****
>       DatabaseRegistrationDialog drd(this, -1, _("Database Registration Info"));
>       drd.setDatabase(d);
> !     if (drd.ShowModal())
> !         getGlobalRoot().save();
>  
>       FR_CATCH
> --- 831,835 ----
>       DatabaseRegistrationDialog drd(this, -1, _("Database Registration Info"));
>       drd.setDatabase(d);
> !     drd.ShowModal();
>  
>       FR_CATCH
> ***************
> *** 885,890 ****
>       ServerRegistrationDialog srd(this, -1, _("Server Registration Info"));
>       srd.setServer(s);
> !     if (srd.ShowModal())
> !         getGlobalRoot().save();
>  
>       FR_CATCH
> --- 894,898 ----
>       ServerRegistrationDialog srd(this, -1, _("Server Registration Info"));
>       srd.setServer(s);
> !     srd.ShowModal();

I could change it back, I'm just not sure which version is the proper
one anymore?

If you're familiar with these lines I removed (i.e. you wrote them),
please help (removing, or adding or whatever is the right thing to do).

--
Milan Babuskov
http://www.flamerobin.org



-------------------------------------------------------
This SF.Net email is sponsored by the JBoss Inc.  Get Certified Today
Register for a JBoss Training Course.  Free Certification Exam
for All Training Attendees Through End of 2005. For more info visit:
http://ads.osdn.com/?ad_id=7628&alloc_id=16845&op=click
_______________________________________________
Flamerobin-devel mailing list
[hidden email]
https://lists.sourceforge.net/lists/listinfo/flamerobin-devel
Reply | Threaded
Open this post in threaded view
|

Re: Re: [fr-cvs] mghie/src/gui MainFrame.cpp,1.66,1.67

Milan Babuskov-2
In reply to this post by Michael Hieke-2
Michael Hieke wrote:
> I will recommit those changes, because I assume it was not your
> intention to remove them.

Yes, I did it accidentally. Please recommit.

Thanks, and sorry about that.

--
Milan Babuskov
http://www.flamerobin.org



-------------------------------------------------------
This SF.Net email is sponsored by the JBoss Inc.  Get Certified Today
Register for a JBoss Training Course.  Free Certification Exam
for All Training Attendees Through End of 2005. For more info visit:
http://ads.osdn.com/?ad_id=7628&alloc_id=16845&op=click
_______________________________________________
Flamerobin-devel mailing list
[hidden email]
https://lists.sourceforge.net/lists/listinfo/flamerobin-devel