gtkstatusbox.h   gtkstatusbox.h 
skipping to change at line 113 skipping to change at line 113
gboolean icon_opaque; gboolean icon_opaque;
gboolean imhtml_visible; gboolean imhtml_visible;
GtkWidget *cell_view; GtkWidget *cell_view;
GtkCellRenderer *icon_rend; GtkCellRenderer *icon_rend;
GtkCellRenderer *text_rend; GtkCellRenderer *text_rend;
GdkPixbuf *error_pixbuf; GdkPixbuf *error_pixbuf;
int connecting_index; int connecting_index;
GdkPixbuf *connecting_pixbufs[9]; GdkPixbuf *connecting_pixbufs[31];
int typing_index; int typing_index;
GdkPixbuf *typing_pixbufs[6]; GdkPixbuf *typing_pixbufs[6];
gboolean network_available; gboolean network_available;
gboolean connecting; gboolean connecting;
guint typing; guint typing;
GtkTreeIter iter; GtkTreeIter iter;
char *error; char *error;
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 pidginstock.h   pidginstock.h 
skipping to change at line 105 skipping to change at line 105
/* StatusBox Animations */ /* StatusBox Animations */
#define PIDGIN_STOCK_ANIMATION_CONNECT0 "pidgin-anim-connect0" #define PIDGIN_STOCK_ANIMATION_CONNECT0 "pidgin-anim-connect0"
#define PIDGIN_STOCK_ANIMATION_CONNECT1 "pidgin-anim-connect1" #define PIDGIN_STOCK_ANIMATION_CONNECT1 "pidgin-anim-connect1"
#define PIDGIN_STOCK_ANIMATION_CONNECT2 "pidgin-anim-connect2" #define PIDGIN_STOCK_ANIMATION_CONNECT2 "pidgin-anim-connect2"
#define PIDGIN_STOCK_ANIMATION_CONNECT3 "pidgin-anim-connect3" #define PIDGIN_STOCK_ANIMATION_CONNECT3 "pidgin-anim-connect3"
#define PIDGIN_STOCK_ANIMATION_CONNECT4 "pidgin-anim-connect4" #define PIDGIN_STOCK_ANIMATION_CONNECT4 "pidgin-anim-connect4"
#define PIDGIN_STOCK_ANIMATION_CONNECT5 "pidgin-anim-connect5" #define PIDGIN_STOCK_ANIMATION_CONNECT5 "pidgin-anim-connect5"
#define PIDGIN_STOCK_ANIMATION_CONNECT6 "pidgin-anim-connect6" #define PIDGIN_STOCK_ANIMATION_CONNECT6 "pidgin-anim-connect6"
#define PIDGIN_STOCK_ANIMATION_CONNECT7 "pidgin-anim-connect7" #define PIDGIN_STOCK_ANIMATION_CONNECT7 "pidgin-anim-connect7"
#define PIDGIN_STOCK_ANIMATION_CONNECT8 "pidgin-anim-connect8" #define PIDGIN_STOCK_ANIMATION_CONNECT8 "pidgin-anim-connect8"
#define PIDGIN_STOCK_ANIMATION_CONNECT9 "pidgin-anim-connect9"
#define PIDGIN_STOCK_ANIMATION_CONNECT10 "pidgin-anim-connect10"
#define PIDGIN_STOCK_ANIMATION_CONNECT11 "pidgin-anim-connect11"
#define PIDGIN_STOCK_ANIMATION_CONNECT12 "pidgin-anim-connect12"
#define PIDGIN_STOCK_ANIMATION_CONNECT13 "pidgin-anim-connect13"
#define PIDGIN_STOCK_ANIMATION_CONNECT14 "pidgin-anim-connect14"
#define PIDGIN_STOCK_ANIMATION_CONNECT15 "pidgin-anim-connect15"
#define PIDGIN_STOCK_ANIMATION_CONNECT16 "pidgin-anim-connect16"
#define PIDGIN_STOCK_ANIMATION_CONNECT17 "pidgin-anim-connect17"
#define PIDGIN_STOCK_ANIMATION_CONNECT18 "pidgin-anim-connect18"
#define PIDGIN_STOCK_ANIMATION_CONNECT19 "pidgin-anim-connect19"
#define PIDGIN_STOCK_ANIMATION_CONNECT20 "pidgin-anim-connect20"
#define PIDGIN_STOCK_ANIMATION_CONNECT21 "pidgin-anim-connect21"
#define PIDGIN_STOCK_ANIMATION_CONNECT22 "pidgin-anim-connect22"
#define PIDGIN_STOCK_ANIMATION_CONNECT23 "pidgin-anim-connect23"
#define PIDGIN_STOCK_ANIMATION_CONNECT24 "pidgin-anim-connect24"
#define PIDGIN_STOCK_ANIMATION_CONNECT25 "pidgin-anim-connect25"
#define PIDGIN_STOCK_ANIMATION_CONNECT26 "pidgin-anim-connect26"
#define PIDGIN_STOCK_ANIMATION_CONNECT27 "pidgin-anim-connect27"
#define PIDGIN_STOCK_ANIMATION_CONNECT28 "pidgin-anim-connect28"
#define PIDGIN_STOCK_ANIMATION_CONNECT29 "pidgin-anim-connect29"
#define PIDGIN_STOCK_ANIMATION_CONNECT30 "pidgin-anim-connect30"
#define PIDGIN_STOCK_ANIMATION_TYPING0 "pidgin-anim-typing0" #define PIDGIN_STOCK_ANIMATION_TYPING0 "pidgin-anim-typing0"
#define PIDGIN_STOCK_ANIMATION_TYPING1 "pidgin-anim-typing1" #define PIDGIN_STOCK_ANIMATION_TYPING1 "pidgin-anim-typing1"
#define PIDGIN_STOCK_ANIMATION_TYPING2 "pidgin-anim-typing2" #define PIDGIN_STOCK_ANIMATION_TYPING2 "pidgin-anim-typing2"
#define PIDGIN_STOCK_ANIMATION_TYPING3 "pidgin-anim-typing3" #define PIDGIN_STOCK_ANIMATION_TYPING3 "pidgin-anim-typing3"
#define PIDGIN_STOCK_ANIMATION_TYPING4 "pidgin-anim-typing4" #define PIDGIN_STOCK_ANIMATION_TYPING4 "pidgin-anim-typing4"
#define PIDGIN_STOCK_ANIMATION_TYPING5 "pidgin-anim-typing5" #define PIDGIN_STOCK_ANIMATION_TYPING5 "pidgin-anim-typing5"
/* Toolbar (and menu) icons */ /* Toolbar (and menu) icons */
#define PIDGIN_STOCK_TOOLBAR_ACCOUNTS "pidgin-accounts" #define PIDGIN_STOCK_TOOLBAR_ACCOUNTS "pidgin-accounts"
#define PIDGIN_STOCK_TOOLBAR_BGCOLOR "pidgin-bgcolor" #define PIDGIN_STOCK_TOOLBAR_BGCOLOR "pidgin-bgcolor"
 End of changes. 1 change blocks. 
0 lines changed or deleted 22 lines changed or added


 version.h   version.h 
skipping to change at line 29 skipping to change at line 29
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-130 1 USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-130 1 USA
*/ */
#ifndef _PURPLE_VERSION_H_ #ifndef _PURPLE_VERSION_H_
#define _PURPLE_VERSION_H_ #define _PURPLE_VERSION_H_
#define PURPLE_MAJOR_VERSION (2) #define PURPLE_MAJOR_VERSION (2)
#define PURPLE_MINOR_VERSION (5) #define PURPLE_MINOR_VERSION (5)
#define PURPLE_MICRO_VERSION (0) #define PURPLE_MICRO_VERSION (1)
#define PURPLE_VERSION_CHECK(x,y,z) ((x) == PURPLE_MAJOR_VERSION && \ #define PURPLE_VERSION_CHECK(x,y,z) ((x) == PURPLE_MAJOR_VERSION && \
((y ) < PURPLE_MINOR_VERSION || \ ((y ) < PURPLE_MINOR_VERSION || \
(( y) == PURPLE_MINOR_VERSION && (z) <= PURPLE_MICRO_VERSION))) (( y) == PURPLE_MINOR_VERSION && (z) <= PURPLE_MICRO_VERSION)))
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
/** /**
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/