rpms/gyachi/EL-5 gyachi.spec, 1.18, 1.19 version-1.1.71.patch, 1.1, 1.2

[Gregory D Hosler]

Author: ghosler

Update of /cvs/pkgs/rpms/gyachi/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17497

Modified Files:
	gyachi.spec version-1.1.71.patch 
Log Message:
conditionalize use of GTK_BUTTONBOX_CENTER to gtk 2.12




Index: gyachi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gyachi/EL-5/gyachi.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- gyachi.spec	27 May 2009 14:01:11 -0000	1.18
+++ gyachi.spec	27 May 2009 14:33:18 -0000	1.19
@@ -27,7 +27,7 @@
 
 Name:		gyachi
 Version:	1.1.71
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	A Yahoo! chat client with Webcam and voice support
 
 Group:		Applications/Internet

version-1.1.71.patch:

Index: version-1.1.71.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gyachi/EL-5/version-1.1.71.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- version-1.1.71.patch	27 May 2009 14:01:11 -0000	1.1
+++ version-1.1.71.patch	27 May 2009 14:33:18 -0000	1.2
@@ -1,6 +1,6 @@
-diff -ru -x '*~' -N gyachi-1.1.71.cvs/client/callbacks.h gyachi-1.1.71.patch/client/callbacks.h
---- gyachi-1.1.71.cvs/client/callbacks.h	2009-05-17 15:32:52.000000000 +0800
-+++ gyachi-1.1.71.patch/client/callbacks.h	2009-05-27 22:06:29.000000000 +0800
+diff -ru -x '*~' -N gyachi-1.1.72.cvs/client/callbacks.h gyachi-1.1.72.patch/client/callbacks.h
+--- gyachi-1.1.72.cvs/client/callbacks.h	2009-05-17 15:32:52.000000000 +0800
++++ gyachi-1.1.72.patch/client/callbacks.h	2009-05-27 22:06:29.000000000 +0800
 @@ -223,8 +223,10 @@
  void on_delete_all_bimages                  (GtkButton        *button,   gpointer  user_data);
  void on_select_buddy_image                  (GtkButton        *widget,   gpointer  user_data);
@@ -12,3 +12,18 @@ diff -ru -x '*~' -N gyachi-1.1.71.cvs/cl
  void on_bimage_view_my_avatar_cb            (GtkMenuItem      *menuitem, gpointer  user_data);
  void on_goto_edit_avatar_menu               (GtkMenuItem      *menuitem, gpointer  user_data);
  void on_buddy_add_accept                    (GtkButton        *widget,   gpointer  user_data);
+diff -ru -x '*~' -N gyachi-1.1.72.cvs/webcam/camcapt.c gyachi-1.1.72.patch/webcam/camcapt.c
+--- gyachi-1.1.72.cvs/webcam/camcapt.c	2009-05-17 15:32:52.000000000 +0800
++++ gyachi-1.1.72.patch/webcam/camcapt.c	2009-05-27 22:37:36.000000000 +0800
+@@ -517,7 +517,11 @@
+ 
+ 	hbuttonbox1 = gtk_hbutton_box_new();
+ 	gtk_box_pack_start(GTK_BOX(vboxWinCapture), hbuttonbox1, TRUE, TRUE, 0);
++#ifdef HAVE_GTK_WIDGET_TOOLTIP // GTK 2+ >= 2.12
+ 	gtk_button_box_set_layout(GTK_BUTTON_BOX(hbuttonbox1), GTK_BUTTONBOX_CENTER);
++#else
++	gtk_button_box_set_layout(GTK_BUTTON_BOX(hbuttonbox1), GTK_BUTTONBOX_SPREAD);
++#endif
+ 	gtk_box_set_spacing(GTK_BOX(hbuttonbox1), 5);
+   
+ 	buttCaptHelp = gtk_button_new_from_stock("gtk-help");