Dear MlView developers, I am the maintainer of the FreeBSD mlview port. Could you please have a look at the attached patches, and -- if you agree with them -- incorporate them into your next release? ptch-src_mlview-app-context.c simpliy moves a variable declaration at the beginning of a function -- for gcc 2.95 compat (Maybe more patches of this kind are necessary; this one is in the FreeBSD ports collection since MlView 0.7.1) patch-src_mlview-service.c is needed for compat. with dbus 0.34. I'm not familiar with DBus at all, but maybe the patch is helpful for you anyway. Best regards, Simon P.S. Please Cc: me in your replys because I'm not a member of this list.
--- src/mlview-app-context.c.orig Tue Jan 11 09:37:44 2005
+++ src/mlview-app-context.c Tue Jan 11 09:38:02 2005
@@ -1348,13 +1348,14 @@
mlview_app_context_get_file_chooser (MlViewAppContext *a_this,
const gchar *a_title, MlViewFileChooserMode a_mode)
{
+ GtkWidget * parent_window = NULL ;
+
g_return_val_if_fail (a_this
&& MLVIEW_IS_APP_CONTEXT (a_this)
&& PRIVATE (a_this),
NULL) ;
/*if (!PRIVATE (a_this)->file_chooser) {*/
- GtkWidget * parent_window = NULL ;
parent_window = mlview_app_context_get_element (a_this,
"MlViewMainWindow") ;
--- src/mlview-service.c.orig Sat Jul 23 12:10:16 2005
+++ src/mlview-service.c Sat Jul 23 12:23:14 2005
@@ -282,23 +282,23 @@
service_name = g_strdup_printf ("%s.%s",
PRIVATE (a_this)->name,
tab) ;
- service_result = dbus_bus_acquire_service
+ service_result = dbus_bus_request_name
(dbus_connection,
service_name, 0, &dbus_error) ;
switch (service_result) {
- case DBUS_SERVICE_REPLY_PRIMARY_OWNER:
+ case DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER:
/*we started the service, OK*/
mlview_utils_trace_debug
("Service name: %s registered\n",
service_name) ;
status = register_dbus_objects (a_this) ;
break ;
- case DBUS_SERVICE_REPLY_ALREADY_OWNER:
+ case DBUS_REQUEST_NAME_REPLY_ALREADY_OWNER:
/*we were already started as service. OK still*/
status = MLVIEW_OK ;
break ;
- case DBUS_SERVICE_REPLY_SERVICE_EXISTS:
+ case DBUS_REQUEST_NAME_REPLY_EXISTS:
/*
* an other process has been registered under
* with the same service name. So we can't be registered
@@ -312,7 +312,7 @@
"moment") ;
}
goto try_service_name ;
- case DBUS_SERVICE_REPLY_IN_QUEUE:
+ case DBUS_REQUEST_NAME_REPLY_IN_QUEUE:
/*
* our request is queued. (bus overcrowded ?) KO
*/
Attachment:
pgp3PFY6RYeyX.pgp
Description: PGP signature