~ubuntu-branches/ubuntu/karmic/empathy/karmic

« back to all changes in this revision

Viewing changes to libempathy-gtk/empathy-status-presets.c

  • Committer: Bazaar Package Importer
  • Author(s): Laurent Bigonville
  • Date: 2007-12-04 00:00:31 UTC
  • mto: (6.4.1 sid) (1.3.1 upstream)
  • mto: This revision was merged to the branch mainline in revision 18.
  • Revision ID: james.westby@ubuntu.com-20071204000031-w2os396zoqdbcybt
Tags: upstream-0.21.3
ImportĀ upstreamĀ versionĀ 0.21.3

Show diffs side-by-side

added added

removed removed

Lines of Context:
32
32
#include <libxml/parser.h>
33
33
#include <libxml/tree.h>
34
34
 
 
35
#include <telepathy-glib/util.h>
 
36
 
35
37
#include <libempathy/empathy-debug.h>
36
38
#include <libempathy/empathy-utils.h>
37
39
 
293
295
                preset = l->data;
294
296
 
295
297
                if (state == preset->state &&
296
 
                    !empathy_strdiff (status, preset->status)) {
 
298
                    !tp_strdiff (status, preset->status)) {
297
299
                        return;
298
300
                }
299
301
        }
332
334
                preset = l->data;
333
335
 
334
336
                if (state == preset->state &&
335
 
                    !empathy_strdiff (status, preset->status)) {
 
337
                    !tp_strdiff (status, preset->status)) {
336
338
                        status_preset_free (preset);
337
339
                        presets = g_list_delete_link (presets, l);
338
340
                        status_presets_file_save ();