Sophie

Sophie

distrib > Mageia > 3 > i586 > media > core-release-src > by-pkgid > e342c868059380184c7cbabf31a19f6d > files > 3

xfbib-0.0.2-13.mga3.src.rpm

diff -ur xfbib-0.0.2.orig/configure.in xfbib-0.0.2/configure.in
--- xfbib-0.0.2.orig/configure.in	2008-03-30 20:33:34.000000000 +0300
+++ xfbib-0.0.2/configure.in	2012-12-01 01:18:12.569590472 +0200
@@ -37,7 +37,7 @@
 XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.10.0])
 XDT_CHECK_PACKAGE([GLIB], [glib-2.0], [2.12.0])
 XDT_CHECK_PACKAGE([GOBJECT], [gobject-2.0], [2.12.0])
-XDT_CHECK_PACKAGE([LIBXFCEGUI4], [libxfcegui4-1.0], [4.2.0])
+XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-1], [4.2.0])
 XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.4.0])
 
 dnl Check for debugging support
diff -ur xfbib-0.0.2.orig/src/entry_edit_dialog.c xfbib-0.0.2/src/entry_edit_dialog.c
--- xfbib-0.0.2.orig/src/entry_edit_dialog.c	2008-03-30 01:06:54.000000000 +0200
+++ xfbib-0.0.2/src/entry_edit_dialog.c	2012-12-01 01:24:07.382601038 +0200
@@ -17,7 +17,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <config.h>
-#include <libxfcegui4/libxfcegui4.h>
+#include <libxfce4ui/libxfce4ui.h>
 
 #include "entry_edit_dialog.h"
 #include "entry.h"
@@ -589,11 +589,13 @@
 			key = (char *) gtk_entry_get_text(GTK_ENTRY(key_entry));
 			if ((type = gtk_combo_box_get_active_text(GTK_COMBO_BOX(combobox))) == NULL) {
 				_DEBUG(("No type selected"));
-				xfce_warn(_("No type was selected"));
+				/* xfce_warn(_("No type was selected")); */
+				xfce_dialog_show_warning(NULL,NULL,_("No type was selected"));
 				continue;
 			} else if (strcmp(key, "") == 0) {
 				_DEBUG(("No key selected"));
-				xfce_warn(_("No key was selected"));
+				/* xfce_warn(_("No key was selected")); */
+				xfce_dialog_show_warning(NULL,NULL,_("No key was selected"));
 				continue;
 			} else {
 				if (selected == NULL) {
diff -ur xfbib-0.0.2.orig/src/Makefile.am xfbib-0.0.2/src/Makefile.am
--- xfbib-0.0.2.orig/src/Makefile.am	2008-02-21 21:26:32.000000000 +0200
+++ xfbib-0.0.2/src/Makefile.am	2012-12-01 01:20:13.333594076 +0200
@@ -39,15 +39,15 @@
 xfbib_CFLAGS =	\
 	$(GTK_CFLAGS) \
 	$(LIBXFCE4UTIL_CFLAGS) \
+	$(LIBXFCE4UI_CFLAGS) \
 	-Wall \
-	-g \
 	-DDATADIR=\"$(datadir)\" \
 	-DSRCDIR=\"$(top_srcdir)\" \
 	-DLOCALEDIR=\"$(localedir)\"
 
-xfbib_LDFLAGS =	\
+xfbib_LDADD =	\
 	$(GTK_LIBS) \
 	$(LIBXFCE4UTIL_LIBS) \
-	$(LIBXFCEGUI4_LIBS)
+	$(LIBXFCE4UI_LIBS)
 	
 
diff -ur xfbib-0.0.2.orig/src/menubar.c xfbib-0.0.2/src/menubar.c
--- xfbib-0.0.2.orig/src/menubar.c	2008-03-19 14:41:37.000000000 +0200
+++ xfbib-0.0.2/src/menubar.c	2012-12-01 01:17:38.348589454 +0200
@@ -15,7 +15,7 @@
  */
 
 #include <gtk/gtk.h>
-#include <libxfcegui4/libxfcegui4.h>
+#include <libxfce4ui/libxfce4ui.h>
 #include <libintl.h>
 #include <config.h>
 
diff -ur xfbib-0.0.2.orig/src/open.c xfbib-0.0.2/src/open.c
--- xfbib-0.0.2.orig/src/open.c	2008-03-30 14:25:16.000000000 +0300
+++ xfbib-0.0.2/src/open.c	2012-12-01 01:17:38.348589454 +0200
@@ -14,7 +14,7 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#include <libxfcegui4/libxfcegui4.h>
+#include <libxfce4ui/libxfce4ui.h>
 #include <config.h>
 #include <string.h>
 #include <stdlib.h>
diff -ur xfbib-0.0.2.orig/src/open_dialog.c xfbib-0.0.2/src/open_dialog.c
--- xfbib-0.0.2.orig/src/open_dialog.c	2008-02-21 21:25:35.000000000 +0200
+++ xfbib-0.0.2/src/open_dialog.c	2012-12-01 01:17:38.348589454 +0200
@@ -14,7 +14,7 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#include <libxfcegui4/libxfcegui4.h>
+#include <libxfce4ui/libxfce4ui.h>
 #include <libintl.h>
 #include <string.h>
 #include <stdlib.h>
diff -ur xfbib-0.0.2.orig/src/save_dialog.c xfbib-0.0.2/src/save_dialog.c
--- xfbib-0.0.2.orig/src/save_dialog.c	2008-02-19 19:37:07.000000000 +0200
+++ xfbib-0.0.2/src/save_dialog.c	2012-12-01 01:17:38.352589454 +0200
@@ -15,7 +15,7 @@
  */
 
 #include <libintl.h>
-#include <libxfcegui4/libxfcegui4.h>
+#include <libxfce4ui/libxfce4ui.h>
 #include <config.h>
 
 #include "xfbib.h"
diff -ur xfbib-0.0.2.orig/src/string_edit_dialog.c xfbib-0.0.2/src/string_edit_dialog.c
--- xfbib-0.0.2.orig/src/string_edit_dialog.c	2008-02-28 20:48:10.000000000 +0200
+++ xfbib-0.0.2/src/string_edit_dialog.c	2012-12-01 01:17:38.352589454 +0200
@@ -15,7 +15,7 @@
  */
 
 #include <gtk/gtk.h>
-#include <libxfcegui4/libxfcegui4.h>
+#include <libxfce4ui/libxfce4ui.h>
 
 #include "debug.h"
 #include "strings.h"
diff -ur xfbib-0.0.2.orig/src/treeview.c xfbib-0.0.2/src/treeview.c
--- xfbib-0.0.2.orig/src/treeview.c	2008-03-29 22:37:11.000000000 +0200
+++ xfbib-0.0.2/src/treeview.c	2012-12-01 01:17:38.353589454 +0200
@@ -14,7 +14,7 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#include <libxfcegui4/libxfcegui4.h>
+#include <libxfce4ui/libxfce4ui.h>
 #include <libintl.h>
 #include <config.h>
 #include <string.h>
diff -ur xfbib-0.0.2.orig/src/xfbib.c xfbib-0.0.2/src/xfbib.c
--- xfbib-0.0.2.orig/src/xfbib.c	2008-02-21 22:52:33.000000000 +0200
+++ xfbib-0.0.2/src/xfbib.c	2012-12-01 01:17:38.354589454 +0200
@@ -20,7 +20,7 @@
 
 #include <gtk/gtk.h>
 #include <stdlib.h>
-#include <libxfcegui4/libxfcegui4.h>
+#include <libxfce4ui/libxfce4ui.h>
 #include <libintl.h>
 
 #include "window.h"