← Back to branch summary

~ubuntu-branches/ubuntu/trusty/erlang/trusty

« back to all changes in this revision

Viewing changes to lib/debugger/src/dbg_ui_winman.erl

  • Committer: Bazaar Package Importer
  • Author(s): Clint Byrum
  • Date: 2011-05-05 15:48:43 UTC
  • mfrom: (3.5.13 sid)
  • Revision ID: james.westby@ubuntu.com-20110505154843-0om6ekzg6m7ugj27
Tags: 1:14.b.2-dfsg-3ubuntu1
* Merge from debian unstable.  Remaining changes:
  - Drop libwxgtk2.8-dev build dependency. Wx isn't in main, and not
    supposed to.
  - Drop erlang-wx binary.
  - Drop erlang-wx dependency from -megaco, -common-test, and -reltool, they
    do not really need wx. Also drop it from -debugger; the GUI needs wx,
    but it apparently has CLI bits as well, and is also needed by -megaco,
    so let's keep the package for now.
  - debian/patches/series: Do what I meant, and enable build-options.patch
    instead.
* Additional changes:
  - Drop erlang-wx from -et
* Dropped Changes:
  - patches/pcre-crash.patch: CVE-2008-2371: outer level option with
    alternatives caused crash. (Applied Upstream)
  - fix for ssl certificate verification in newSSL: 
    ssl_cacertfile_fix.patch (Applied Upstream)
  - debian/patches/series: Enable native.patch again, to get stripped beam
    files and reduce the package size again. (build-options is what
    actually accomplished this)
  - Remove build-options.patch on advice from upstream and because it caused
    odd build failures.

Show diffs side-by-side

added added

removed removed

Lines of Context:
lib/debugger/src/dbg_ui_winman.erl
1
1
%%
2
2
%% %CopyrightBegin%
3
3
%% 
4
 
%% Copyright Ericsson AB 1998-2009. All Rights Reserved.
 
4
%% Copyright Ericsson AB 1998-2011. All Rights Reserved.
5
5
%% 
6
6
%% The contents of this file are subject to the Erlang Public License,
7
7
%% Version 1.1, (the "License"); you may not use this file except in
120
120
    {ok, #state{}}.
121
121
 
122
122
handle_call({is_started, Title}, _From, State) ->
123
 
    Reply = case lists:keysearch(Title, #win.title, State#state.wins) of
124
 
                {value, Win} -> {true, Win#win.win};
125
 
                false -> false
 
123
    Reply = case lists:keyfind(Title, #win.title, State#state.wins) of
 
124
                false -> false;
 
125
                Win -> {true, Win#win.win}
126
126
            end,
127
127
    {reply, Reply, State}.
128
128
 
134
134
 
135
135
handle_cast({clear_process, Title}, State) ->
136
136
    OldWins = State#state.wins,
137
 
    Wins = case lists:keysearch(Title, #win.title, OldWins) of
138
 
                 {value, #win{owner=Pid}} ->     
 
137
    Wins = case lists:keyfind(Title, #win.title, OldWins) of
 
138
                 #win{owner=Pid} ->
139
139
                   Msg = {dbg_ui_winman, destroy},
140
140
                   Pid ! Msg,
141
141
                   lists:keydelete(Title, #win.title, OldWins);
147
147
handle_info({'EXIT', Pid, _Reason}, State) ->
148
148
    [Mon | _Wins] = State#state.wins,
149
149
    if
150
 
        Pid==Mon#win.owner -> {stop, normal, State};
 
150
        Pid =:= Mon#win.owner -> {stop, normal, State};
151
151
        true ->
152
152
            Wins2 = lists:keydelete(Pid, #win.owner, State#state.wins),
153
153
            inform_all(Wins2),