diff options
| author | Lennart Poettering <lennart@poettering.net> | 2007-05-23 23:36:01 +0000 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2007-05-23 23:36:01 +0000 |
| commit | d6bf9c6f3f40d9500e995fecaeee775e590861c5 (patch) | |
| tree | 63f5f083d6ddabf341c848e84f91c0f278c31284 /src | |
| parent | 1d8ab55f4c72d1940f988adffc4c9b9b59b62e11 (diff) | |
Fix license mess: change everything to GPL
git-svn-id: file:///home/lennart/svn/public/padevchooser/trunk@26 e4aeda27-4315-0410-ac56-b21855d76123
Diffstat (limited to 'src')
| -rw-r--r-- | src/padevchooser.c | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/src/padevchooser.c b/src/padevchooser.c index 3c88031..5577287 100644 --- a/src/padevchooser.c +++ b/src/padevchooser.c @@ -4,7 +4,7 @@ This file is part of padevchooser. padevchooser is free software; you can redistribute it and/or modify - it under the terms of the GNU Lesser General Public License as published + it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. @@ -13,7 +13,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU Lesser General Public License + You should have received a copy of the GNU General Public License along with padevchooser; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. @@ -142,6 +142,13 @@ static void menu_item_info_free(struct menu_item_info *i) { g_free(i->device); g_free(i->description); g_free(i); + + if (current_sink_menu_item_info == i) + current_sink_menu_item_info = NULL; + if (current_source_menu_item_info == i) + current_source_menu_item_info = NULL; + if (current_server_menu_item_info == i) + current_server_menu_item_info = NULL; } static void notification_closed(void) { @@ -215,7 +222,7 @@ static struct menu_item_info* add_menu_item_info(GHashTable *h, GtkMenu *menu, c gboolean b; m = g_new(struct menu_item_info, 1); - + m->name = g_strdup(i->name); m->server = g_strdup(i->server); m->device = g_strdup(i->device); @@ -322,7 +329,7 @@ static void browse_cb(pa_browser *z, pa_browse_opcode_t c, const pa_browse_info break; case PA_BROWSE_NEW_SINK: - add_menu_item_info(sink_hash_table, sink_submenu, i, (GCallback) sink_change_cb); + add_menu_item_info(sink_hash_table, sink_submenu, i, (GCallback) sink_change_cb); break; case PA_BROWSE_NEW_SOURCE: |