summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVasily_Makarov <danilka.pro@gmail.com>2011-06-13 23:14:09 +0400
committerVasily_Makarov <danilka.pro@gmail.com>2011-06-13 23:14:09 +0400
commit43a507fb1e2f0ce589546bf24ae2f2667f01a719 (patch)
treedb2b7528df2c032bbc606682df5bac7591f2905e
parentfbbc5f2fcef28547ac5420f68fc5645e4c429d94 (diff)
downloadevol-tools-43a507fb1e2f0ce589546bf24ae2f2667f01a719.tar.gz
evol-tools-43a507fb1e2f0ce589546bf24ae2f2667f01a719.tar.bz2
evol-tools-43a507fb1e2f0ce589546bf24ae2f2667f01a719.tar.xz
evol-tools-43a507fb1e2f0ce589546bf24ae2f2667f01a719.zip
saedit: Fix find dialog bug
-rw-r--r--saedit/interface.h2
-rw-r--r--saedit/main.c4
-rw-r--r--saedit/main.h3
-rwxr-xr-xsaedit/saeditbin457806 -> 457610 bytes
-rw-r--r--saedit/search.h6
5 files changed, 3 insertions, 12 deletions
diff --git a/saedit/interface.h b/saedit/interface.h
index 0fa0ef6..7f9420d 100644
--- a/saedit/interface.h
+++ b/saedit/interface.h
@@ -36,8 +36,6 @@ void set_up_interface() {
GtkAccelGroup *ag = gtk_accel_group_new();
gtk_window_add_accel_group(win, ag);
- find_dialog = find_window_new(win);
-
GtkWidget *fcdialog = gtk_file_chooser_dialog_new(_("Open XML source file"), win, GTK_FILE_CHOOSER_ACTION_OPEN, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT, NULL);
vbox = gtk_vbox_new(FALSE, 0);
diff --git a/saedit/main.c b/saedit/main.c
index 65c97ca..e069f78 100644
--- a/saedit/main.c
+++ b/saedit/main.c
@@ -18,10 +18,6 @@ void kill_timeout(int tag) {
g_source_remove(tag);
}
-void show_find_dialog() {
- gtk_widget_show_all(find_dialog);
-}
-
Frame *frame_new(int index, int offsetX, int offsetY, int delay) {
Frame *res = g_new0(Frame, 1);
res->index = index;
diff --git a/saedit/main.h b/saedit/main.h
index 9e77048..f84ef5a 100644
--- a/saedit/main.h
+++ b/saedit/main.h
@@ -180,8 +180,6 @@ GdkPixbuf *icon = NULL;
Options *paths;
Keys *config;
-GtkDialog *find_dialog;
-
static gboolean show_animation_by_info(AnimationInfo *anim_info);
static gchar *markup_bold(gchar *str);
static void format_src_string(gchar *src);
@@ -225,4 +223,3 @@ static void open_menu_item_activate(GtkMenuItem *menuitem, GtkFileChooserDialog
static void parse_xml_text(gchar *text, SAEInfo *sae_info);
static void show_animation(SAEInfo *sae_info);
static gboolean set_up_animation_by_direction(SAEInfo *sae_info, const gchar *direction);
-static void show_find_dialog();
diff --git a/saedit/saedit b/saedit/saedit
index 53e0691..7e7d1a8 100755
--- a/saedit/saedit
+++ b/saedit/saedit
Binary files differ
diff --git a/saedit/search.h b/saedit/search.h
index ff6185f..e08a448 100644
--- a/saedit/search.h
+++ b/saedit/search.h
@@ -37,7 +37,7 @@ static gboolean find_text() {
return FALSE;
}
-static GtkWidget *find_window_new(GtkWindow *parent) {
+static GtkWidget *show_find_dialog() {
GtkWidget *dialog;
GtkWidget *vbox;
GtkWidget *entry;
@@ -45,7 +45,7 @@ static GtkWidget *find_window_new(GtkWindow *parent) {
GtkWidget *label;
dialog = gtk_dialog_new_with_buttons (_("Find"),
- parent,
+ win,
GTK_DIALOG_DESTROY_WITH_PARENT,
GTK_STOCK_FIND,
GTK_RESPONSE_NONE,
@@ -63,5 +63,5 @@ static GtkWidget *find_window_new(GtkWindow *parent) {
"response",
G_CALLBACK(find_text),
NULL);
- return dialog;
+ gtk_widget_show_all(dialog);
}