On Thu, 30 Jun 2011 20:31:06 +0200
Frank Lanitz <fr...@frank.uvena.de> wrote:
> On Thu, 30 Jun 2011 11:31:21 +0400
> Eugene Arshinov <earshi...@gmail.com> wrote:
>
> > [snip]
> >
> > So, the only useful thing in SM branch is the minor improvements.
> > Even if someone has time to discuss them and decide to include them
> > in trunk, it may be rather hard to cleanly extract the necessary
> > patches from SM so that they apply to trunk.
>
> Well, not sure and just a thought. Would it be possible to extract the
> little improvements so they could be merged to trunk? Can you give a
> more detailed view on the et? What do the improvements include?
>
Hi Frank.
Recently I posted pull request #34 that fixed opening project in an
already running project. It's already accepted and closed. Now it
seems to me that was the last meaningful (though, very tiny) change
from SM that could be useful in trunk.
There are another changes in SM. They can be rather easily viewed by
cloning my SM repository [1] and running `git log` command [2]. For
convenience, I attached the output to this message.
You see, there are many changes, but many of them were caused by what
my SM implementation demanded (and that's a serious drawback of my
implementation as opposed to the version created by Dimitar).
For example, in my SM --new-instance implies --no-session -- that was
done particularly in order to make my SM restore "new instances"
properly. I believe, nobody wants such changes to land into trunk.
Another example, since in my implementation several instances could
write user's geany.conf simultaneously, I included into SM a patch
that offered locking of that file (created by Lex, afair).
Well, I think I explained pretty much of it. If I accidently find
another little change that could be useful in trunk, I'll just create
another pull request for it, especially because it's very convenient
on Github.
There is actually a little change that indeed could be useful, "Use
absolute paths to project file names" (commit de9d440). But I'm not
sure, why it was necessary and why I wrote it…
[1]: <https://github.com/earshinov/geany/tree/sm>
[2]: git log --first-parent --pretty='tformat:%h %ad %d %s' af8c11f^..sm
--
Best regards,
Eugene.
86acd20 2012-03-05 Merge branch 'master' into sm
c420e68 2012-02-23 Merge branch 'master' into sm
1a93f9c 2012-02-23 Make our version of `main.c:load_startup_files` similar to
the rewritten version by Dimitar Zhekov recently committed to the master branch.
d74275c 2012-02-23 Remove graphical preference "Load session even if any files
were opened in command-line".
2ce6f8a 2012-02-17 Use `g_build_filename` in `keyfile.c:open_config`
bb33adf 2012-02-17 Merge master
b5a5b20 2012-01-07 Change the short variant of "--project" command line
option: "-r" -> "-j". The former was recently reserved for opening files in
read-only mode.
4e667a5 2012-01-07 When Geany starts without opened documents and receives
SaveYourself signal from the session manager, don't unnecessarily call
document_get_from_page() causing SEGFAULT when documents' array is NULL.
35978fd 2012-01-07 Merge master.
dec2e01 2012-01-01 Call configuration_save() after Plugin Manager is closed.
996e43d 2012-01-06 Merge trunk (revisions 5862..6015)
4049a6f 2011-06-29 Merge trunk (revisions 5834..5861)
a2cc198 2011-06-10 Merge trunk (revisions 5738..5833)
a8a5574 2011-05-21 Merge trunk (revisions 5727..5737)
4cf10a0 2011-05-21 Merge trunk (revisions 5708..5726)
4fb19a3 2011-05-21 Merge trunk (revisions 5701..5708)
101af90 2011-05-21 Merge trunk (revisions 5681..5700)
ea6a1c4 2011-05-21 Merge trunk (revisions 5661..5680)
2a2114a 2011-05-21 Merge trunk (revisions 5641..5660)
6bfeb58 2011-05-21 Merge trunk (revisions 5621..5640)
bed2002 2011-05-21 Merge trunk (revisions 5601..5620)
206068c 2011-05-21 Merge trunk (revisions 5581..5600)
507fe81 2011-05-21 Merge trunk (revisions 5561..5580)
ae96b53 2011-05-21 Merge trunk (revisions 5541..5560)
a392c94 2011-05-21 Merge trunk (revisions 5531..5540)
e6743f5 2011-05-21 Merge trunk (revisions 5522..5530)
9a8dfde 2011-02-27 Merge trunk (revisions 5066..5521)
a5fddf3 2011-02-27 SM: Don't save configuration on interactive SmSaveGlobal;
don't ask to cancel shutdown if not a shutdown.
e7ecc5f 2011-02-27 SM: Don't set the userid property if the user name can't be
determined. Borrowed from alternative SM patch by Dimitar Zhekov, thanks.
3f53fab 2011-02-27 Update for r4673: necessarily make the checkbox insensitive
when Preferences dialog is initialized.
381de80 2011-02-27 Fix opening a project when "Use project session files"
preference is disabled. This bug was introduced in sm branch.
0fe032f 2011-02-27 Another SM-related change in main.c:load_startup_files().
d87a117 2010-06-27 Merge trunk (revisions 5044..5065)
219892d 2010-06-17 Incorrectly resolved a conflict in src/ui_utils.c at the
last merge. Fix that.
fd8e0b4 2010-06-17 SM: pass current line and column for each file specified in
restart command; correctly restore current file
aec73cc 2010-06-17 Merge trunk (revisions 4961..5031)
60e4852 2010-06-17 Use g_strdup() when storing a string command-line value in
a global structure.
837f3b9 2010-06-17 Update for r4974: add some checks to prevent unnecessary
writes to geany.conf; do not touch recent lists while being restored by session
manager
a76c9bb 2010-06-17 Update for previous revision: do not load filenames from
session files when they are not needed
2f52a3d 2010-06-17 SM: do not rely on Geany session management and always
specify required file names in restore command
0e37c50 2010-06-17 Refactor main.c:load_startup_files() and properly handle
unchecked "Load last session" option: it should not affect loading the project
passed via command-line
db32db0 2010-06-17 Slight code improvement: do not open geany.conf in
configuration_save_default_session() if nothing is to be written
4d934cd 2010-06-17 Apply patch from Dimitar Zhekov to improve saving of
project configuration files together with some refactoring.
0242047 2010-06-17 Minor code style improvements
e4f56f6 2010-06-17 Update copyright information
f965520 2010-06-17 Stupid fix to use gdk_set_sm_client_id() properly
cd9186b 2010-06-17 Fix for r4972: properly save filetype config when
filetype's build commands are changed
2316ed9 2010-05-31 Slight code cleanup
a264198 2010-05-31 Lock configuration file before writing, using open(O_EXCL)
on temporary file. Original patch by Lex Trotman, thanks.
f1a669d 2010-05-31 Use a separate queue to store recently closed files
38fdf2e 2010-05-31 Update lists of recent files and projects in geany.conf
immediately instead of writing them on exit.
45870cb 2010-05-31 keyfile.c: Extract common code of opening, writing and
closing geany.conf to separate functions.
8fd4dd9 2010-05-31 Apply patch by Dimitar Zhekov to avoid saving filetype
files on exit.
69c82d8 2010-05-31 Apply patches by Dimitar Zhekov to not save settings edited
in the Preferences Dialog to geany.conf on exit.
d0d468f 2010-05-31 Fix a bug: files specified in command line did not open
together with default session if the session "referenced" a project.
d7f99f3 2010-05-31 Add g_assert() to ensure that `optentries' and
`optentries_aux' are of the same size.
4c88424 2010-05-31 Merge trunk (revisions 4485..4960)
a7c9570 2010-05-31 Revert last two commits.
292708e 2010-05-19 Add "Tools > Save Configuration" menu item to save
preferences to the configuration file. It is enabled for main instance only.
0ffef84 2010-05-19 Save configuration in main instance only.
df1c227 2010-05-19 Call gdk_set_sm_client_id() (suggested by Dimitar Zhekov,
thanks)
de0e6a8 2010-02-23 Properly handle the case when "Preferences > General > Misc
> Use project-based session files" check button is unchecked. An addition to
r4693.
7adf3f9 2010-02-23 Change the behaviour of the setting controlled by
"Preferences > General > Misc > Use project-based session files" check button.
Now if you open a project via command-line, files from the default session are
not automatically appended to it.
367bf08 2010-02-23 Fix to r4694, sorry.
c1f227a 2010-02-23 Fix to r4692, sorry.
b1cd811 2010-02-22 Fix opening project in already running instance (via
socket).
cd9e314 2010-02-22 Remember opened project across restarts.
4446e7e 2010-02-22 Use a separate command-line option to specify a project to
be opened.
d7a2eb2 2010-02-15 Add a GUI preference to control whether the default session
is loaded if any files are opened via command-line (fix #2838686). Location of
the preference: General > Startup tab > Startup frame.
8c10f80 2010-02-15 Load files from command line even if a project is being
opened.
52b165e 2010-02-15 Make --new-instance imply --no-session, even if a project
is opened. An addition to rev. 4567.
de9d440 2010-02-15 Use absolute paths to project files. Particularly, paths to
recent projects' files are now stored as absolute.
db81a95 2010-02-07 Rewrite `load_startup_files' function.
196e0e7 2010-02-07 Move utils_option_entry_reverse_parse() function comments
to utils.c instead of utils.h. Forbid Doxygen to generate documentation for it
as it is not in plugin API.
1c31dc0 2010-02-07 Fix alignment.
eb9c4a7 2010-02-07 Forbid Doxygen to generate documentation for sm.c as it is
not in plugin API.
cf29085 2010-02-07 Update the changelog.
1f96390 2010-01-30 Run ./scripts/fix-alignment.pl.
f8c4513 2010-01-30 Fix sign comparison warning.
97860ea 2010-01-24 Add "reverse parser" of GOptionEntry. Handle all
command-line options.
411b4bc 2010-01-24 Use `GeanyDocument.file_name's instead of
`GeanyDocument.real_path's in restart command like Geany session management
facilities do.
d713140 2010-01-24 Handle --no-session properly.
71e2271 2010-01-24 Make --new-instance imply --no-session.
46d875c 2010-01-24 Handle "Interact" message properly.
fc36acd 2010-01-24 Fix restart command.
dda1714 2010-01-24 Add sm_finalize().
4057811 2010-01-24 Extract SM-related code into separate sm.{c,h} files, make
some refactoring, and write code comments for Doxygen.
c804d29 2009-12-08 Restart Geany and restore some state when logging in (patch
by Eugene Arshinov, thanks).
47e4696 2009-12-08 Refactor quitting code into main_save() and main_finalize()
(patch by Eugene Arshinov, thanks).
1169ebd 2009-12-08 Apply patch from Eugene Arshinov to detect libSM (X session
management library, thanks).
af8c11f 2009-12-08 Create branch for Eugene Arshinov's libSM support.
_______________________________________________
Geany-devel mailing list
Geany-devel@uvena.de
https://lists.uvena.de/cgi-bin/mailman/listinfo/geany-devel
