Hiroyuki Ikezoe
ikezo****@users*****
Fri Mar 16 14:00:38 JST 2007
Index: kazehakase/src/actions/Makefile.am
diff -u kazehakase/src/actions/Makefile.am:1.28 kazehakase/src/actions/Makefile.am:1.29
--- kazehakase/src/actions/Makefile.am:1.28 Sun Apr 30 19:22:09 2006
+++ kazehakase/src/actions/Makefile.am Fri Mar 16 14:00:37 2007
@@ -18,7 +18,6 @@
-I$(top_srcdir)/src/bookmarks \
-I$(top_srcdir)/src/widget \
-I$(top_srcdir)/src/libegg/dropdowntoolbutton \
- -I$(top_srcdir)/src/libegg/regex \
-I$(top_srcdir)/src
libkzactions_public_h_sources = \
Index: kazehakase/src/actions/kz-actions.c
diff -u kazehakase/src/actions/kz-actions.c:1.242 kazehakase/src/actions/kz-actions.c:1.243
--- kazehakase/src/actions/kz-actions.c:1.242 Mon Jan 15 11:28:45 2007
+++ kazehakase/src/actions/kz-actions.c Fri Mar 16 14:00:37 2007
@@ -55,12 +55,12 @@
#include "kz-bookmark-menu.h"
#include "kz-autoscroller.h"
#include "kz-popup-tablist.h"
-#include "eggregex.h"
#include "kz-proxy-folder.h"
#include "kz-icons.h"
#include "kz-statusbar.h"
#include "kz-notebook.h"
#include "kz-session.h"
+#include "glib-utils.h"
#include <time.h>
@@ -296,7 +296,7 @@
{
GtkWidget *widget = KZ_WINDOW_CURRENT_PAGE(kz);
gchar *text;
- EggRegex *egg_regex;
+ GRegex *regex;
gint n_match, i = 1;
GError *error = NULL;
@@ -304,9 +304,9 @@
if (!KZ_IS_EMBED(widget)) return;
- egg_regex = egg_regex_new(HTTP_REGEX,
- 0,
- 0, &error);
+ regex = g_regex_new(HTTP_REGEX,
+ 0,
+ 0, &error);
if (error)
{
@@ -317,12 +317,12 @@
text = kz_embed_get_selection_string(KZ_EMBED(widget));
if (!text) return;
- n_match = egg_regex_match(egg_regex, text, -1, 0);
+ n_match = g_regex_match(regex, text, 0);
if (n_match > 0)
{
gchar **uri;
- uri = egg_regex_fetch_all (egg_regex, text);
+ uri = g_regex_fetch_all(regex, text);
while (uri[i])
{
@@ -335,7 +335,7 @@
g_strfreev(uri);
}
- egg_regex_free(egg_regex);
+ g_regex_free(regex);
g_free(text);
}
Index: kazehakase/src/actions/kz-history-action.c
diff -u kazehakase/src/actions/kz-history-action.c:1.28 kazehakase/src/actions/kz-history-action.c:1.29
--- kazehakase/src/actions/kz-history-action.c:1.28 Wed Mar 14 11:03:06 2007
+++ kazehakase/src/actions/kz-history-action.c Fri Mar 16 14:00:37 2007
@@ -104,7 +104,7 @@
G_TYPE_STRING,
G_TYPE_STRING);
action->completion = NULL;
- action->completion_egg_regex = NULL;
+ action->completion_regex = NULL;
action->completion_previous_key = NULL;
}
@@ -126,10 +126,10 @@
action->completion = NULL;
}
- if (action->completion_egg_regex)
+ if (action->completion_regex)
{
- egg_regex_free(action->completion_egg_regex);
- action->completion_egg_regex = NULL;
+ g_regex_free(action->completion_regex);
+ action->completion_regex = NULL;
}
if(action->completion_previous_key)
@@ -297,14 +297,14 @@
if (action->completion_previous_key &&
strcmp(action->completion_previous_key, key))
{
- egg_regex_free(action->completion_egg_regex);
- action->completion_egg_regex = NULL;
+ g_regex_free(action->completion_regex);
+ action->completion_regex = NULL;
g_free(action->completion_previous_key);
action->completion_previous_key = NULL;
}
- if(!action->completion_egg_regex)
+ if(!action->completion_regex)
{
#if USE_MIGEMO
gboolean use_migemo;
@@ -315,7 +315,7 @@
gchar* regex = kz_migemo_get_regex(KZ_GET_MIGEMO, key);
if (regex)
{
- action->completion_egg_regex = egg_regex_new(regex,
+ action->completion_regex = gg_regex_new(regex,
EGG_REGEX_MULTILINE |
EGG_REGEX_EXTENDED,
0, &e);
@@ -331,9 +331,9 @@
else
#endif /* USE_MIGEMO */
{
- action->completion_egg_regex = egg_regex_new(key,
- EGG_REGEX_MULTILINE |
- EGG_REGEX_EXTENDED,
+ action->completion_regex = g_regex_new(key,
+ G_REGEX_MULTILINE |
+ G_REGEX_EXTENDED,
0, &e);
if (e)
@@ -345,7 +345,7 @@
}
/* reference */
- if(action->completion_egg_regex)
+ if(action->completion_regex)
{
action->completion_previous_key = g_strdup(key);
}
@@ -355,8 +355,8 @@
}
}
- if (egg_regex_match(action->completion_egg_regex,
- case_normalized_string, -1, 0) > 0)
+ if (g_regex_match(action->completion_regex,
+ case_normalized_string, 0) > 0)
{
ret = TRUE;
}
Index: kazehakase/src/actions/kz-history-action.h
diff -u kazehakase/src/actions/kz-history-action.h:1.12 kazehakase/src/actions/kz-history-action.h:1.13
--- kazehakase/src/actions/kz-history-action.h:1.12 Wed Mar 14 10:53:38 2007
+++ kazehakase/src/actions/kz-history-action.h Fri Mar 16 14:00:37 2007
@@ -23,7 +23,7 @@
#include <gtk/gtk.h>
#include "kz-entry-action.h"
-#include "eggregex.h"
+#include "glib-utils.h"
G_BEGIN_DECLS
@@ -46,7 +46,7 @@
GtkListStore *list_store;
GtkEntryCompletion *completion;
- EggRegex *completion_egg_regex;
+ GRegex *completion_regex;
gchar* completion_previous_key;
};
Index: kazehakase/src/actions/kz-location-entry-action.c
diff -u kazehakase/src/actions/kz-location-entry-action.c:1.57 kazehakase/src/actions/kz-location-entry-action.c:1.58
--- kazehakase/src/actions/kz-location-entry-action.c:1.57 Thu Mar 15 21:33:13 2007
+++ kazehakase/src/actions/kz-location-entry-action.c Fri Mar 16 14:00:37 2007
@@ -38,10 +38,10 @@
#include "kazehakase.h"
#include "utils/utils.h"
+#include "utils/glib-utils.h"
#include "kz-bookmark.h"
#include "kz-smart-bookmark.h"
#include "kz-actions.h"
-#include "eggregex.h"
#define KZ_LOCATION_ENTRY_ACTION_KEY "KzLocationEntryAction::Action"
@@ -496,16 +496,16 @@
get_file_path_from_uri(const gchar *uri, gchar **path, gchar **prefix)
{
GError *error = NULL;
- EggRegex *regex;
+ GRegex *regex;
*path = NULL;
*prefix = NULL;
g_return_if_fail(uri);
- regex = egg_regex_new("^\\s*(file://|)(/.*)\\s*",
- EGG_REGEX_CASELESS | EGG_REGEX_EXTENDED,
- 0, &error);
+ regex = g_regex_new("^\\s*(file://|)(/.*)\\s*",
+ G_REGEX_CASELESS | G_REGEX_EXTENDED,
+ 0, &error);
if (error)
{
@@ -514,13 +514,13 @@
return;
}
- if (egg_regex_match(regex, uri, -1, 0) > 0)
+ if (g_regex_match(regex, uri, 0) > 0)
{
- *prefix = egg_regex_fetch(regex, uri, 1);
- *path = egg_regex_fetch(regex, uri, 2);
+ *prefix = g_regex_fetch(regex, 1, uri);
+ *path = g_regex_fetch(regex, 2, uri);
}
- egg_regex_free(regex);
+ g_regex_free(regex);
}
static gboolean