[packages/gg.git] / gg-sigsev.patch

diff -ur gg-0.2.2pre6/src/callbacks.c gg/src/callbacks.c
--- gg-0.2.2pre6/src/callbacks.c	Wed Mar 27 11:35:56 2002
+++ gg/src/callbacks.c	Fri Mar 29 00:40:37 2002
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id$ */
 
 /*
  * (C) Copyright 2001-2002 Igor Popik. Released under GPL license.
@@ -1559,3 +1559,11 @@
 {
     gg_delete_userlist();
 }
+
+
+void on_katalog_publiczny_activate(GtkMenuItem * menuitem, gpointer user_data)
+{
+    GtkWidget *widget;
+    widget = create_pubdir_info();
+    gtk_widget_show(widget);
+}
diff -ur gg-0.2.2pre6/src/callbacks.h gg/src/callbacks.h
--- gg-0.2.2pre6/src/callbacks.h	Mon Feb 18 12:46:14 2002
+++ gg/src/callbacks.h	Fri Mar 29 00:40:37 2002
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id$ */
 
 /*
  * (C) Copyright 2001-2002 Igor Popik. Released under GPL license.
@@ -89,3 +89,5 @@
 void on_import_activate(GtkMenuItem * menuitem, gpointer user_data);
 void on_export_activate(GtkMenuItem * menuitem, gpointer user_data);
 void on_delete_activate(GtkMenuItem * menuitem, gpointer user_data);
+
+void on_katalog_publiczny_activate(GtkMenuItem * menuitem, gpointer user_data);
diff -ur gg-0.2.2pre6/src/dock.c gg/src/dock.c
--- gg-0.2.2pre6/src/dock.c	Mon Mar 25 09:24:15 2002
+++ gg/src/dock.c	Thu Apr  4 09:04:03 2002
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id$ */
 
 /*
  * (C) Copyright 2001-2002 Igor Popik. Released under terms of GPL license.
@@ -29,8 +29,17 @@
 
 #if USE_APPLET || USE_DOCKLET
 
+#include "callbacks.h"
+
 extern GtkWidget *window;
 
+enum {
+	MENU_ONLINE_IDX,
+	MENU_AWAY_IDX,
+	MENU_INVISIBLE_IDX,
+	MENU_OFFLINE_IDX
+};
+
 gboolean show_hide_main(GtkWidget * widget, gpointer data)
 {
 	if (!GTK_WIDGET_VISIBLE(window)) {
@@ -42,17 +51,36 @@
 }
 
 static
-void applet_clicked_cb(GtkWidget * widget, GdkEventButton * ev,
-		       gpointer data)
+void applet_menu_change_status(GtkWidget * widget, gint * index)
 {
+	GtkWidget *optionmenu;
+	GtkWidget *status_menu;
 
-	if (ev == NULL)
-		return;
-	if (ev->button != 1 || ev->type != GDK_BUTTON_PRESS)
-		return;
-	show_hide_main(widget, NULL);
+	switch (*index) {
+	case MENU_ONLINE_IDX:
+		on_available_activate(NULL, NULL);
+		break;
+	case MENU_AWAY_IDX:
+		on_away_activate(NULL, NULL);
+		break;
+	case MENU_INVISIBLE_IDX:
+		on_invisible_activate(NULL, NULL);
+		break;
+	case MENU_OFFLINE_IDX:
+		on_not_available_activate(NULL, NULL);
+		break;
+	}
+
+	optionmenu = lookup_widget(window, "optionmenu");
+	status_menu =
+	    gtk_option_menu_get_menu(GTK_OPTION_MENU(optionmenu));
 
+	gtk_widget_ref(status_menu);
+	gtk_option_menu_remove_menu(GTK_OPTION_MENU(optionmenu));
+	gtk_menu_set_active(GTK_MENU(status_menu), *index);
+	gtk_option_menu_set_menu(GTK_OPTION_MENU(optionmenu), status_menu);
 }
+
 #endif
 
 #ifdef USE_APPLET
@@ -63,19 +91,23 @@
 #include <gdk/gdk.h>
 
 #include "interface.h"
-#include "callbacks.h"
-
-enum {
-	MENU_ONLINE_IDX,
-	MENU_AWAY_IDX,
-	MENU_INVISIBLE_IDX,
-	MENU_OFFLINE_IDX
-};
 
 extern GGConfig config;
 extern GtkWidget *applet;
 
 static
+void applet_clicked_cb(GtkWidget * widget, GdkEventButton * ev,
+		       gpointer data)
+{
+
+	if (ev == NULL)
+		return;
+	if (ev->button != 1 || ev->type != GDK_BUTTON_PRESS)
+		return;
+	show_hide_main(widget, NULL);
+
+}
+static
 gint applet_save_session(GtkWidget * widget,
 			 const gchar * privcfgpath,
 			 const gchar * globcfgpath)
@@ -120,36 +152,6 @@
 }
 #endif
 
-static
-void applet_menu_change_status(GtkWidget * widget, gint * index)
-{
-	GtkWidget *optionmenu;
-	GtkWidget *status_menu;
-
-	switch (*index) {
-	case MENU_ONLINE_IDX:
-		on_available_activate(NULL, NULL);
-		break;
-	case MENU_AWAY_IDX:
-		on_away_activate(NULL, NULL);
-		break;
-	case MENU_INVISIBLE_IDX:
-		on_invisible_activate(NULL, NULL);
-		break;
-	case MENU_OFFLINE_IDX:
-		on_not_available_activate(NULL, NULL);
-		break;
-	}
-
-	optionmenu = lookup_widget(window, "optionmenu");
-	status_menu =
-	    gtk_option_menu_get_menu(GTK_OPTION_MENU(optionmenu));
-
-	gtk_widget_ref(status_menu);
-	gtk_option_menu_remove_menu(GTK_OPTION_MENU(optionmenu));
-	gtk_menu_set_active(GTK_MENU(status_menu), *index);
-	gtk_option_menu_set_menu(GTK_OPTION_MENU(optionmenu), status_menu);
-}
 
 void applet_change_status_pixmap(gchar *filename)
 {
@@ -581,6 +583,109 @@
 
 }
 
+GtkWidget *create_docklet_menu() 
+{
+    GtkWidget *menu;
+    GtkWidget *submenu;
+    GtkWidget *menuitem;
+    static gint menus[] = { 0, 1, 2, 3 };
+    
+    menu = gtk_menu_new();
+
+    submenu = gtk_menu_new();
+    gtk_widget_show(submenu);
+
Commit	Line	Data
65c10842	1	diff -ur gg-0.2.2pre6/src/callbacks.c gg/src/callbacks.c
	2	--- gg-0.2.2pre6/src/callbacks.c Wed Mar 27 11:35:56 2002
	3	+++ gg/src/callbacks.c Fri Mar 29 00:40:37 2002
	4	@@ -1,4 +1,4 @@
	5	-/* $Id$ */
	6	+/* $Id$ */
	7
	8	/*
	9	* (C) Copyright 2001-2002 Igor Popik. Released under GPL license.
	10	@@ -1559,3 +1559,11 @@
	11	{
	12	gg_delete_userlist();
	13	}
	14	+
	15	+
	16	+void on_katalog_publiczny_activate(GtkMenuItem * menuitem, gpointer user_data)
	17	+{
	18	+ GtkWidget *widget;
	19	+ widget = create_pubdir_info();
	20	+ gtk_widget_show(widget);
	21	+}
	22	diff -ur gg-0.2.2pre6/src/callbacks.h gg/src/callbacks.h
	23	--- gg-0.2.2pre6/src/callbacks.h Mon Feb 18 12:46:14 2002
	24	+++ gg/src/callbacks.h Fri Mar 29 00:40:37 2002
	25	@@ -1,4 +1,4 @@
	26	-/* $Id$ */
	27	+/* $Id$ */
	28
	29	/*
	30	* (C) Copyright 2001-2002 Igor Popik. Released under GPL license.
	31	@@ -89,3 +89,5 @@
	32	void on_import_activate(GtkMenuItem * menuitem, gpointer user_data);
	33	void on_export_activate(GtkMenuItem * menuitem, gpointer user_data);
	34	void on_delete_activate(GtkMenuItem * menuitem, gpointer user_data);
	35	+
	36	+void on_katalog_publiczny_activate(GtkMenuItem * menuitem, gpointer user_data);
	37	diff -ur gg-0.2.2pre6/src/dock.c gg/src/dock.c
	38	--- gg-0.2.2pre6/src/dock.c Mon Mar 25 09:24:15 2002
	39	+++ gg/src/dock.c Thu Apr 4 09:04:03 2002
	40	@@ -1,4 +1,4 @@
	41	-/* $Id$ */
	42	+/* $Id$ */
	43
	44	/*
	45	* (C) Copyright 2001-2002 Igor Popik. Released under terms of GPL license.
	46	@@ -29,8 +29,17 @@
	47
	48	#if USE_APPLET \|\| USE_DOCKLET
	49
	50	+#include "callbacks.h"
	51	+
	52	extern GtkWidget *window;
	53
	54	+enum {
	55	+ MENU_ONLINE_IDX,
	56	+ MENU_AWAY_IDX,
	57	+ MENU_INVISIBLE_IDX,
	58	+ MENU_OFFLINE_IDX
	59	+};
	60	+
	61	gboolean show_hide_main(GtkWidget * widget, gpointer data)
	62	{
	63	if (!GTK_WIDGET_VISIBLE(window)) {
	64	@@ -42,17 +51,36 @@
65	}
66
67	static
68	-void applet_clicked_cb(GtkWidget * widget, GdkEventButton * ev,
69	- gpointer data)
70	+void applet_menu_change_status(GtkWidget * widget, gint * index)
71	{
72	+ GtkWidget *optionmenu;
73	+ GtkWidget *status_menu;
74
75	- if (ev == NULL)
76	- return;
77	- if (ev->button != 1 \|\| ev->type != GDK_BUTTON_PRESS)
78	- return;
79	- show_hide_main(widget, NULL);
80	+ switch (*index) {
81	+ case MENU_ONLINE_IDX:
82	+ on_available_activate(NULL, NULL);
83	+ break;
84	+ case MENU_AWAY_IDX:
85	+ on_away_activate(NULL, NULL);
86	+ break;
87	+ case MENU_INVISIBLE_IDX:
88	+ on_invisible_activate(NULL, NULL);
89	+ break;
90	+ case MENU_OFFLINE_IDX:
91	+ on_not_available_activate(NULL, NULL);
92	+ break;
93	+ }
94	+
95	+ optionmenu = lookup_widget(window, "optionmenu");
96	+ status_menu =
97	+ gtk_option_menu_get_menu(GTK_OPTION_MENU(optionmenu));
98
99	+ gtk_widget_ref(status_menu);
100	+ gtk_option_menu_remove_menu(GTK_OPTION_MENU(optionmenu));
101	+ gtk_menu_set_active(GTK_MENU(status_menu), *index);
102	+ gtk_option_menu_set_menu(GTK_OPTION_MENU(optionmenu), status_menu);
103	}
104	+
105	#endif
106
107	#ifdef USE_APPLET
108	@@ -63,19 +91,23 @@
109	#include <gdk/gdk.h>
110
111	#include "interface.h"
112	-#include "callbacks.h"
113	-
114	-enum {
115	- MENU_ONLINE_IDX,
116	- MENU_AWAY_IDX,
117	- MENU_INVISIBLE_IDX,
118	- MENU_OFFLINE_IDX
119	-};
120
121	extern GGConfig config;
122	extern GtkWidget *applet;
123
124	static
125	+void applet_clicked_cb(GtkWidget * widget, GdkEventButton * ev,
126	+ gpointer data)
127	+{
128	+
129	+ if (ev == NULL)
130	+ return;
131	+ if (ev->button != 1 \|\| ev->type != GDK_BUTTON_PRESS)
132	+ return;
133	+ show_hide_main(widget, NULL);
134	+
135	+}
136	+static
137	gint applet_save_session(GtkWidget * widget,
138	const gchar * privcfgpath,
139	const gchar * globcfgpath)
140	@@ -120,36 +152,6 @@
141	}
142	#endif
143
144	-static
145	-void applet_menu_change_status(GtkWidget * widget, gint * index)
146	-{
147	- GtkWidget *optionmenu;
148	- GtkWidget *status_menu;
149	-
150	- switch (*index) {
151	- case MENU_ONLINE_IDX:
152	- on_available_activate(NULL, NULL);
153	- break;
154	- case MENU_AWAY_IDX:
155	- on_away_activate(NULL, NULL);
156	- break;
157	- case MENU_INVISIBLE_IDX:
158	- on_invisible_activate(NULL, NULL);
159	- break;
160	- case MENU_OFFLINE_IDX:
161	- on_not_available_activate(NULL, NULL);
162	- break;
163	- }
164	-
165	- optionmenu = lookup_widget(window, "optionmenu");
166	- status_menu =
167	- gtk_option_menu_get_menu(GTK_OPTION_MENU(optionmenu));
168	-
169	- gtk_widget_ref(status_menu);
170	- gtk_option_menu_remove_menu(GTK_OPTION_MENU(optionmenu));
171	- gtk_menu_set_active(GTK_MENU(status_menu), *index);
172	- gtk_option_menu_set_menu(GTK_OPTION_MENU(optionmenu), status_menu);
173	-}
174
175	void applet_change_status_pixmap(gchar *filename)
176	{
177	@@ -581,6 +583,109 @@
178
179	}
180
181	+GtkWidget *create_docklet_menu()
182	+{
183	+ GtkWidget *menu;
184	+ GtkWidget *submenu;
185	+ GtkWidget *menuitem;
186	+ static gint menus[] = { 0, 1, 2, 3 };
187	+
188	+ menu = gtk_menu_new();
189	+
190	+ submenu = gtk_menu_new();
191	+ gtk_widget_show(submenu);
192	+
193