Date: Thu, 6 May 1999 15:22:37 -0500 From: ade@lovett.com To: FreeBSD-gnats-submit@freebsd.org Subject: ports/11550: Fix port gnomenetwork-1.0.1 Message-ID: <E10fUfF-000E2b-00@burn.lovett.com>
next in thread | raw e-mail | index | archive | help
>Number: 11550
>Category: ports
>Synopsis: Fix port gnomenetwork-1.0.1
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Thu May 6 13:50:00 PDT 1999
>Closed-Date:
>Last-Modified:
>Originator: Ade Lovett
>Release: FreeBSD 3.1-STABLE i386
>Organization:
Lovett Network Consultancy
>Environment:
3.1-STABLE as of 05/01, up-to-date ports tree
>Description:
A whole bunch of things changed between gnomeobjc-1.0.1
and gnomeobjc-1.0.2 (see PR11543 for the update).
This broke gmailman, and GNOME themselves haven't released
an new version of gnome-network yet, so I've gone in to
the CVS tree, and hacked out the changes to make things
work.
>How-To-Repeat:
Install gnomeobjc-1.0.2 fom PR11543
cd /usr/ports/net/gnomenetwork
make
>Fix:
Add the following file as patch-af
This PR, along with 11529, 11538, 11541, 11543, 11544,
11545, 11547, 11548 and 11549 completes the update
of the entire gnome-1.0 metaport to the latest available
versions, building successfully on 3.1-STABLE
--- gmailman/gmailman.m.orig Thu May 6 14:51:58 1999
+++ gmailman/gmailman.m Thu May 6 15:03:52 1999
@@ -45,6 +45,7 @@
SubscriptionStatus selected_status;
id clicked_widget;
id btn_ok, btn_cancel;
+ id vbox, action_area;
}
- clicked:(id) anObject;
- run;
@@ -65,14 +66,17 @@
GList *alist;
self = [super init];
+ vbox = [Gtk_VBox makeGtkVBox:GTK_VBOX(gtkdialog->vbox)];
+ action_area = [Gtk_HBox makeGtkHBox:GTK_HBOX(gtkdialog->action_area)];
+
#define DO_ENTRY(label, var) \
- abox = [[[Gtk_HBox alloc] initWithBoxInfo:FALSE setSpacing:5] show]; \
- [abox add:[[[Gtk_Label alloc] initWithLabel:label] show]]; \
+ abox = [[[Gtk_HBox alloc] initWithHBoxInfo:FALSE :5] show]; \
+ [abox add:[[[Gtk_Label alloc] initWithLabelInfo:label] show]]; \
[abox add:(var = [[Gtk_Entry new] show])]; \
[vbox add:abox]
#define DO_WIDGET(label, widget) \
- abox = [[[Gtk_HBox alloc] initWithBoxInfo:FALSE setSpacing:5] show]; \
- [abox add:[[[Gtk_Label alloc] initWithLabel:label] show]]; \
+ abox = [[[Gtk_HBox alloc] initWithHBoxInfo:FALSE :5] show]; \
+ [abox add:[[[Gtk_Label alloc] initWithLabelInfo:label] show]]; \
[abox add:(widget)]; \
[vbox add:abox]
@@ -130,12 +134,16 @@
- activate:(id) actobj
{
- if([actobj get_parent] == menu_type)
+ id my_parent;
+
+ my_parent = [[Gtk_Object class]
+ getObjectForGtkObject:GTK_WIDGET([actobj getGtkObject])->parent];
+ if(my_parent == menu_type)
{
selected_type = [actobj get_data:"mltype"];
g_print("Selected type was %s\n", selected_type);
}
- else if([actobj get_parent] == menu_status)
+ else if(my_parent == menu_status)
{
selected_status = (SubscriptionStatus)[actobj get_data:"mlstatus"];
g_print("Selected status was %d\n", selected_status);
@@ -232,10 +240,10 @@
[self createMLList];
/* Pack things into the window */
- [vbox pack_start:mlistlist doExpand:TRUE doFill:TRUE doPadding:5];
- [vbox pack_start:lbl_listaddr doExpand:TRUE doFill:TRUE doPadding:5];
- [vbox pack_start:lbl_ctladdr doExpand:TRUE doFill:TRUE doPadding:5];
- [vbox pack_start:lbl_mltype doExpand:TRUE doFill:TRUE doPadding:5];
+ [vbox pack_start:mlistlist :TRUE :TRUE :5];
+ [vbox pack_start:lbl_listaddr :TRUE :TRUE :5];
+ [vbox pack_start:lbl_ctladdr :TRUE :TRUE :5];
+ [vbox pack_start:lbl_mltype :TRUE :TRUE :5];
#if 0
[self create_menus:mainmenu];
@@ -244,7 +252,7 @@
[self set_contents:vbox];
[self connect:"delete_event"];
- [self set_usize:500 height:-1];
+ [self set_usize:500 :-1];
[[mlistlist thaw] show];
return self;
@@ -258,9 +266,12 @@
id hbox;
id ent_name, ent_email;
id btn_set;
+ id action_area, vbox;
nd = [Gtk_Dialog new];
- [nd->action_area add:[(id)[[Gtk_Button alloc]
+ action_area = [Gtk_HBox makeGtkHBox:GTK_HBOX(nd->gtkdialog->action_area)];
+ vbox = [Gtk_VBox makeGtkVBox:GTK_VBOX(nd->gtkdialog->vbox)];
+ [action_area add:[(id)[[Gtk_Button alloc]
initWithLabel:"Close"]
signal_connect:"clicked"
signalFunc:gtk_main_quit funcData:NULL]];
@@ -269,20 +280,20 @@
[nd signal_connect:"delete_event" signalFunc:GTK_SIGNAL_FUNC(gtk_widget_hide_on_delete) funcData:NULL];
hbox = [[Gtk_HBox new] show];
- [nd->vbox add:hbox];
+ [vbox add:hbox];
[hbox add:[[[Gtk_Label alloc] initWithLabel:"Name:"] show]];
ent_name = [[Gtk_Entry new] show];
[hbox add:ent_name];
hbox = [[Gtk_HBox new] show];
- [nd->vbox add:hbox];
+ [vbox add:hbox];
[hbox add:[[[Gtk_Label alloc] initWithLabel:"E-mail address:"] show]];
ent_email = [[Gtk_Entry new] show];
[hbox add:ent_email];
btn_set = [[Gtk_Button alloc]
castGtkButton:GTK_BUTTON(gnome_stock_button(GNOME_STOCK_BUTTON_OK))];
[btn_set signal_connect:"clicked" signalFunc:gtk_main_quit funcData:NULL];
- [nd->action_area add:[btn_set show]];
+ [action_area add:[btn_set show]];
if(persona)
{
@@ -329,7 +340,7 @@
[mlobj getName]);
[mlobj free];
gnome_config_clean_section(tmpstr->str);
- [mlistlist removeCListRow:rownum];
+ [mlistlist remove:rownum];
mlists = g_list_remove(mlists, mlobj);
}
return self;
@@ -446,8 +457,8 @@
g_error("Unknown subscription status %d\n", [alist getStatus]);
}
vals[2] = (char *)[alist getDescription];
- rownum = [mlistlist appendCListRow:(const char **)vals];
- [mlistlist set_row_data:rownum rowData:alist];
+ rownum = [mlistlist append:(const char **)vals];
+ [mlistlist set_row_data:rownum :alist];
return self;
}
@@ -463,7 +474,7 @@
mlists = MLGetListObjects();
mlistlist =
- [[[Gtk_CList alloc] initWithCListInfoTitles:3 Titles:columns] freeze];
+ [[[Gtk_CList alloc] initWithTitles:3 :columns] freeze];
[mlistlist set_data:"Mailman" :self];
for(item = mlists; item; item = item->next)
@@ -472,7 +483,7 @@
[mlistlist connectObj:"select_row" :self];
[mlistlist set_column_width:0 :100];
[mlistlist set_column_width:1 :75];
- [mlistlist set_usize:-1 height:270];
+ [mlistlist set_usize:-1 :270];
[mlistlist set_selection_mode:GTK_SELECTION_BROWSE];
return self;
@@ -514,9 +525,9 @@
gtk_label_set(GTK_LABEL(GTK_BIN(((Gtk_ListItem *)op_act)->gtkbin)->child),
tmp);
- [popup_oplist popup:NULL menuItem:NULL posFunc:NULL
- posFuncData:mlobj posFuncBtn:event->button
- posFuncTime:event->time];
+ [popup_oplist popup:NULL :NULL :NULL
+ :mlobj :event->button
+ :event->time];
}
}
return self;
>Release-Note:
>Audit-Trail:
>Unformatted:
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?E10fUfF-000E2b-00>