~ubuntu-branches/ubuntu/wily/sflphone/wily

« back to all changes in this revision

Viewing changes to kde/src/widgets/contactdock.h

  • Committer: Package Import Robot
  • Author(s): Francois Marier, Francois Marier, Mark Purcell
  • Date: 2014-10-18 15:08:50 UTC
  • mfrom: (1.1.12)
  • mto: This revision was merged to the branch mainline in revision 29.
  • Revision ID: package-import@ubuntu.com-20141018150850-2exfk34ckb15pcwi
Tags: 1.4.1-0.1
[ Francois Marier ]
* Non-maintainer upload
* New upstream release (closes: #759576, #741130)
  - debian/rules +PJPROJECT_VERSION := 2.2.1
  - add upstream patch to fix broken TLS support
  - add patch to fix pjproject regression

[ Mark Purcell ]
* Build-Depends:
  - sflphone-daemon + libavformat-dev, libavcodec-dev, libswscale-dev,
  libavdevice-dev, libavutil-dev
  - sflphone-gnome + libclutter-gtk-1.0-dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
88
88
   KAction* m_pEmail       ;
89
89
   KAction* m_pAddPhone    ;
90
90
   KAction* m_pBookmark    ;
 
91
   KAction* m_pRemove      ;
91
92
 
92
93
   //Delegates
93
94
   CategorizedDelegate* m_pCategoryDelegate;
125
126
   void expandTree  ();
126
127
   void setCategory (int index);
127
128
   void slotDoubleClick(const QModelIndex& index);
 
129
   void slotDelete();
128
130
};
129
131
 
130
132
///KeyPressEaterC: keygrabber