Gentoo Archives: gentoo-commits

From: "Samuli Suominen (ssuominen)" <ssuominen@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in app-text/xfbib/files: xfbib-0.0.2-validate.patch xfbib-0.0.2-libxfce4ui.patch
Date: Fri, 30 Nov 2012 23:44:01
Message-Id: 20121130234345.1BC5E20C65@flycatcher.gentoo.org
1 ssuominen 12/11/30 23:43:44
2
3 Added: xfbib-0.0.2-validate.patch
4 xfbib-0.0.2-libxfce4ui.patch
5 Log:
6 Port from libxfcegui4 to libxfce4ui. Validate xfbib.desktop using desktop-file-utils.
7
8 (Portage version: 2.2.0_alpha142/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)
9
10 Revision Changes Path
11 1.1 app-text/xfbib/files/xfbib-0.0.2-validate.patch
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/xfbib/files/xfbib-0.0.2-validate.patch?rev=1.1&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/xfbib/files/xfbib-0.0.2-validate.patch?rev=1.1&content-type=text/plain
15
16 Index: xfbib-0.0.2-validate.patch
17 ===================================================================
18 --- xfbib.desktop
19 +++ xfbib.desktop
20 @@ -1,13 +1,11 @@
21 -
22 [Desktop Entry]
23 -Encoding=UTF-8
24 Name=Xfbib
25 Exec=xfbib
26 Icon=xfbib
27 Type=Application
28 Comment=A BibTeX editor for Xfce
29 -Terminal=0
30 -MimeType=text/x-bibtex
31 -Categories=Application;Office;GTK;
32 +Terminal=false
33 +MimeType=text/x-bibtex;
34 +Categories=Office;GTK;
35 GenericName=
36 StartupNotify=false
37
38
39
40 1.1 app-text/xfbib/files/xfbib-0.0.2-libxfce4ui.patch
41
42 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/xfbib/files/xfbib-0.0.2-libxfce4ui.patch?rev=1.1&view=markup
43 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/xfbib/files/xfbib-0.0.2-libxfce4ui.patch?rev=1.1&content-type=text/plain
44
45 Index: xfbib-0.0.2-libxfce4ui.patch
46 ===================================================================
47 http://bugzilla.xfce.org/show_bug.cgi?id=9568
48
49 --- src/entry_edit_dialog.c
50 +++ src/entry_edit_dialog.c
51 @@ -17,7 +17,7 @@
52 #include <stdlib.h>
53 #include <string.h>
54 #include <config.h>
55 -#include <libxfcegui4/libxfcegui4.h>
56 +#include <libxfce4ui/libxfce4ui.h>
57
58 #include "entry_edit_dialog.h"
59 #include "entry.h"
60 @@ -589,11 +589,13 @@
61 key = (char *) gtk_entry_get_text(GTK_ENTRY(key_entry));
62 if ((type = gtk_combo_box_get_active_text(GTK_COMBO_BOX(combobox))) == NULL) {
63 _DEBUG(("No type selected"));
64 - xfce_warn(_("No type was selected"));
65 + /* xfce_warn(_("No type was selected")); */
66 + xfce_dialog_show_warning(NULL,NULL,_("No type was selected"));
67 continue;
68 } else if (strcmp(key, "") == 0) {
69 _DEBUG(("No key selected"));
70 - xfce_warn(_("No key was selected"));
71 + /* xfce_warn(_("No key was selected")); */
72 + xfce_dialog_show_warning(NULL,NULL,_("No key was selected"));
73 continue;
74 } else {
75 if (selected == NULL) {
76 --- src/menubar.c
77 +++ src/menubar.c
78 @@ -15,7 +15,7 @@
79 */
80
81 #include <gtk/gtk.h>
82 -#include <libxfcegui4/libxfcegui4.h>
83 +#include <libxfce4ui/libxfce4ui.h>
84 #include <libintl.h>
85 #include <config.h>
86
87 --- src/open.c
88 +++ src/open.c
89 @@ -14,7 +14,7 @@
90 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
91 */
92
93 -#include <libxfcegui4/libxfcegui4.h>
94 +#include <libxfce4ui/libxfce4ui.h>
95 #include <config.h>
96 #include <string.h>
97 #include <stdlib.h>
98 --- src/open_dialog.c
99 +++ src/open_dialog.c
100 @@ -14,7 +14,7 @@
101 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
102 */
103
104 -#include <libxfcegui4/libxfcegui4.h>
105 +#include <libxfce4ui/libxfce4ui.h>
106 #include <libintl.h>
107 #include <string.h>
108 #include <stdlib.h>
109 --- src/save_dialog.c
110 +++ src/save_dialog.c
111 @@ -15,7 +15,7 @@
112 */
113
114 #include <libintl.h>
115 -#include <libxfcegui4/libxfcegui4.h>
116 +#include <libxfce4ui/libxfce4ui.h>
117 #include <config.h>
118
119 #include "xfbib.h"
120 --- src/string_edit_dialog.c
121 +++ src/string_edit_dialog.c
122 @@ -15,7 +15,7 @@
123 */
124
125 #include <gtk/gtk.h>
126 -#include <libxfcegui4/libxfcegui4.h>
127 +#include <libxfce4ui/libxfce4ui.h>
128
129 #include "debug.h"
130 #include "strings.h"
131 --- src/treeview.c
132 +++ src/treeview.c
133 @@ -14,7 +14,7 @@
134 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
135 */
136
137 -#include <libxfcegui4/libxfcegui4.h>
138 +#include <libxfce4ui/libxfce4ui.h>
139 #include <libintl.h>
140 #include <config.h>
141 #include <string.h>
142 --- src/xfbib.c
143 +++ src/xfbib.c
144 @@ -20,7 +20,7 @@
145
146 #include <gtk/gtk.h>
147 #include <stdlib.h>
148 -#include <libxfcegui4/libxfcegui4.h>
149 +#include <libxfce4ui/libxfce4ui.h>
150 #include <libintl.h>
151
152 #include "window.h"