[Xfce4-commits] r22736 - in xarchiver/branches/xarchiver-psybsd: libxarchiver src
Author: stephan
Date: 2006-08-13 07:50:44 + (Sun, 13 Aug 2006)
New Revision: 22736
Modified:
xarchiver/branches/xarchiver-psybsd/libxarchiver/archive-support-gnu-tar.c
xarchiver/branches/xarchiver-psybsd/libxarchiver/archive-support-gnu-tar.h
xarchiver/branches/xarchiver-psybsd/libxarchiver/archive-support-zip.c
xarchiver/branches/xarchiver-psybsd/libxarchiver/archive-support-zip.h
xarchiver/branches/xarchiver-psybsd/libxarchiver/archive-support.c
xarchiver/branches/xarchiver-psybsd/libxarchiver/archive-support.h
xarchiver/branches/xarchiver-psybsd/libxarchiver/archive.c
xarchiver/branches/xarchiver-psybsd/src/main.c
xarchiver/branches/xarchiver-psybsd/src/new_dialog.c
Log:
- Implemented 'remove'
- Implemented 'add-to' commandline switch
Modified:
xarchiver/branches/xarchiver-psybsd/libxarchiver/archive-support-gnu-tar.c
===
--- xarchiver/branches/xarchiver-psybsd/libxarchiver/archive-support-gnu-tar.c
2006-08-13 06:48:09 UTC (rev 22735)
+++ xarchiver/branches/xarchiver-psybsd/libxarchiver/archive-support-gnu-tar.c
2006-08-13 07:50:44 UTC (rev 22736)
@@ -84,6 +84,7 @@
archive_support-add = lxa_archive_support_gnu_tar_add;
archive_support-extract = lxa_archive_support_gnu_tar_extract;
+ archive_support-remove = lxa_archive_support_gnu_tar_remove;
}
void
@@ -172,13 +173,45 @@
command =
g_strconcat(LXA_ARCHIVE_SUPPORT_GNU_TAR(support)-app_name, -zxf ,
archive-path, -C , dest_path, , files, NULL);
if(!g_strcasecmp((gchar *)archive-mime,
application/x-bzip-compressed-tar))
command =
g_strconcat(LXA_ARCHIVE_SUPPORT_GNU_TAR(support)-app_name, -jxf ,
archive-path, -C , dest_path, , files, NULL);
- if(command)
- {
- g_debug(Extracting archive '%s' to '%s',
archive-path, dest_path);
- lxa_execute(command, archive, NULL, NULL, NULL,
NULL);
- }
} else
return 1;
+ if(command)
+ lxa_execute(command, archive, NULL, NULL, NULL, NULL);
}
return 0;
}
+
+gint
+lxa_archive_support_gnu_tar_remove(LXAArchiveSupport *support, LXAArchive
*archive, GSList *filenames)
+{
+ if(!LXA_IS_ARCHIVE_SUPPORT_GNU_TAR(support))
+ {
+ g_critical(Support is not GNU TAR);
+ return -1;
+ }
+
+ if(!lxa_archive_support_mime_supported(support, archive-mime))
+ {
+ return 1;
+ }
+ else
+ {
+ gchar *command = NULL;
+ gchar *files = lxa_concat_filenames(filenames);
+ if(g_file_test(archive-path, G_FILE_TEST_EXISTS))
+ {
+ if(!g_strcasecmp((gchar *)archive-mime,
application/x-tar))
+ command =
g_strconcat(LXA_ARCHIVE_SUPPORT_GNU_TAR(support)-app_name, -f ,
archive-path, --delete , files, NULL);
+ if(!g_strcasecmp((gchar *)archive-mime,
application/x-tarz))
+ command =
g_strconcat(LXA_ARCHIVE_SUPPORT_GNU_TAR(support)-app_name, -Zf ,
archive-path, --delete , files, NULL);
+ if(!g_strcasecmp((gchar *)archive-mime,
application/x-compressed-tar))
+ command =
g_strconcat(LXA_ARCHIVE_SUPPORT_GNU_TAR(support)-app_name, -zf ,
archive-path, --delete , files, NULL);
+ if(!g_strcasecmp((gchar *)archive-mime,
application/x-bzip-compressed-tar))
+ command =
g_strconcat(LXA_ARCHIVE_SUPPORT_GNU_TAR(support)-app_name, -jf ,
archive-path, --delete , files, NULL);
+ } else
+ return 1;
+ if(command)
+ lxa_execute(command, archive, NULL, NULL, NULL, NULL);
+ }
+ return 0;
+}
Modified:
xarchiver/branches/xarchiver-psybsd/libxarchiver/archive-support-gnu-tar.h
===
--- xarchiver/branches/xarchiver-psybsd/libxarchiver/archive-support-gnu-tar.h
2006-08-13 06:48:09 UTC (rev 22735)
+++ xarchiver/branches/xarchiver-psybsd/libxarchiver/archive-support-gnu-tar.h
2006-08-13 07:50:44 UTC (rev 22736)
@@ -61,6 +61,7 @@
gint lxa_archive_support_gnu_tar_add(LXAArchiveSupport *,
LXAArchive *, GSList *);
gint lxa_archive_support_gnu_tar_extract(LXAArchiveSupport *,
LXAArchive *, gchar *, GSList *);
+gint lxa_archive_support_gnu_tar_remove(LXAArchiveSupport *,
LXAArchive *, GSList *);
G_END_DECLS
Modified: xarchiver/branches/xarchiver-psybsd/libxarchiver/archive-support-zip.c
===
---
[Xfce4-commits] r22739 - in xfce4-panel/trunk/plugins: actions clock iconbox launcher pager separator systray tasklist windowlist
Author: jasper Date: 2006-08-13 09:10:57 + (Sun, 13 Aug 2006) New Revision: 22739 Modified: xfce4-panel/trunk/plugins/actions/actions.c xfce4-panel/trunk/plugins/clock/clock.c xfce4-panel/trunk/plugins/iconbox/iconbox.c xfce4-panel/trunk/plugins/launcher/launcher-dialog.c xfce4-panel/trunk/plugins/pager/pager.c xfce4-panel/trunk/plugins/separator/separator.c xfce4-panel/trunk/plugins/systray/systray.c xfce4-panel/trunk/plugins/tasklist/tasklist.c xfce4-panel/trunk/plugins/windowlist/windowlist-dialog.c Log: Don't make panel the parent of property dialogs, this prevents the dialogs from being always on top. Modified: xfce4-panel/trunk/plugins/actions/actions.c === --- xfce4-panel/trunk/plugins/actions/actions.c 2006-08-13 08:59:36 UTC (rev 22738) +++ xfce4-panel/trunk/plugins/actions/actions.c 2006-08-13 09:10:57 UTC (rev 22739) @@ -393,8 +393,7 @@ xfce_panel_plugin_block_menu (plugin); -dlg = xfce_titled_dialog_new_with_buttons (_(Panel Actions), -GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (plugin))), +dlg = xfce_titled_dialog_new_with_buttons (_(Panel Actions), NULL, GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_NO_SEPARATOR, GTK_STOCK_CLOSE, GTK_RESPONSE_OK, NULL); Modified: xfce4-panel/trunk/plugins/clock/clock.c === --- xfce4-panel/trunk/plugins/clock/clock.c 2006-08-13 08:59:36 UTC (rev 22738) +++ xfce4-panel/trunk/plugins/clock/clock.c 2006-08-13 09:10:57 UTC (rev 22739) @@ -443,8 +443,7 @@ cd = g_new0 (ClockDialog, 1); cd-clock = clock; -dlg = xfce_titled_dialog_new_with_buttons (_(Clock), -GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (plugin))), +dlg = xfce_titled_dialog_new_with_buttons (_(Clock), NULL, GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_NO_SEPARATOR, GTK_STOCK_CLOSE, GTK_RESPONSE_OK, NULL); Modified: xfce4-panel/trunk/plugins/iconbox/iconbox.c === --- xfce4-panel/trunk/plugins/iconbox/iconbox.c 2006-08-13 08:59:36 UTC (rev 22738) +++ xfce4-panel/trunk/plugins/iconbox/iconbox.c 2006-08-13 09:10:57 UTC (rev 22739) @@ -804,8 +804,7 @@ xfce_panel_plugin_block_menu (plugin); -dlg = xfce_titled_dialog_new_with_buttons (_(Icon Box), -GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (plugin))), +dlg = xfce_titled_dialog_new_with_buttons (_(Icon Box), NULL, GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_NO_SEPARATOR, GTK_STOCK_CLOSE, GTK_RESPONSE_OK, NULL); Modified: xfce4-panel/trunk/plugins/launcher/launcher-dialog.c === --- xfce4-panel/trunk/plugins/launcher/launcher-dialog.c2006-08-13 08:59:36 UTC (rev 22738) +++ xfce4-panel/trunk/plugins/launcher/launcher-dialog.c2006-08-13 09:10:57 UTC (rev 22739) @@ -1329,8 +1329,7 @@ xfce_panel_plugin_block_menu (ld-plugin); -ld-dlg = xfce_titled_dialog_new_with_buttons (_(Program Launcher), -GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (plugin))), +ld-dlg = xfce_titled_dialog_new_with_buttons (_(Program Launcher), NULL, GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_NO_SEPARATOR, GTK_STOCK_CLOSE, GTK_RESPONSE_OK, NULL); Modified: xfce4-panel/trunk/plugins/pager/pager.c === --- xfce4-panel/trunk/plugins/pager/pager.c 2006-08-13 08:59:36 UTC (rev 22738) +++ xfce4-panel/trunk/plugins/pager/pager.c 2006-08-13 09:10:57 UTC (rev 22739) @@ -302,8 +302,7 @@ xfce_panel_plugin_block_menu (plugin); -dlg = xfce_titled_dialog_new_with_buttons (_(Pager), -GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (plugin))), +dlg = xfce_titled_dialog_new_with_buttons (_(Pager), NULL, GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_NO_SEPARATOR, GTK_STOCK_CLOSE, GTK_RESPONSE_OK, NULL); Modified: xfce4-panel/trunk/plugins/separator/separator.c === --- xfce4-panel/trunk/plugins/separator/separator.c 2006-08-13 08:59:36 UTC (rev 22738) +++ xfce4-panel/trunk/plugins/separator/separator.c 2006-08-13 09:10:57 UTC (rev 22739) @@ -252,8 +252,7 @@ xfce_panel_plugin_block_menu (plugin); -dlg = xfce_titled_dialog_new_with_buttons (_(Separator or Spacing), -GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (plugin))), +dlg = xfce_titled_dialog_new_with_buttons (_(Separator or Spacing), NULL, GTK_DIALOG_DESTROY_WITH_PARENT |
[Xfce4-commits] r22740 - xfce4-panel/trunk/panel
Author: jasper Date: 2006-08-13 09:25:33 + (Sun, 13 Aug 2006) New Revision: 22740 Modified: xfce4-panel/trunk/panel/panel-dialogs.c Log: Don't make panel dialogs always on top. Modified: xfce4-panel/trunk/panel/panel-dialogs.c === --- xfce4-panel/trunk/panel/panel-dialogs.c 2006-08-13 09:10:57 UTC (rev 22739) +++ xfce4-panel/trunk/panel/panel-dialogs.c 2006-08-13 09:25:33 UTC (rev 22740) @@ -647,7 +647,6 @@ /* make panels insensitive and set up dnd */ g_ptr_array_foreach (panels, (GFunc)item_dialog_opened, NULL); -gtk_window_set_keep_above (GTK_WINDOW (dlg), TRUE); gtk_window_stick(GTK_WINDOW (dlg)); gtk_window_set_type_hint (GTK_WINDOW (dlg), GDK_WINDOW_TYPE_HINT_UTILITY); @@ -1643,7 +1642,6 @@ g_signal_connect (pmd-dlg, response, G_CALLBACK (panel_dialog_response), pmd); -gtk_window_set_keep_above (GTK_WINDOW (pmd-dlg), TRUE); gtk_window_stick(GTK_WINDOW (pmd-dlg)); gtk_window_set_type_hint (GTK_WINDOW (pmd-dlg), GDK_WINDOW_TYPE_HINT_UTILITY); ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r22741 - in xarchiver/branches/xarchiver-psybsd: libxarchiver src
Author: stephan
Date: 2006-08-13 10:14:38 + (Sun, 13 Aug 2006)
New Revision: 22741
Modified:
xarchiver/branches/xarchiver-psybsd/libxarchiver/archive-support.c
xarchiver/branches/xarchiver-psybsd/libxarchiver/archive.c
xarchiver/branches/xarchiver-psybsd/libxarchiver/archive.h
xarchiver/branches/xarchiver-psybsd/libxarchiver/internals.c
xarchiver/branches/xarchiver-psybsd/libxarchiver/libxarchiver.c
xarchiver/branches/xarchiver-psybsd/src/main.c
Log:
- Fixed status support. -- app now closes on success;
Modified: xarchiver/branches/xarchiver-psybsd/libxarchiver/archive-support.c
===
--- xarchiver/branches/xarchiver-psybsd/libxarchiver/archive-support.c
2006-08-13 09:25:33 UTC (rev 22740)
+++ xarchiver/branches/xarchiver-psybsd/libxarchiver/archive-support.c
2006-08-13 10:14:38 UTC (rev 22741)
@@ -179,7 +179,10 @@
lxa_archive_support_add(LXAArchiveSupport *support, LXAArchive *archive,
GSList *files)
{
if(support-add)
+ {
+ lxa_archive_set_status(archive, LXA_ARCHIVESTATUS_ADD);
return support-add(support, archive, files);
+ }
else
g_critical(ADD NOT IMPLEMENTED BY SUPPORT OBJECT '%s',
support-id);
return -1;
@@ -189,7 +192,10 @@
lxa_archive_support_extract(LXAArchiveSupport *support, LXAArchive *archive,
gchar *dest_path, GSList *files)
{
if(support-extract)
+ {
+ lxa_archive_set_status(archive, LXA_ARCHIVESTATUS_EXTRACT);
return support-extract(support, archive, dest_path, files);
+ }
else
g_critical(EXTRACT NOT IMPLEMENTED BY SUPPORT OBJECT '%s',
support-id);
return -1;
@@ -199,7 +205,10 @@
lxa_archive_support_remove(LXAArchiveSupport *support, LXAArchive *archive,
GSList *files)
{
if(support-remove)
+ {
+ lxa_archive_set_status(archive, LXA_ARCHIVESTATUS_REMOVE);
return support-remove(support, archive, files);
+ }
else
g_critical(REMOVE NOT IMPLEMENTED BY SUPPORT OBJECT '%s',
support-id);
return -1;
Modified: xarchiver/branches/xarchiver-psybsd/libxarchiver/archive.c
===
--- xarchiver/branches/xarchiver-psybsd/libxarchiver/archive.c 2006-08-13
09:25:33 UTC (rev 22740)
+++ xarchiver/branches/xarchiver-psybsd/libxarchiver/archive.c 2006-08-13
10:14:38 UTC (rev 22741)
@@ -37,7 +37,9 @@
static void
lxa_archive_finalize(GObject *object);
+static gint lxa_archive_signals[1];
+
GType
lxa_archive_get_type ()
{
@@ -70,6 +72,18 @@
GObjectClass *object_class = G_OBJECT_CLASS(archive_class);
object_class-finalize = lxa_archive_finalize;
+
+ lxa_archive_signals[0] = g_signal_new(lxa_status_changed,
+ G_TYPE_FROM_CLASS(archive_class),
+ G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
+ 0,
+ NULL,
+ NULL,
+ g_cclosure_marshal_VOID__POINTER,
+ G_TYPE_NONE,
+ 1,
+ G_TYPE_POINTER,
+ NULL);
}
static void
@@ -103,7 +117,23 @@
mime_info = thunar_vfs_mime_info_new(mime, -1);
archive-mime = g_strdup(thunar_vfs_mime_info_get_name(mime_info));
- g_print(%s\n, archive-mime);
+
+ if(!lxa_get_support_for_mime(archive-mime))
+ {
+ g_object_unref(archive);
+ archive = NULL;
+ }
return archive;
}
+
+void
+lxa_archive_set_status(LXAArchive *archive, LXAArchiveStatus status)
+{
+ if(archive-status != status)
+ {
+ archive-old_status = archive-status;
+ archive-status = status;
+ g_signal_emit(G_OBJECT(archive), lxa_archive_signals[0], 0,
archive);
+ }
+}
Modified: xarchiver/branches/xarchiver-psybsd/libxarchiver/archive.h
===
--- xarchiver/branches/xarchiver-psybsd/libxarchiver/archive.h 2006-08-13
09:25:33 UTC (rev 22740)
+++ xarchiver/branches/xarchiver-psybsd/libxarchiver/archive.h 2006-08-13
10:14:38 UTC (rev 22741)
@@ -59,6 +59,8 @@
GObject parent;
gchar *path;
gchar *mime;
+ LXAArchiveStatus status;
+ LXAArchiveStatus old_status;
GPid child_pid;
};
@@ -73,6 +75,7 @@
LXAArchive*lxa_archive_new(gchar *, gchar *);
gchar *lxa_archive_discover_mime(LXAArchive *archive);
+void lxa_archive_set_status(LXAArchive *archive,
LXAArchiveStatus status);
G_END_DECLS
Modified: xarchiver/branches/xarchiver-psybsd/libxarchiver/internals.c
[Xfce4-commits] r22742 - xfdesktop/trunk/menueditor
Author: pollux
Date: 2006-08-13 10:15:44 + (Sun, 13 Aug 2006)
New Revision: 22742
Modified:
xfdesktop/trunk/menueditor/menueditor-main-window.c
Log:
warn the user if the menu file couldn't be opened in write mode
Modified: xfdesktop/trunk/menueditor/menueditor-main-window.c
===
--- xfdesktop/trunk/menueditor/menueditor-main-window.c 2006-08-13 10:14:38 UTC
(rev 22741)
+++ xfdesktop/trunk/menueditor/menueditor-main-window.c 2006-08-13 10:15:44 UTC
(rev 22742)
@@ -123,7 +123,7 @@
static void cb_treeview_row_activated (GtkWidget *, GtkTreePath *,
GtkTreeViewColumn *, MenuEditorMainWindow *);
static gboolean load_menu_in_treeview (const gchar *, MenuEditorMainWindow *);
-static gboolean save_treeview_in_file (MenuEditorMainWindow *window);
+static void save_treeview_in_file (MenuEditorMainWindow *window);
static void copy_menuelement_to (MenuEditorMainWindowPrivate *priv,
GtkTreeIter *src, GtkTreeIter *dest,
GtkTreeViewDropPosition position);
@@ -1987,14 +1987,14 @@
return FALSE;
}
-static gboolean
+static void
save_treeview_in_file (MenuEditorMainWindow *window)
{
MenuEditorMainWindowPrivate *priv = MENUEDITOR_MAIN_WINDOW_GET_PRIVATE
(window);
FILE *file_menu;
GtkAction *action;
- g_return_val_if_fail (window != NULL, FALSE);
+ g_return_if_fail (window != NULL);
file_menu = fopen (priv-menu_file_name, w+);
@@ -2023,14 +2023,15 @@
}
fprintf (file_menu, /xfdesktop-menu\n);
+
+action = gtk_action_group_get_action (priv-action_group, save-menu);
+gtk_action_set_sensitive (action, FALSE);
+priv-menu_modified = FALSE;
+
fclose (file_menu);
+ } else {
+xfce_err (_(Unable to open the menu file %s in write mode),
priv-menu_file_name);
}
-
- action = gtk_action_group_get_action (priv-action_group, save-menu);
- gtk_action_set_sensitive (action, FALSE);
- priv-menu_modified = FALSE;
-
- return TRUE;
}
/* DnD */
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r22744 - xfcalendar/trunk/src
Author: juha
Date: 2006-08-13 14:27:01 + (Sun, 13 Aug 2006)
New Revision: 22744
Modified:
xfcalendar/trunk/src/main.c
xfcalendar/trunk/src/mainbox.c
xfcalendar/trunk/src/xfce_trayicon.c
Log:
fix for bug 2157:
own (default) timezone was read only after marking calendar with appointments,
so
it was possible to mark wrong days.
Modified: xfcalendar/trunk/src/main.c
===
--- xfcalendar/trunk/src/main.c 2006-08-13 10:39:46 UTC (rev 22743)
+++ xfcalendar/trunk/src/main.c 2006-08-13 14:27:01 UTC (rev 22744)
@@ -283,6 +283,8 @@
xfical_set_local_timezone(setting-data.v_string);
else
xfical_set_local_timezone(NULL);
+xfcalendar_mark_appointments();
+
}
}
break;
@@ -480,7 +482,7 @@
ensure_basedir_spec();
/* Test */
-set_default_ical_path();
+ set_default_ical_path();
/*
* Create the orage.
Modified: xfcalendar/trunk/src/mainbox.c
===
--- xfcalendar/trunk/src/mainbox.c 2006-08-13 10:39:46 UTC (rev 22743)
+++ xfcalendar/trunk/src/mainbox.c 2006-08-13 14:27:01 UTC (rev 22744)
@@ -509,6 +509,4 @@
if (pos_x || pos_y)
gtk_window_move(GTK_WINDOW(xfcal-mWindow), pos_x, pos_y);
gtk_window_stick(GTK_WINDOW(xfcal-mWindow));
-
-xfcalendar_mark_appointments();
}
Modified: xfcalendar/trunk/src/xfce_trayicon.c
===
--- xfcalendar/trunk/src/xfce_trayicon.c2006-08-13 10:39:46 UTC (rev
22743)
+++ xfcalendar/trunk/src/xfce_trayicon.c2006-08-13 14:27:01 UTC (rev
22744)
@@ -39,7 +39,7 @@
enum
{
CLICKED,/* user single-clicked the icon */
- DBL_CLICKED,/* user double-clicked the icon */
+ DBL_CLICKED,/* user double-clicked the icon */
LAST_SIGNAL
};
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r22745 - in xfcalendar/trunk: libical/src/libical libical/src/libicalss src
Author: juha
Date: 2006-08-13 15:32:21 + (Sun, 13 Aug 2006)
New Revision: 22745
Modified:
xfcalendar/trunk/libical/src/libical/icalcomponent.c
xfcalendar/trunk/libical/src/libicalss/icalmessage.c
xfcalendar/trunk/src/ical-code.c
Log:
fix for bug 1900:
More 64 bit 0/NULL usage issues.
Modified: xfcalendar/trunk/libical/src/libical/icalcomponent.c
===
--- xfcalendar/trunk/libical/src/libical/icalcomponent.c2006-08-13
14:27:01 UTC (rev 22744)
+++ xfcalendar/trunk/libical/src/libical/icalcomponent.c2006-08-13
15:32:21 UTC (rev 22745)
@@ -96,7 +96,7 @@
{
void* vp;
-while((vp = va_arg(args, void*)) != 0) {
+while((vp = va_arg(args, void*)) != NULL) {
assert (icalcomponent_isa_component(vp) != 0 ||
icalproperty_isa_property(vp) != 0 ) ;
@@ -155,8 +155,8 @@
icalcomponent *impl = icalcomponent_new_impl(kind);
-if (impl == 0){
- return 0;
+if (impl == NULL){
+ return NULL;
}
va_start(args,kind);
@@ -377,7 +377,7 @@
int
-icalcomponent_isa_component (void* component)
+icalcomponent_isa_component (icalcomponent* component)
{
icalcomponent *impl = component;
Modified: xfcalendar/trunk/libical/src/libicalss/icalmessage.c
===
--- xfcalendar/trunk/libical/src/libicalss/icalmessage.c2006-08-13
14:27:01 UTC (rev 22744)
+++ xfcalendar/trunk/libical/src/libicalss/icalmessage.c2006-08-13
15:32:21 UTC (rev 22745)
@@ -123,8 +123,8 @@
icalcomponent_vanew(
ICAL_VEVENT_COMPONENT,
icalproperty_new_dtstamp(icaltime_from_timet(time(0),0)),
- 0),
- 0);
+ NULL),
+ NULL);
icalcomponent *inner = icalmessage_get_inner(reply);
Modified: xfcalendar/trunk/src/ical-code.c
===
--- xfcalendar/trunk/src/ical-code.c2006-08-13 14:27:01 UTC (rev 22744)
+++ xfcalendar/trunk/src/ical-code.c2006-08-13 15:32:21 UTC (rev 22745)
@@ -629,7 +629,7 @@
*p_ical = icalcomponent_vanew(ICAL_VCALENDAR_COMPONENT
, icalproperty_new_version(2.0)
, icalproperty_new_prodid(-//Xfce//Orage//EN)
- , 0);
+ , NULL);
xfical_add_timezone(*p_ical, *p_fical,
local_icaltimezone_location);
icalset_add_component(*p_fical, *p_ical);
/*
@@ -1182,7 +1182,7 @@
ialarm = icalcomponent_vanew(ICAL_VALARM_COMPONENT
, icalproperty_new_action(ICAL_ACTION_DISPLAY)
, icalproperty_new_trigger(trg)
-, 0);
+, NULL);
if XFICAL_STR_EXISTS(appt-note)
icalcomponent_add_property(ialarm
, icalproperty_new_description(appt-note));
@@ -1198,7 +1198,7 @@
ialarm = icalcomponent_vanew(ICAL_VALARM_COMPONENT
, icalproperty_new_action(ICAL_ACTION_AUDIO)
, icalproperty_new_trigger(trg)
-, 0);
+, NULL);
attach = icalattach_new_from_url(appt-sound);
icalcomponent_add_property(ialarm
, icalproperty_new_attach(attach));
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r22746 - xfcalendar/trunk/libical/src/libical
Author: juha
Date: 2006-08-13 15:58:00 + (Sun, 13 Aug 2006)
New Revision: 22746
Modified:
xfcalendar/trunk/libical/src/libical/icalcomponent.c
Log:
fixing compatibility error in paramaters
Modified: xfcalendar/trunk/libical/src/libical/icalcomponent.c
===
--- xfcalendar/trunk/libical/src/libical/icalcomponent.c2006-08-13
15:32:21 UTC (rev 22745)
+++ xfcalendar/trunk/libical/src/libical/icalcomponent.c2006-08-13
15:58:00 UTC (rev 22746)
@@ -377,7 +377,7 @@
int
-icalcomponent_isa_component (icalcomponent* component)
+icalcomponent_isa_component (void* component)
{
icalcomponent *impl = component;
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
