Hiroyuki Ikezoe
ikezo****@users*****
Fri Mar 16 14:00:00 JST 2007
Index: kazehakase/src/bookmarks/Makefile.am
diff -u kazehakase/src/bookmarks/Makefile.am:1.44 kazehakase/src/bookmarks/Makefile.am:1.45
--- kazehakase/src/bookmarks/Makefile.am:1.44 Mon Jan 1 10:24:42 2007
+++ kazehakase/src/bookmarks/Makefile.am Fri Mar 16 13:59:59 2007
@@ -8,7 +8,6 @@
-I$(top_srcdir)/src/actions \
-I$(top_srcdir)/src/utils \
-I$(top_srcdir)/src/net \
- -I$(top_srcdir)/src/libegg/regex \
-I$(top_srcdir)/src/widget \
-I$(top_srcdir)/src
Index: kazehakase/src/bookmarks/kz-smart-bookmark.c
diff -u kazehakase/src/bookmarks/kz-smart-bookmark.c:1.5 kazehakase/src/bookmarks/kz-smart-bookmark.c:1.6
--- kazehakase/src/bookmarks/kz-smart-bookmark.c:1.5 Sat Dec 2 18:22:27 2006
+++ kazehakase/src/bookmarks/kz-smart-bookmark.c Fri Mar 16 13:59:59 2007
@@ -18,7 +18,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*
- * $Id: kz-smart-bookmark.c,v 1.5 2006/12/02 09:22:27 ikezoe Exp $
+ * $Id: kz-smart-bookmark.c,v 1.6 2007/03/16 04:59:59 ikezoe Exp $
*/
#include "kz-smart-bookmark.h"
@@ -26,7 +26,7 @@
#include <glib/gi18n.h>
#include <string.h>
-#include "eggregex.h"
+#include "glib-utils.h"
#include "utils.h"
#include "kz-bookmark-file.h"
@@ -249,7 +249,7 @@
GList *smart_list, *node;
KzSmartBookmarkProperty *match = NULL;
gint n_match = 0;
- EggRegex *egg_regex;
+ GRegex *regex;
GError *error = NULL;
g_return_val_if_fail(KZ_IS_BOOKMARK(bookmark), NULL);
@@ -272,13 +272,13 @@
for (node = smart_list; node; node = g_list_next(node))
{
- gchar *regex;
+ gchar *regex_string;
KzSmartBookmarkProperty *prop;
prop = node->data;
- regex = prop->regex;
+ regex_string = prop->regex;
- egg_regex = egg_regex_new(regex, 0, 0, &error);
+ regex = g_regex_new(regex_string, 0, 0, &error);
if (error)
{
@@ -287,14 +287,14 @@
return g_strdup(text);
}
- n_match = egg_regex_match(egg_regex, text, -1, 0);
+ n_match = g_regex_match(regex, text, 0);
if (n_match > 0)
{
match = prop;
break;
}
- egg_regex_free(egg_regex);
+ g_regex_free(regex);
}
if(match)
@@ -307,7 +307,7 @@
guint i, n = 0;
GString *str;
- strings = egg_regex_fetch_all(egg_regex, text);
+ strings = g_regex_fetch_all(regex, text);
if (strings)
{
@@ -352,7 +352,7 @@
smart_uri = g_strndup(str->str, str->len);
g_string_free(str, TRUE);
- egg_regex_free(egg_regex);
+ g_regex_free(regex);
}
else
{