[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Ayttm-commits] CVS: ayttm/src gtk_globals.h,1.4.2.1,1.4.2.2 main.c,1.24
From: |
Andy Maloney <address@hidden> |
Subject: |
[Ayttm-commits] CVS: ayttm/src gtk_globals.h,1.4.2.1,1.4.2.2 main.c,1.24.2.1,1.24.2.2 prefs_window.c,1.5.2.6,1.5.2.7 |
Date: |
Sun, 30 Mar 2003 07:03:31 -0500 |
Update of /cvsroot/ayttm/ayttm/src
In directory subversions:/tmp/cvs-serv19659/src
Modified Files:
Tag: new_prefs
gtk_globals.h main.c prefs_window.c
Log Message:
Remove useless current_parent_widget
Index: gtk_globals.h
===================================================================
RCS file: /cvsroot/ayttm/ayttm/src/gtk_globals.h,v
retrieving revision 1.4.2.1
retrieving revision 1.4.2.2
diff -u -r1.4.2.1 -r1.4.2.2
--- gtk_globals.h 30 Mar 2003 11:48:21 -0000 1.4.2.1
+++ gtk_globals.h 30 Mar 2003 12:03:29 -0000 1.4.2.2
@@ -41,10 +41,6 @@
extern GtkWidget *statuswindow;
extern GtkWidget *away_menu;
-/* current parent (for error dialogs) */
-/* - defined in main.c */
-extern GtkWidget *current_parent_widget;
-
#if defined(__MINGW32__) && defined(__IN_PLUGIN__)
#define extern extern
#endif
Index: main.c
===================================================================
RCS file: /cvsroot/ayttm/ayttm/src/main.c,v
retrieving revision 1.24.2.1
retrieving revision 1.24.2.2
diff -u -r1.24.2.1 -r1.24.2.2
--- main.c 23 Mar 2003 00:30:25 -0000 1.24.2.1
+++ main.c 30 Mar 2003 12:03:29 -0000 1.24.2.2
@@ -154,7 +154,6 @@
/* Global variable, referenced in globals.h */
char config_dir[1024] = "";
-GtkWidget *current_parent_widget = NULL;
static void start_login(gboolean new)
Index: prefs_window.c
===================================================================
RCS file: /cvsroot/ayttm/ayttm/src/prefs_window.c,v
retrieving revision 1.5.2.6
retrieving revision 1.5.2.7
diff -u -r1.5.2.6 -r1.5.2.7
--- prefs_window.c 29 Mar 2003 19:32:28 -0000 1.5.2.6
+++ prefs_window.c 30 Mar 2003 12:03:29 -0000 1.5.2.7
@@ -52,9 +52,11 @@
#define rindex(a,b) strrchr(a,b)
#endif
-static int s_is_prefs_open = 0;
+
+static GtkWidget *s_prefs_window = NULL;
static struct prefs *s_prefs = NULL;
+
/*
* Preferences Dialog
*/
@@ -77,27 +79,23 @@
void ayttm_prefs_window_create( struct prefs *inPrefs )
{
- if ( !s_is_prefs_open )
+ if ( s_prefs_window == NULL )
{
GtkWidget *hbox;
GtkWidget *button;
GtkWidget *hbox2;
GtkWidget *prefs_vbox;
- GtkWidget *prefs_window;
s_prefs = inPrefs;
prefs_vbox = gtk_vbox_new(FALSE, 5);
- prefs_window = gtk_window_new(GTK_WINDOW_DIALOG);
- gtk_window_set_position(GTK_WINDOW(prefs_window), GTK_WIN_POS_MOUSE);
- /* set current parent to prefs so error dialogs know who real
- * parent is */
- current_parent_widget = prefs_window;
- gtk_widget_realize(prefs_window);
- gtk_window_set_title(GTK_WINDOW(prefs_window), _("Ayttm
Preferences"));
- eb_icon(prefs_window->window);
- gtk_signal_connect(GTK_OBJECT(prefs_window), "destroy",
+ s_prefs_window = gtk_window_new(GTK_WINDOW_DIALOG);
+ gtk_window_set_position(GTK_WINDOW(s_prefs_window),
GTK_WIN_POS_MOUSE);
+ gtk_widget_realize(s_prefs_window);
+ gtk_window_set_title(GTK_WINDOW(s_prefs_window), _("Ayttm
Preferences"));
+ eb_icon(s_prefs_window->window);
+ gtk_signal_connect(GTK_OBJECT(s_prefs_window), "destroy",
GTK_SIGNAL_FUNC(destroy), NULL);
/*
@@ -129,26 +127,26 @@
hbox2 = gtk_hbox_new(TRUE, 5);
gtk_widget_set_usize(hbox2, 200,25);
- button = do_icon_button(_("OK"), ok_xpm, prefs_window);
+ button = do_icon_button(_("OK"), ok_xpm, s_prefs_window);
gtk_signal_connect(GTK_OBJECT(button), "clicked",
- ok_callback, prefs_window);
+ ok_callback, s_prefs_window);
gtk_signal_connect_object (GTK_OBJECT (button), "clicked",
GTK_SIGNAL_FUNC (gtk_widget_destroy),
- GTK_OBJECT (prefs_window));
+ GTK_OBJECT (s_prefs_window));
gtk_box_pack_start(GTK_BOX(hbox2), button, TRUE, TRUE, 5);
gtk_widget_show(button);
/* Cancel Button */
- button = do_icon_button(_("Cancel"), cancel_xpm, prefs_window);
+ button = do_icon_button(_("Cancel"), cancel_xpm, s_prefs_window);
gtk_signal_connect(GTK_OBJECT(button), "clicked",
- cancel_callback, prefs_window);
+ cancel_callback, s_prefs_window);
gtk_signal_connect_object (GTK_OBJECT (button), "clicked",
GTK_SIGNAL_FUNC (gtk_widget_destroy),
- GTK_OBJECT (prefs_window));
+ GTK_OBJECT (s_prefs_window));
gtk_box_pack_start(GTK_BOX(hbox2), button, TRUE, TRUE, 5);
gtk_widget_show(button);
@@ -162,10 +160,9 @@
gtk_box_pack_start(GTK_BOX(prefs_vbox), hbox, FALSE, FALSE, 5);
gtk_widget_show(hbox);
gtk_widget_show(prefs_vbox);
- gtk_container_add(GTK_CONTAINER(prefs_window), prefs_vbox);
+ gtk_container_add(GTK_CONTAINER(s_prefs_window), prefs_vbox);
- gtk_widget_show(prefs_window);
- s_is_prefs_open = 1;
+ gtk_widget_show(s_prefs_window);
}
}
@@ -1566,8 +1563,6 @@
*/
static void destroy(GtkWidget * widget, gpointer data)
{
- s_is_prefs_open = 0;
-
destroy_proxy();
destroy_general_prefs();
destroy_chat_prefs();
@@ -1583,7 +1578,7 @@
gtkspell_stop();
#endif
- gtk_widget_destroy(current_parent_widget);
- current_parent_widget = NULL;
+ gtk_widget_destroy(s_prefs_window);
+ s_prefs_window = NULL;
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Ayttm-commits] CVS: ayttm/src gtk_globals.h,1.4.2.1,1.4.2.2 main.c,1.24.2.1,1.24.2.2 prefs_window.c,1.5.2.6,1.5.2.7,
Andy Maloney <address@hidden> <=
- Prev by Date:
[Ayttm-commits] CVS: ayttm/src prefs.c,1.31.2.7,1.31.2.8
- Next by Date:
[Ayttm-commits] CVS: ayttm/modules/importers import_gaim.c,1.4,1.4.2.1 import_gnomeicu.c,1.4,1.4.2.1
- Previous by thread:
[Ayttm-commits] CVS: ayttm/src prefs.c,1.31.2.7,1.31.2.8
- Next by thread:
[Ayttm-commits] CVS: ayttm/modules/importers import_gaim.c,1.4,1.4.2.1 import_gnomeicu.c,1.4,1.4.2.1
- Index(es):