From 5b83af28b6eeb52a285618cd90f30a5461189efd Mon Sep 17 00:00:00 2001 From: David Robillard Date: Tue, 17 Oct 2006 08:03:33 +0000 Subject: Launch servers by default on start (unless environment variables are set), i.e. do what usual clients are "supposed to" do. Fixed icon bug. git-svn-id: http://svn.drobilla.net/lad/patchage@188 a436a847-0d15-0410-975c-d299462d15a1 --- Makefile.am | 3 --- patchage-icon.svg | 55 --------------------------------------------------- src/LashDriver.cpp | 2 +- src/Makefile.am | 3 +++ src/patchage-icon.svg | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++ src/patchage.glade | 39 ++++++++++++++++++------------------ 6 files changed, 79 insertions(+), 78 deletions(-) delete mode 100644 patchage-icon.svg create mode 100644 src/patchage-icon.svg diff --git a/Makefile.am b/Makefile.am index cfc4fa7..42e35a3 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,8 +1,5 @@ SUBDIRS = src -globalpixmapsdir = $(datadir)/pixmaps -dist_globalpixmaps_DATA = patchage-icon.svg - desktopfilesdir = $(datadir)/applications dist_desktopfiles_DATA = patchage.desktop diff --git a/patchage-icon.svg b/patchage-icon.svg deleted file mode 100644 index 2ae321a..0000000 --- a/patchage-icon.svg +++ /dev/null @@ -1,55 +0,0 @@ - - - - - - - image/svg+xml - - - - - - - - diff --git a/src/LashDriver.cpp b/src/LashDriver.cpp index 7347842..ee92176 100644 --- a/src/LashDriver.cpp +++ b/src/LashDriver.cpp @@ -49,7 +49,7 @@ LashDriver::attach(bool launch_daemon) return; int lash_flags = LASH_Config_File; - if (launch_daemon) + if (!launch_daemon) lash_flags |= LASH_No_Start_Server; m_client = lash_init(m_args, PACKAGE_NAME, lash_flags, LASH_PROTOCOL(2, 0)); if (m_client == NULL) { diff --git a/src/Makefile.am b/src/Makefile.am index 0942c18..320d81a 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -6,6 +6,9 @@ EXTRA_DIST = patchage.gladep sharefilesdir = $(pkgdatadir) dist_sharefiles_DATA = patchage.glade +globalpixmapsdir = $(datadir)/pixmaps +dist_globalpixmaps_DATA = patchage-icon.svg + bin_PROGRAMS = patchage patchage_SOURCES = \ main.cpp \ diff --git a/src/patchage-icon.svg b/src/patchage-icon.svg new file mode 100644 index 0000000..2ae321a --- /dev/null +++ b/src/patchage-icon.svg @@ -0,0 +1,55 @@ + + + + + + + image/svg+xml + + + + + + + + diff --git a/src/patchage.glade b/src/patchage.glade index 1550031..f6dada3 100644 --- a/src/patchage.glade +++ b/src/patchage.glade @@ -52,7 +52,7 @@ - + True gtk-open 1 @@ -74,7 +74,7 @@ - + True gtk-save 1 @@ -96,7 +96,7 @@ - + True gtk-save-as 1 @@ -125,7 +125,7 @@ - + True gtk-save 1 @@ -175,7 +175,7 @@ - + True gtk-preferences 1 @@ -197,13 +197,13 @@ True - Launch JACK + Connect to JACK (Launch) True - + True gtk-execute 1 @@ -219,13 +219,13 @@ True - Connect to _JACK + Connect to _JACK (Don't Launch) True - + True gtk-connect 1 @@ -247,7 +247,7 @@ - + True gtk-disconnect 1 @@ -275,7 +275,7 @@ - + True gtk-connect 1 @@ -297,7 +297,7 @@ - + True gtk-disconnect 1 @@ -319,13 +319,13 @@ True - Launch LASH + Connect to LASH (Launch) True - + True gtk-execute 1 @@ -341,13 +341,13 @@ True - Connect to _LASH + Connect to _LASH (Don't Launch) True - + True gtk-connect 1 @@ -369,7 +369,7 @@ - + True gtk-disconnect 1 @@ -416,7 +416,7 @@ - + True gtk-refresh 1 @@ -836,7 +836,7 @@ True Patchage © 2006 Dave Robillard - A control centre for audio and music production systems + A control centre for music/audio systems Patchage is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or @@ -855,6 +855,7 @@ along with Patchage; if not, write to the Free Software Foundation, Inc., http://codeson.net/software/patchage Dave Robillard <dave@codeson.net> translator-credits + patchage-icon.svg -- cgit v1.2.1