← Back to branch summary

~ubuntu-branches/ubuntu/natty/empathy/natty

« back to all changes in this revision

Viewing changes to libempathy-gtk/empathy-individual-view.c

  • Committer: Bazaar Package Importer
  • Author(s): Brian Curtis
  • Date: 2011-01-25 13:20:01 UTC
  • Revision ID: james.westby@ubuntu.com-20110125132001-vyasbmnk6n4d3gvq
Tags: 2.32.2-0ubuntu7
https://launchpad.net/bugs/582757
https://launchpad.net/bugs/387991
https://launchpad.net/bugs/681413
* debian/patches/00_git_conn_disc_notif.patch (LP: #582757)
* debian/patches/00_git_F2_opens_contact_info.patch (LP: #387991)
* debian/patches/00_git_tooltip_on_error_info.patch (LP: #681413)
* debian/rules
  - added --with-ca-file='/etc/ssl/certs/ca-certificates.crt'

Show diffs side-by-side

added added

removed removed

Lines of Context:
libempathy-gtk/empathy-individual-view.c
47
47
#include "empathy-individual-view.h"
48
48
#include "empathy-individual-menu.h"
49
49
#include "empathy-individual-store.h"
 
50
#include "empathy-contact-dialogs.h"
50
51
#include "empathy-images.h"
51
52
#include "empathy-linking-dialog.h"
52
53
#include "empathy-cell-renderer-expander.h"
891
892
      data->button = 0;
892
893
      data->time = event->time;
893
894
      g_idle_add (individual_view_popup_menu_idle_cb, data);
 
895
    } else if (event->keyval == GDK_KEY_F2) {
 
896
        FolksIndividual *individual;
 
897
        EmpathyContact *contact;
 
898
 
 
899
        g_return_val_if_fail (EMPATHY_IS_INDIVIDUAL_VIEW (view), FALSE);
 
900
 
 
901
        individual = empathy_individual_view_dup_selected (view);
 
902
        if (individual == NULL)
 
903
            return FALSE;
 
904
 
 
905
        contact = empathy_contact_dup_from_folks_individual (individual);
 
906
        if (contact == NULL) {
 
907
            g_object_unref (individual);
 
908
            return FALSE;
 
909
        }
 
910
        empathy_contact_edit_dialog_show (contact, NULL);
 
911
 
 
912
        g_object_unref (individual);
 
913
        g_object_unref (contact);
894
914
    }
895
915
 
896
916
  return FALSE;
1314
1334
  GdkEventKey *eventkey = ((GdkEventKey *) event);
1315
1335
  gboolean ret = FALSE;
1316
1336
 
1317
 
  if (eventkey->keyval == GDK_Up || eventkey->keyval == GDK_Down)
 
1337
  if (eventkey->keyval == GDK_KEY_Up || eventkey->keyval == GDK_KEY_Down
 
1338
      || eventkey->keyval == GDK_KEY_F2)
1318
1339
    {
1319
1340
      GdkEvent *new_event;
1320
1341