pidgin-libnotify

Merge lp:~isleshocky77/pidgin-libnotify/best_name into lp:ubuntu/natty/pidgin-libnotify

  1. best_name
  2. Merge into natty
Proposed by Stephen Ostrow
Status: Rejected
Rejected by: Martin Pitt
Proposed branch: lp:~isleshocky77/pidgin-libnotify/best_name
Merge into: lp:ubuntu/natty/pidgin-libnotify
Diff against target: 22 lines (+2/-8)
1 file modified
src/pidgin-libnotify.c (+2/-8)
To merge this branch: bzr merge lp:~isleshocky77/pidgin-libnotify/best_name
Reviewer Review Type Date Requested Status
Martin Pitt Disapprove
Review via email: mp+51360@code.launchpad.net

Description of the change

Fixes bug lp: #408624

To post a comment you must log in.
Revision history for this message
Martin Pitt (pitti) wrote :

This needs to be a proper debian/patches change, not an inline code change. I'll ignore this merge proposal, and instead handle it in the bug (I'll convert it to a proper patch myself). Thanks!

review: Disapprove

Unmerged revisions

20. By Stephen Ostrow

Changing the best_name function to use the purples built-in functionality which will determine the correct alias to show (closes lp: #408624)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/pidgin-libnotify.c'
2--- src/pidgin-libnotify.c 2010-06-23 11:45:21 +0000
3+++ src/pidgin-libnotify.c 2011-02-25 20:04:12 +0000
4@@ -176,16 +176,10 @@
5 }
6
7 /* do NOT g_free() the string returned by this function */
8-static gchar *
9+const static gchar *
10 best_name (PurpleBuddy *buddy)
11 {
12- if (buddy->alias) {
13- return buddy->alias;
14- } else if (buddy->server_alias) {
15- return buddy->server_alias;
16- } else {
17- return buddy->name;
18- }
19+ return purple_buddy_get_contact_alias(buddy);
20 }
21
22 static GdkPixbuf *

Subscribers

People subscribed via source and target branches