Session Menu

Merge lp://staging/~feng-kylin/indicator-session/indicatorForKylin into lp://staging/indicator-session/14.10

  1. indicatorForKylin
  2. Merge into trunk.14.10
Proposed by handsome_feng
Status: Work in progress
Proposed branch: lp://staging/~feng-kylin/indicator-session/indicatorForKylin
Merge into: lp://staging/indicator-session/14.10
Diff against target: 44 lines (+30/-1)
1 file modified
src/service.c (+30/-1)
To merge this branch: bzr merge lp://staging/~feng-kylin/indicator-session/indicatorForKylin
Reviewer Review Type Date Requested Status
Charles Kerr (community) Needs Fixing
Review via email: mp+223664@code.staging.launchpad.net

Description of the change

add a judge sentences to decide witch help to show in different release.

To post a comment you must log in.
Revision history for this message
Ted Gould (ted) wrote :

Please use g_file_test() with G_FILE_TEST_EXISTS. I don't think we need
to open the file in this case.

Reply
lp://staging/~feng-kylin/indicator-session/indicatorForKylin updated
448. By handsome_feng

use g_file_test() with G_FILE_TEST_EXISTS instead of open the file

449. By handsome_feng

remove useless variable

Revision history for this message
handsome_feng (feng-kylin) wrote :

thank you for your advise,i have modified it.

------------------ 原始邮件 ------------------
发件人: "Ted Gould"<email address hidden>;
发送时间: 2014年6月19日(星期四) 上午10:30
收件人: "夜风"<email address hidden>;
主题: Re: [Merge] lp:~445865575-b/indicator-session/indicatorForKylin intolp:indicator-session

Please use g_file_test() with G_FILE_TEST_EXISTS. I don't think we need
to open the file in this case.

--
https://code.launchpad.net/~445865575-b/indicator-session/indicatorForKylin/+merge/223664
You are the owner of lp:~445865575-b/indicator-session/indicatorForKylin.
.

Reply
Revision history for this message
Charles Kerr (charlesk) wrote :

The code is okay but I feel it's fixing the wrong problem.

See my question at https://bugs.launchpad.net/ubuntukylin/+bug/1331873/comments/1

Reply
lp://staging/~feng-kylin/indicator-session/indicatorForKylin updated
450. By handsome_feng

use /etc/os-release instead of /etc/ubuntukylin-release

451. By handsome_feng

change 'help' to 'Help' to fit stanslation file

Revision history for this message
Charles Kerr (charlesk) wrote :

* GIOChannel isn't closed

* all the temp_strs before NAME= are leaked

* if NAME= isn't found, os_release_name is uninitialized when passed to g_strjoin()

* help_label is leaked

* "Help" should be _("Help")

* if NAME= isn't found, str_array_split is uninitialized when passed to g_strfreev()

review: Needs Fixing
Reply
Revision history for this message
handsome_feng (feng-kylin) wrote :

haw,i will fix it soon,thank you very much !

Reply
lp://staging/~feng-kylin/indicator-session/indicatorForKylin updated
452. By handsome_feng

fix some problem

Unmerged revisions

452. By handsome_feng

fix some problem

451. By handsome_feng

change 'help' to 'Help' to fit stanslation file

450. By handsome_feng

use /etc/os-release instead of /etc/ubuntukylin-release

449. By handsome_feng

remove useless variable

448. By handsome_feng

use g_file_test() with G_FILE_TEST_EXISTS instead of open the file

447. By handsome_feng

change 'Ubuntu Help' to 'Ubuntu Kylin Help'

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches