xfdeskmenu patch (removes all gtk 1.2)

[Jens Luedicke]

Hi ...

another patch to remove the gtk 1.2 code. Someone
needs to remove it from the configure scripts
as well :|

jens

-- 
Jens Luedicke <jens at irs-net.com>

"Never offend people with style when you can offend them with substance."
--Sam Brown

-------------- next part --------------
? ./src/.deps
? ./src/Makefile
? ./src/xfdeskmenu
Index: src/popup.c
===================================================================
RCS file: /cvsroot/xfce/xfce-devel/xfdeskmenu/src/popup.c,v
retrieving revision 1.3
diff -r1.3 popup.c
46,48d45
< 
< #ifdef XD_GTK_2
< 
122,177d118
< #endif /* XD_GTK_2 */
< 
< #ifdef XD_GTK_1
< 
< int confirm = False;
< 
< void ok_click(GtkWidget * w)
< {
<     confirm = True;
<     gtk_main_quit();
< }
< 
< void quit(GtkWidget * widget, gpointer * root_menu)
< {
<     GtkWidget *dialog, *label, *ok, *cancel;
< 
<     DBG("quit\n");
< 
<     dialog = gtk_dialog_new();
<     label = gtk_label_new("Do you really want to quit?");
<     ok = gtk_button_new_with_label("Ok");
<     cancel = gtk_button_new_with_label("Cancel");
< 
<     gtk_signal_connect(GTK_OBJECT(dialog), "destroy",
<             GTK_SIGNAL_FUNC(gtk_main_quit), NULL);
<     gtk_signal_connect(GTK_OBJECT(ok), "clicked",
<             GTK_SIGNAL_FUNC(ok_click), NULL);
<     gtk_signal_connect_object(GTK_OBJECT(cancel), "clicked",
<             GTK_SIGNAL_FUNC(gtk_widget_destroy),
<             (gpointer) dialog);
< 
<     gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog)->vbox), label, TRUE,
<             TRUE, 0);
<     gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog)->action_area), ok, TRUE,
<             TRUE, 0);
<     gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog)->action_area), cancel,
<             TRUE, TRUE, 0);
< 
<     gtk_container_border_width(GTK_CONTAINER(dialog), 5);
<     gtk_window_set_title(GTK_WINDOW(dialog), "Confirm");
<     gtk_window_set_position(GTK_WINDOW(dialog), GTK_WIN_POS_CENTER);
<     gtk_window_set_policy(GTK_WINDOW(dialog), FALSE, FALSE, TRUE);
< 
<     gtk_widget_show_all(dialog);
<     gtk_main();
<     gtk_widget_destroy(dialog);
< 
<     if (confirm)
<     {
<         // gtk_widget_destroy(GTK_MENU(root_menu));
<         exit(0);
<     }
< }
< 
< 
< #endif /* XD_GTK_1 */
270,271d210
< 
< 
445,448d383
< #ifdef XD_GTK_1
< void menu_pos(GtkMenu * m, int *x, int *y, XEvent * ev)
< #endif /* XD_GTK_1 */
< #ifdef XD_GTK_2    
450d384
< #endif /* XD_GTK_2 */
481,482d414
< 
< 
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: not available
URL: <http://mail.xfce.org/pipermail/xfce4-dev/attachments/20021124/9df5f093/attachment.pgp>