← Back to branch summary

~ubuntu-branches/ubuntu/maverick/empathy/maverick-201208312044

« back to all changes in this revision

Viewing changes to libempathy-gtk/empathy-log-window.c

  • Committer: Bazaar Package Importer
  • Author(s): Laurent Bigonville
  • Date: 2009-03-11 01:28:38 UTC
  • mfrom: (1.2.2 upstream)
  • mto: (6.4.1 sid) (1.6.2 upstream)
  • mto: This revision was merged to the branch mainline in revision 48.
  • Revision ID: james.westby@ubuntu.com-20090311012838-tlho02vbsl8p0v9i
Tags: upstream-2.25.92
Import upstream version 2.25.92

Show diffs side-by-side

added added

removed removed

Lines of Context:
libempathy-gtk/empathy-log-window.c
160
160
        }
161
161
 
162
162
        window = g_new0 (EmpathyLogWindow, 1);
163
 
        window->log_manager = empathy_log_manager_new ();
 
163
        window->log_manager = empathy_log_manager_dup_singleton ();
164
164
 
165
165
        filename = empathy_file_lookup ("empathy-log-window.glade",
166
166
                                        "libempathy-gtk");
290
290
 
291
291
        str = gtk_entry_get_text (GTK_ENTRY (window->entry_find));
292
292
 
293
 
        is_sensitive &= !G_STR_EMPTY (str);
 
293
        is_sensitive &= !EMP_STR_EMPTY (str);
294
294
        is_sensitive &= 
295
295
                !window->last_find || 
296
296
                (window->last_find && strcmp (window->last_find, str) != 0);
400
400
 
401
401
        gtk_list_store_clear (store);
402
402
 
403
 
        if (G_STR_EMPTY (search_criteria)) {
 
403
        if (EMP_STR_EMPTY (search_criteria)) {
404
404
                /* Just clear the search. */
405
405
                return;
406
406
        }