[Xfce4-commits] r30250 - in libexo/trunk: exo exo-csource exo-desktop-item-edit exo-helper exo-mount exo-mount-notify exo-support python
Nick Schermer
nick at xfce.org
Fri Jul 10 18:56:34 CEST 2009
Author: nick
Date: 2009-07-10 16:56:33 +0000 (Fri, 10 Jul 2009)
New Revision: 30250
Modified:
libexo/trunk/exo-csource/main.c
libexo/trunk/exo-desktop-item-edit/exo-die-command-model.c
libexo/trunk/exo-desktop-item-edit/exo-die-desktop-model.c
libexo/trunk/exo-desktop-item-edit/main.c
libexo/trunk/exo-helper/Makefile.am
libexo/trunk/exo-helper/exo-helper-chooser.c
libexo/trunk/exo-helper/exo-helper-launcher-dialog.c
libexo/trunk/exo-helper/exo-helper-utils.c
libexo/trunk/exo-helper/exo-helper.c
libexo/trunk/exo-mount-notify/main.c
libexo/trunk/exo-mount/main.c
libexo/trunk/exo-support/xfce-heading.c
libexo/trunk/exo-support/xfce-titled-dialog.c
libexo/trunk/exo/Makefile.am
libexo/trunk/exo/exo-cell-renderer-icon.c
libexo/trunk/exo/exo-execute.c
libexo/trunk/exo/exo-gdk-pixbuf-extensions.c
libexo/trunk/exo/exo-icon-bar.c
libexo/trunk/exo/exo-icon-bar.h
libexo/trunk/exo/exo-icon-chooser-model.c
libexo/trunk/exo/exo-icon-view.c
libexo/trunk/exo/exo-simple-job.c
libexo/trunk/exo/exo-thumbnail-preview.c
libexo/trunk/exo/exo-toolbars-editor.c
libexo/trunk/exo/exo-toolbars-view.c
libexo/trunk/exo/exo-xsession-client.c
libexo/trunk/python/exomodule.c
libexo/trunk/python/pyexobinding.c
Log:
Fix a bunch of compiler warnings.
Modified: libexo/trunk/exo/Makefile.am
===================================================================
--- libexo/trunk/exo/Makefile.am 2009-07-10 15:21:04 UTC (rev 30249)
+++ libexo/trunk/exo/Makefile.am 2009-07-10 16:56:33 UTC (rev 30250)
@@ -193,7 +193,8 @@
&& echo timestamp > $(@F)
exo-marshal.c: exo-marshal.list Makefile
- ( cd $(srcdir) && glib-genmarshal \
+ echo "#include <exo/exo-marshal.h>" > xgen-emc \
+ && ( cd $(srcdir) && glib-genmarshal \
--prefix=_exo_marshal \
--body exo-marshal.list ) >> xgen-emc \
&& cp xgen-emc exo-marshal.c \
Modified: libexo/trunk/exo/exo-cell-renderer-icon.c
===================================================================
--- libexo/trunk/exo/exo-cell-renderer-icon.c 2009-07-10 15:21:04 UTC (rev 30249)
+++ libexo/trunk/exo/exo-cell-renderer-icon.c 2009-07-10 16:56:33 UTC (rev 30250)
@@ -291,7 +291,7 @@
g_free (priv->icon);
icon = g_value_get_string (value);
priv->icon_static = (value->data[1].v_uint & G_VALUE_NOCOPY_CONTENTS) ? TRUE : FALSE;
- priv->icon = (icon == NULL) ? "" : (gchar *) icon;
+ priv->icon = (gchar *) ((icon == NULL) ? "" : icon);
if (!priv->icon_static)
priv->icon = g_strdup (priv->icon);
break;
Modified: libexo/trunk/exo/exo-execute.c
===================================================================
--- libexo/trunk/exo/exo-execute.c 2009-07-10 15:21:04 UTC (rev 30249)
+++ libexo/trunk/exo/exo-execute.c 2009-07-10 16:56:33 UTC (rev 30250)
@@ -113,8 +113,8 @@
g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
/* generate the argument vector */
- argv[argc++] = LIBEXECDIR "/exo-helper-" LIBEXO_VERSION_API;
- argv[argc++] = "--launch";
+ argv[argc++] = (gchar *) LIBEXECDIR "/exo-helper-" LIBEXO_VERSION_API;
+ argv[argc++] = (gchar *) "--launch";
argv[argc++] = (gchar *) category;
/* append parameter if given */
Modified: libexo/trunk/exo/exo-gdk-pixbuf-extensions.c
===================================================================
--- libexo/trunk/exo/exo-gdk-pixbuf-extensions.c 2009-07-10 15:21:04 UTC (rev 30249)
+++ libexo/trunk/exo/exo-gdk-pixbuf-extensions.c 2009-07-10 16:56:33 UTC (rev 30250)
@@ -354,7 +354,7 @@
gint i, j;
g_return_val_if_fail (GDK_IS_PIXBUF (src), NULL);
- g_return_val_if_fail (percent >= 0 && percent <= 100, NULL);
+ g_return_val_if_fail ((gint) percent >= 0 && percent <= 100, NULL);
/* determine source parameters */
width = gdk_pixbuf_get_width (src);
Modified: libexo/trunk/exo/exo-icon-bar.c
===================================================================
--- libexo/trunk/exo/exo-icon-bar.c 2009-07-10 15:21:04 UTC (rev 30249)
+++ libexo/trunk/exo/exo-icon-bar.c 2009-07-10 16:56:33 UTC (rev 30250)
@@ -1303,10 +1303,10 @@
ExoIconBar *icon_bar)
{
ExoIconBarItem *item;
- gint index;
+ gint idx;
- index = gtk_tree_path_get_indices (path)[0];
- item = g_list_nth (icon_bar->priv->items, index)->data;
+ idx = gtk_tree_path_get_indices (path)[0];
+ item = g_list_nth (icon_bar->priv->items, idx)->data;
exo_icon_bar_item_invalidate (item);
gtk_widget_queue_resize (GTK_WIDGET (icon_bar));
}
@@ -1321,18 +1321,18 @@
{
ExoIconBarItem *item;
GList *lp;
- gint index;
+ gint idx;
- index = gtk_tree_path_get_indices (path)[0];
+ idx = gtk_tree_path_get_indices (path)[0];
item = exo_icon_bar_item_new ();
if ((gtk_tree_model_get_flags (icon_bar->priv->model) & GTK_TREE_MODEL_ITERS_PERSIST) != 0)
item->iter = *iter;
- item->index = index;
+ item->index = idx;
- icon_bar->priv->items = g_list_insert (icon_bar->priv->items, item, index);
+ icon_bar->priv->items = g_list_insert (icon_bar->priv->items, item, idx);
- for (lp = g_list_nth (icon_bar->priv->items, index + 1); lp != NULL; lp = lp->next)
+ for (lp = g_list_nth (icon_bar->priv->items, idx + 1); lp != NULL; lp = lp->next)
{
item = lp->data;
item->index++;
@@ -1353,10 +1353,10 @@
gboolean active = FALSE;
GList *lnext;
GList *lp;
- gint index;
+ gint idx;
- index = gtk_tree_path_get_indices (path)[0];
- lp = g_list_nth (icon_bar->priv->items, index);
+ idx = gtk_tree_path_get_indices (path)[0];
+ lp = g_list_nth (icon_bar->priv->items, idx);
item = lp->data;
if (item == icon_bar->priv->active_item)
@@ -1766,17 +1766,17 @@
**/
void
exo_icon_bar_set_active (ExoIconBar *icon_bar,
- gint index)
+ gint idx)
{
g_return_if_fail (EXO_IS_ICON_BAR (icon_bar));
- g_return_if_fail (index == -1 || g_list_nth (icon_bar->priv->items, index) != NULL);
+ g_return_if_fail (idx == -1 || g_list_nth (icon_bar->priv->items, idx) != NULL);
- if ((icon_bar->priv->active_item == NULL && index == -1)
- || (icon_bar->priv->active_item != NULL && index == icon_bar->priv->active_item->index))
+ if ((icon_bar->priv->active_item == NULL && idx == -1)
+ || (icon_bar->priv->active_item != NULL && idx == icon_bar->priv->active_item->index))
return;
- if (G_UNLIKELY (index >= 0))
- icon_bar->priv->active_item = g_list_nth (icon_bar->priv->items, index)->data;
+ if (G_UNLIKELY (idx >= 0))
+ icon_bar->priv->active_item = g_list_nth (icon_bar->priv->items, idx)->data;
else
icon_bar->priv->active_item = NULL;
Modified: libexo/trunk/exo/exo-icon-bar.h
===================================================================
--- libexo/trunk/exo/exo-icon-bar.h 2009-07-10 15:21:04 UTC (rev 30249)
+++ libexo/trunk/exo/exo-icon-bar.h 2009-07-10 16:56:33 UTC (rev 30250)
@@ -89,7 +89,7 @@
gint exo_icon_bar_get_active (ExoIconBar *icon_bar);
void exo_icon_bar_set_active (ExoIconBar *icon_bar,
- gint index);
+ gint idx);
gboolean exo_icon_bar_get_active_iter (ExoIconBar *icon_bar,
GtkTreeIter *iter);
Modified: libexo/trunk/exo/exo-icon-chooser-model.c
===================================================================
--- libexo/trunk/exo/exo-icon-chooser-model.c 2009-07-10 15:21:04 UTC (rev 30249)
+++ libexo/trunk/exo/exo-icon-chooser-model.c 2009-07-10 16:56:33 UTC (rev 30250)
@@ -47,7 +47,7 @@
static GtkTreeModelFlags exo_icon_chooser_model_get_flags (GtkTreeModel *tree_model);
static gint exo_icon_chooser_model_get_n_columns (GtkTreeModel *tree_model);
static GType exo_icon_chooser_model_get_column_type (GtkTreeModel *tree_model,
- gint index);
+ gint idx);
static gboolean exo_icon_chooser_model_get_iter (GtkTreeModel *tree_model,
GtkTreeIter *iter,
GtkTreePath *path);
@@ -225,9 +225,9 @@
static GType
exo_icon_chooser_model_get_column_type (GtkTreeModel *tree_model,
- gint index)
+ gint idx)
{
- switch (index)
+ switch (idx)
{
case EXO_ICON_CHOOSER_MODEL_COLUMN_CONTEXT:
return G_TYPE_UINT;
@@ -273,15 +273,15 @@
GtkTreeIter *iter)
{
ExoIconChooserModel *model = EXO_ICON_CHOOSER_MODEL (tree_model);
- gint index;
+ gint idx;
_exo_return_val_if_fail (EXO_IS_ICON_CHOOSER_MODEL (model), NULL);
_exo_return_val_if_fail (iter->stamp == model->stamp, NULL);
/* lookup the list item in the icon list */
- index = g_list_position (model->items, iter->user_data);
- if (G_LIKELY (index >= 0))
- return gtk_tree_path_new_from_indices (index, -1);
+ idx = g_list_position (model->items, iter->user_data);
+ if (G_LIKELY (idx >= 0))
+ return gtk_tree_path_new_from_indices (idx, -1);
return NULL;
}
Modified: libexo/trunk/exo/exo-icon-view.c
===================================================================
--- libexo/trunk/exo/exo-icon-view.c 2009-07-10 15:21:04 UTC (rev 30249)
+++ libexo/trunk/exo/exo-icon-view.c 2009-07-10 16:56:33 UTC (rev 30250)
@@ -306,31 +306,31 @@
GdkDragContext *context,
GtkSelectionData *selection_data,
guint info,
- guint time);
+ guint drag_time);
static void exo_icon_view_drag_data_delete (GtkWidget *widget,
GdkDragContext *context);
/* Target side drag signals */
static void exo_icon_view_drag_leave (GtkWidget *widget,
GdkDragContext *context,
- guint time);
+ guint drag_time);
static gboolean exo_icon_view_drag_motion (GtkWidget *widget,
GdkDragContext *context,
gint x,
gint y,
- guint time);
+ guint drag_time);
static gboolean exo_icon_view_drag_drop (GtkWidget *widget,
GdkDragContext *context,
gint x,
gint y,
- guint time);
+ guint drag_time);
static void exo_icon_view_drag_data_received (GtkWidget *widget,
GdkDragContext *context,
gint x,
gint y,
GtkSelectionData *selection_data,
guint info,
- guint time);
+ guint drag_time);
static gboolean exo_icon_view_maybe_begin_drag (ExoIconView *icon_view,
GdkEventMotion *event);
@@ -456,7 +456,7 @@
gint layout_idle_id;
gboolean doing_rubberband;
- gint rubberband_x1, rubberband_y1;
+ gint rubberband_x_1, rubberband_y_1;
gint rubberband_x2, rubberband_y2;
GdkGC *rubberband_border_gc;
GdkGC *rubberband_fill_gc;
@@ -1676,10 +1676,10 @@
if (G_UNLIKELY (priv->doing_rubberband))
{
/* calculate the rubberband area */
- rubber_rect.x = MIN (priv->rubberband_x1, priv->rubberband_x2);
- rubber_rect.y = MIN (priv->rubberband_y1, priv->rubberband_y2);
- rubber_rect.width = ABS (priv->rubberband_x1 - priv->rubberband_x2) + 1;
- rubber_rect.height = ABS (priv->rubberband_y1 - priv->rubberband_y2) + 1;
+ rubber_rect.x = MIN (priv->rubberband_x_1, priv->rubberband_x2);
+ rubber_rect.y = MIN (priv->rubberband_y_1, priv->rubberband_y2);
+ rubber_rect.width = ABS (priv->rubberband_x_1 - priv->rubberband_x2) + 1;
+ rubber_rect.height = ABS (priv->rubberband_y_1 - priv->rubberband_y2) + 1;
/* we take advantage of double-buffering here and use only a single
* draw_rectangle() operation w/o having to take care of clipping.
@@ -1827,7 +1827,7 @@
ExoIconView *icon_view = EXO_ICON_VIEW (widget);
GdkCursor *cursor;
gint size;
- gint abs;
+ gint abso;
exo_icon_view_maybe_begin_drag (icon_view, event);
@@ -1837,7 +1837,7 @@
if (icon_view->priv->layout_mode == EXO_ICON_VIEW_LAYOUT_ROWS)
{
- abs = event->y - icon_view->priv->height *
+ abso = event->y - icon_view->priv->height *
(icon_view->priv->vadjustment->value /
(icon_view->priv->vadjustment->upper -
icon_view->priv->vadjustment->lower));
@@ -1846,7 +1846,7 @@
}
else
{
- abs = event->x - icon_view->priv->width *
+ abso = event->x - icon_view->priv->width *
(icon_view->priv->hadjustment->value /
(icon_view->priv->hadjustment->upper -
icon_view->priv->hadjustment->lower));
@@ -1854,12 +1854,12 @@
size = widget->allocation.width;
}
- if (abs < 0 || abs > size)
+ if (abso < 0 || abso > size)
{
- if (abs < 0)
- icon_view->priv->scroll_value_diff = abs;
+ if (abso < 0)
+ icon_view->priv->scroll_value_diff = abso;
else
- icon_view->priv->scroll_value_diff = abs - size;
+ icon_view->priv->scroll_value_diff = abso - size;
icon_view->priv->event_last_x = event->x;
icon_view->priv->event_last_y = event->y;
@@ -2531,19 +2531,19 @@
x = MAX (x, 0);
y = MAX (y, 0);
- old_area.x = MIN (icon_view->priv->rubberband_x1,
+ old_area.x = MIN (icon_view->priv->rubberband_x_1,
icon_view->priv->rubberband_x2);
- old_area.y = MIN (icon_view->priv->rubberband_y1,
+ old_area.y = MIN (icon_view->priv->rubberband_y_1,
icon_view->priv->rubberband_y2);
old_area.width = ABS (icon_view->priv->rubberband_x2 -
- icon_view->priv->rubberband_x1) + 1;
+ icon_view->priv->rubberband_x_1) + 1;
old_area.height = ABS (icon_view->priv->rubberband_y2 -
- icon_view->priv->rubberband_y1) + 1;
+ icon_view->priv->rubberband_y_1) + 1;
- new_area.x = MIN (icon_view->priv->rubberband_x1, x);
- new_area.y = MIN (icon_view->priv->rubberband_y1, y);
- new_area.width = ABS (x - icon_view->priv->rubberband_x1) + 1;
- new_area.height = ABS (y - icon_view->priv->rubberband_y1) + 1;
+ new_area.x = MIN (icon_view->priv->rubberband_x_1, x);
+ new_area.y = MIN (icon_view->priv->rubberband_y_1, y);
+ new_area.width = ABS (x - icon_view->priv->rubberband_x_1) + 1;
+ new_area.height = ABS (y - icon_view->priv->rubberband_y_1) + 1;
invalid_region = gdk_region_rectangle (&old_area);
gdk_region_union_with_rect (invalid_region, &new_area);
@@ -2597,8 +2597,8 @@
item->selected_before_rubberbanding = item->selected;
}
- icon_view->priv->rubberband_x1 = x;
- icon_view->priv->rubberband_y1 = y;
+ icon_view->priv->rubberband_x_1 = x;
+ icon_view->priv->rubberband_y_1 = y;
icon_view->priv->rubberband_x2 = x;
icon_view->priv->rubberband_y2 = y;
@@ -2689,10 +2689,10 @@
gint height;
/* determine the new rubberband area */
- x = MIN (icon_view->priv->rubberband_x1, icon_view->priv->rubberband_x2);
- y = MIN (icon_view->priv->rubberband_y1, icon_view->priv->rubberband_y2);
- width = ABS (icon_view->priv->rubberband_x1 - icon_view->priv->rubberband_x2);
- height = ABS (icon_view->priv->rubberband_y1 - icon_view->priv->rubberband_y2);
+ x = MIN (icon_view->priv->rubberband_x_1, icon_view->priv->rubberband_x2);
+ y = MIN (icon_view->priv->rubberband_y_1, icon_view->priv->rubberband_y2);
+ width = ABS (icon_view->priv->rubberband_x_1 - icon_view->priv->rubberband_x2);
+ height = ABS (icon_view->priv->rubberband_y_1 - icon_view->priv->rubberband_y2);
/* check all items */
for (lp = icon_view->priv->items; lp != NULL; lp = lp->next)
@@ -3564,10 +3564,10 @@
gboolean rtl;
cairo_t *cr;
GList *lp;
- gint x0;
- gint y0;
- gint x1;
- gint y1;
+ gint x_0;
+ gint y_0;
+ gint x_1;
+ gint y_1;
if (G_UNLIKELY (icon_view->priv->model == NULL))
return;
@@ -3599,20 +3599,20 @@
{
exo_icon_view_get_cell_area (icon_view, item, info, &cell_area);
- x0 = x - item->area.x + cell_area.x;
- y0 = x - item->area.x + cell_area.y;
- x1 = x0 + cell_area.width;
- y1 = y0 + cell_area.height;
+ x_0 = x - item->area.x + cell_area.x;
+ y_0 = x - item->area.x + cell_area.y;
+ x_1 = x_0 + cell_area.width;
+ y_1 = y_0 + cell_area.height;
- cairo_move_to (cr, x0 + 5, y0);
- cairo_line_to (cr, x1 - 5, y0);
- cairo_curve_to (cr, x1 - 5, y0, x1, y0, x1, y0 + 5);
- cairo_line_to (cr, x1, y1 - 5);
- cairo_curve_to (cr, x1, y1 - 5, x1, y1, x1 - 5, y1);
- cairo_line_to (cr, x0 + 5, y1);
- cairo_curve_to (cr, x0 + 5, y1, x0, y1, x0, y1 - 5);
- cairo_line_to (cr, x0, y0 + 5);
- cairo_curve_to (cr, x0, y0 + 5, x0, y0, x0 + 5, y0);
+ cairo_move_to (cr, x_0 + 5, y_0);
+ cairo_line_to (cr, x_1 - 5, y_0);
+ cairo_curve_to (cr, x_1 - 5, y_0, x_1, y_0, x_1, y_0 + 5);
+ cairo_line_to (cr, x_1, y_1 - 5);
+ cairo_curve_to (cr, x_1, y_1 - 5, x_1, y_1, x_1 - 5, y_1);
+ cairo_line_to (cr, x_0 + 5, y_1);
+ cairo_curve_to (cr, x_0 + 5, y_1, x_0, y_1, x_0, y_1 - 5);
+ cairo_line_to (cr, x_0, y_0 + 5);
+ cairo_curve_to (cr, x_0, y_0 + 5, x_0, y_0, x_0 + 5, y_0);
gdk_cairo_set_source_color (cr, >K_WIDGET (icon_view)->style->base[state]);
@@ -3888,15 +3888,15 @@
ExoIconView *icon_view)
{
ExoIconViewItem *item;
- gint index;
+ gint idx;
- index = gtk_tree_path_get_indices (path)[0];
+ idx = gtk_tree_path_get_indices (path)[0];
/* allocate the new item */
item = _exo_slice_new0 (ExoIconViewItem);
item->iter = *iter;
item->area.width = -1;
- icon_view->priv->items = g_list_insert (icon_view->priv->items, item, index);
+ icon_view->priv->items = g_list_insert (icon_view->priv->items, item, idx);
/* recalculate the layout */
exo_icon_view_queue_layout (icon_view);
@@ -6577,7 +6577,7 @@
static gboolean
check_model_dnd (GtkTreeModel *model,
GType required_iface,
- const gchar *signal)
+ const gchar *_signal)
{
if (model == NULL || !G_TYPE_CHECK_INSTANCE_TYPE ((model), required_iface))
{
@@ -6591,7 +6591,7 @@
"your handler should do. (gtkiconview.c is in the GTK+ source "
"code.) If you're using GTK+ from a language other than C, "
"there may be a more natural way to override default handlers, e.g. via derivation.",
- signal, g_type_name (required_iface), signal);
+ _signal, g_type_name (required_iface), _signal);
return FALSE;
}
else
@@ -6933,7 +6933,7 @@
GdkDragContext *context,
GtkSelectionData *selection_data,
guint info,
- guint time)
+ guint drag_time)
{
ExoIconView *icon_view;
GtkTreeModel *model;
@@ -7008,7 +7008,7 @@
static void
exo_icon_view_drag_leave (GtkWidget *widget,
GdkDragContext *context,
- guint time)
+ guint drag_time)
{
ExoIconView *icon_view;
@@ -7027,7 +7027,7 @@
GdkDragContext *context,
gint x,
gint y,
- guint time)
+ guint drag_time)
{
ExoIconViewDropPosition pos;
GdkDragAction suggested_action = 0;
@@ -7047,7 +7047,7 @@
if (path == NULL && !empty)
{
/* Can't drop here. */
- gdk_drag_status (context, 0, time);
+ gdk_drag_status (context, 0, drag_time);
}
else
{
@@ -7060,12 +7060,12 @@
* determining whether to accept the drop
*/
set_status_pending (context, suggested_action);
- gtk_drag_get_data (widget, context, target, time);
+ gtk_drag_get_data (widget, context, target, drag_time);
}
else
{
set_status_pending (context, 0);
- gdk_drag_status (context, suggested_action, time);
+ gdk_drag_status (context, suggested_action, drag_time);
}
}
@@ -7080,7 +7080,7 @@
GdkDragContext *context,
gint x,
gint y,
- guint time)
+ guint drag_time)
{
ExoIconView *icon_view;
GtkTreePath *path;
@@ -7123,7 +7123,7 @@
if (target != GDK_NONE)
{
- gtk_drag_get_data (widget, context, target, time);
+ gtk_drag_get_data (widget, context, target, drag_time);
return TRUE;
}
else
@@ -7137,7 +7137,7 @@
gint y,
GtkSelectionData *selection_data,
guint info,
- guint time)
+ guint drag_time)
{
GtkTreePath *path;
gboolean accepted = FALSE;
@@ -7178,7 +7178,7 @@
suggested_action = 0;
}
- gdk_drag_status (context, suggested_action, time);
+ gdk_drag_status (context, suggested_action, drag_time);
if (path)
gtk_tree_path_free (path);
@@ -7208,7 +7208,7 @@
gtk_drag_finish (context,
accepted,
(context->action == GDK_ACTION_MOVE),
- time);
+ drag_time);
gtk_tree_path_free (dest_row);
@@ -7525,7 +7525,7 @@
GdkPixmap *drawable;
GdkGC *gc;
GList *lp;
- gint index;
+ gint idx;
g_return_val_if_fail (EXO_IS_ICON_VIEW (icon_view), NULL);
g_return_val_if_fail (gtk_tree_path_get_depth (path) > 0, NULL);
@@ -7534,12 +7534,12 @@
if (G_UNLIKELY (!GTK_WIDGET_REALIZED (icon_view)))
return NULL;
- index = gtk_tree_path_get_indices (path)[0];
+ idx = gtk_tree_path_get_indices (path)[0];
for (lp = icon_view->priv->items; lp != NULL; lp = lp->next)
{
ExoIconViewItem *item = lp->data;
- if (G_UNLIKELY (index == g_list_index (icon_view->priv->items, item)))
+ if (G_UNLIKELY (idx == g_list_index (icon_view->priv->items, item)))
{
drawable = gdk_pixmap_new (icon_view->priv->bin_window,
item->area.width + 2,
@@ -7616,7 +7616,7 @@
{
static const GtkTargetEntry item_targets[] =
{
- { "GTK_TREE_MODEL_ROW", GTK_TARGET_SAME_WIDGET, 0, },
+ { (gchar *) "GTK_TREE_MODEL_ROW", GTK_TARGET_SAME_WIDGET, 0, },
};
g_return_if_fail (EXO_IS_ICON_VIEW (icon_view));
Modified: libexo/trunk/exo/exo-simple-job.c
===================================================================
--- libexo/trunk/exo/exo-simple-job.c 2009-07-10 15:21:04 UTC (rev 30249)
+++ libexo/trunk/exo/exo-simple-job.c 2009-07-10 16:56:33 UTC (rev 30250)
@@ -186,7 +186,7 @@
va_list var_args;
GValue value = { 0, };
gchar *error_message;
- gint n;
+ guint n;
/* allocate and initialize the simple job */
simple_job = g_object_new (EXO_TYPE_SIMPLE_JOB, NULL);
Modified: libexo/trunk/exo/exo-thumbnail-preview.c
===================================================================
--- libexo/trunk/exo/exo-thumbnail-preview.c 2009-07-10 15:21:04 UTC (rev 30249)
+++ libexo/trunk/exo/exo-thumbnail-preview.c 2009-07-10 16:56:33 UTC (rev 30250)
@@ -266,7 +266,7 @@
GdkPixbuf *thumbnail;
gchar *icon_name = NULL;
gchar *size_name = NULL;
- gchar *basename;
+ gchar *displayname;
gchar *filename;
gchar *slash;
@@ -332,16 +332,16 @@
}
/* determine the basename from the filename */
- basename = g_filename_display_basename (filename);
+ displayname = g_filename_display_basename (filename);
}
else
{
/* determine the basename from the URI */
slash = strrchr (uri, '/');
if (G_LIKELY (slash != NULL && slash[1] != '\0'))
- basename = g_filename_display_name (slash + 1);
+ displayname = g_filename_display_name (slash + 1);
else
- basename = g_filename_display_name (uri);
+ displayname = g_filename_display_name (uri);
}
/* check if we have an icon-name */
@@ -378,10 +378,10 @@
}
/* setup the name label */
- gtk_label_set_text (GTK_LABEL (thumbnail_preview->name_label), basename);
+ gtk_label_set_text (GTK_LABEL (thumbnail_preview->name_label), displayname);
/* cleanup */
- g_free (basename);
+ g_free (displayname);
g_free (filename);
}
Modified: libexo/trunk/exo/exo-toolbars-editor.c
===================================================================
--- libexo/trunk/exo/exo-toolbars-editor.c 2009-07-10 15:21:04 UTC (rev 30249)
+++ libexo/trunk/exo/exo-toolbars-editor.c 2009-07-10 16:56:33 UTC (rev 30250)
@@ -71,7 +71,7 @@
GdkDragContext *context,
GtkSelectionData *selection_data,
guint info,
- guint32 time,
+ guint32 drag_time,
ExoToolbarsEditor *editor);
static GtkWidget *exo_toolbars_editor_create_item (ExoToolbarsEditor *editor,
GtkWidget *image,
@@ -97,7 +97,7 @@
static const GtkTargetEntry targets[] =
{
- { EXO_TOOLBARS_ITEM_TYPE, GTK_TARGET_SAME_APP, 0 },
+ { (gchar *) EXO_TOOLBARS_ITEM_TYPE, GTK_TARGET_SAME_APP, 0 },
};
@@ -311,7 +311,7 @@
GdkDragContext *context,
GtkSelectionData *selection_data,
guint info,
- guint32 time,
+ guint32 drag_time,
ExoToolbarsEditor *editor)
{
const gchar *target;
Modified: libexo/trunk/exo/exo-toolbars-view.c
===================================================================
--- libexo/trunk/exo/exo-toolbars-view.c 2009-07-10 15:21:04 UTC (rev 30249)
+++ libexo/trunk/exo/exo-toolbars-view.c 2009-07-10 16:56:33 UTC (rev 30250)
@@ -92,7 +92,7 @@
GdkDragContext *context,
GtkSelectionData *selection_data,
guint info,
- guint32 time,
+ guint32 drag_time,
ExoToolbarsView *view);
static GtkWidget *exo_toolbars_view_create_item_from_action (ExoToolbarsView *view,
const gchar *action_name,
@@ -110,7 +110,7 @@
gint y,
GtkSelectionData *selection_data,
guint info,
- guint time,
+ guint drag_time,
ExoToolbarsView *view);
static void exo_toolbars_view_context_menu (GtkWidget *toolbar,
gint x,
@@ -122,17 +122,17 @@
GdkDragContext *context,
gint x,
gint y,
- guint time,
+ guint drag_time,
ExoToolbarsView *view);
static gboolean exo_toolbars_view_drag_motion (GtkWidget *toolbar,
GdkDragContext *context,
gint x,
gint y,
- guint time,
+ guint drag_time,
ExoToolbarsView *view);
static void exo_toolbars_view_drag_leave (GtkWidget *toolbar,
GdkDragContext *context,
- guint time,
+ guint drag_time,
ExoToolbarsView *view);
static GtkWidget *exo_toolbars_view_create_dock (ExoToolbarsView *view);
static void exo_toolbars_view_toolbar_added (ExoToolbarsModel *model,
@@ -174,7 +174,7 @@
static const GtkTargetEntry dst_targets[] =
{
- { EXO_TOOLBARS_ITEM_TYPE, GTK_TARGET_SAME_APP, 0 },
+ { (gchar *) EXO_TOOLBARS_ITEM_TYPE, GTK_TARGET_SAME_APP, 0 },
};
static GObjectClass *exo_toolbars_view_parent_class;
@@ -480,7 +480,7 @@
GdkDragContext *context,
GtkSelectionData *selection_data,
guint info,
- guint32 time,
+ guint32 drag_time,
ExoToolbarsView *view)
{
const gchar *type;
@@ -643,7 +643,7 @@
gint y,
GtkSelectionData *selection_data,
guint info,
- guint time,
+ guint drag_time,
ExoToolbarsView *view)
{
GdkAtom target;
@@ -682,7 +682,7 @@
else
exo_toolbars_model_add_item (view->priv->model, toolbar_position, item_position, id, type);
- gtk_drag_finish (context, TRUE, context->action == GDK_ACTION_MOVE, time);
+ gtk_drag_finish (context, TRUE, context->action == GDK_ACTION_MOVE, drag_time);
}
g_free (type);
@@ -741,7 +741,7 @@
ExoToolbarsView *view)
{
ExoToolbarsModelFlags flags;
- GtkToolbarStyle style = -1;
+ gint style = -1;
GtkWidget *submenu;
GtkWidget *menu;
GtkWidget *item;
@@ -856,7 +856,7 @@
GdkDragContext *context,
gint x,
gint y,
- guint time,
+ guint drag_time,
ExoToolbarsView *view)
{
GdkAtom target;
@@ -864,7 +864,7 @@
target = gtk_drag_dest_find_target (widget, context, NULL);
if (G_LIKELY (target != GDK_NONE))
{
- gtk_drag_get_data (widget, context, target, time);
+ gtk_drag_get_data (widget, context, target, drag_time);
return TRUE;
}
@@ -880,7 +880,7 @@
GdkDragContext *context,
gint x,
gint y,
- guint time,
+ guint drag_time,
ExoToolbarsView *view)
{
ExoToolbarsModelFlags flags;
@@ -888,7 +888,7 @@
gboolean is_item;
GdkAtom target;
gint toolbar_position;
- gint index;
+ gint idx;
source = gtk_drag_get_source_widget (context);
if (G_LIKELY (source != NULL))
@@ -902,7 +902,7 @@
if ((flags & EXO_TOOLBARS_MODEL_ACCEPT_ITEMS_ONLY) != 0 && !is_item)
{
- gdk_drag_status (context, 0, time);
+ gdk_drag_status (context, 0, drag_time);
return FALSE;
}
@@ -913,7 +913,7 @@
target = gtk_drag_dest_find_target (toolbar, context, NULL);
if (G_UNLIKELY (target == GDK_NONE))
{
- gdk_drag_status (context, 0, time);
+ gdk_drag_status (context, 0, drag_time);
return FALSE;
}
@@ -929,18 +929,18 @@
view->priv->target_toolbar = toolbar;
view->priv->pending = TRUE;
- gtk_drag_get_data (toolbar, context, target, time);
+ gtk_drag_get_data (toolbar, context, target, drag_time);
}
if (view->priv->dragged_item != NULL && view->priv->editing)
{
- index = gtk_toolbar_get_drop_index (GTK_TOOLBAR (toolbar), x, y);
+ idx = gtk_toolbar_get_drop_index (GTK_TOOLBAR (toolbar), x, y);
gtk_toolbar_set_drop_highlight_item (GTK_TOOLBAR (toolbar),
GTK_TOOL_ITEM (view->priv->dragged_item),
- index);
+ idx);
}
- gdk_drag_status (context, context->suggested_action, time);
+ gdk_drag_status (context, context->suggested_action, drag_time);
return TRUE;
}
@@ -950,7 +950,7 @@
static void
exo_toolbars_view_drag_leave (GtkWidget *toolbar,
GdkDragContext *context,
- guint time,
+ guint drag_time,
ExoToolbarsView *view)
{
if (view->priv->target_toolbar == toolbar)
Modified: libexo/trunk/exo/exo-xsession-client.c
===================================================================
--- libexo/trunk/exo/exo-xsession-client.c 2009-07-10 15:21:04 UTC (rev 30249)
+++ libexo/trunk/exo/exo-xsession-client.c 2009-07-10 16:56:33 UTC (rev 30250)
@@ -332,7 +332,7 @@
GdkWindow *leader)
{
#ifdef GDK_WINDOWING_X11
- static char *atom_names[2] = { "WM_PROTOCOLS", "WM_SAVE_YOURSELF" };
+ const char *atom_names[2] = { "WM_PROTOCOLS", "WM_SAVE_YOURSELF" };
Atom atoms[2];
Atom *protocols;
Atom *protocols_custom;
@@ -376,7 +376,7 @@
if (leader != NULL)
{
- XInternAtoms (GDK_DRAWABLE_XDISPLAY (leader), atom_names, 2, False, atoms);
+ XInternAtoms (GDK_DRAWABLE_XDISPLAY (leader), (char **) atom_names, 2, False, atoms);
client->priv->wm_protocols = atoms[0];
client->priv->wm_save_yourself = atoms[1];
Modified: libexo/trunk/exo-csource/main.c
===================================================================
--- libexo/trunk/exo-csource/main.c 2009-07-10 15:21:04 UTC (rev 30249)
+++ libexo/trunk/exo-csource/main.c 2009-07-10 16:56:33 UTC (rev 30250)
@@ -59,11 +59,11 @@
/* --- variables --- */
-static gboolean gen_buildlist = FALSE;
-static gboolean gen_stripcomments = FALSE;
-static gboolean gen_stripcontent = FALSE;
-static gchar *gen_linkage = "static ";
-static gchar *gen_varname = "my_data";
+static gboolean gen_buildlist = FALSE;
+static gboolean gen_stripcomments = FALSE;
+static gboolean gen_stripcontent = FALSE;
+static const gchar *gen_linkage = "static ";
+static const gchar *gen_varname = "my_data";
Modified: libexo/trunk/exo-desktop-item-edit/exo-die-command-model.c
===================================================================
--- libexo/trunk/exo-desktop-item-edit/exo-die-command-model.c 2009-07-10 15:21:04 UTC (rev 30249)
+++ libexo/trunk/exo-desktop-item-edit/exo-die-command-model.c 2009-07-10 16:56:33 UTC (rev 30250)
@@ -278,17 +278,17 @@
GtkTreeIter *iter)
{
ExoDieCommandModel *command_model = EXO_DIE_COMMAND_MODEL (tree_model);
- gint index;
+ gint idx;
g_return_val_if_fail (EXO_DIE_IS_COMMAND_MODEL (command_model), NULL);
g_return_val_if_fail (iter->stamp == command_model->stamp, NULL);
/* determine the index of the iter */
- index = g_slist_position (command_model->items, iter->user_data);
- if (G_UNLIKELY (index < 0))
+ idx = g_slist_position (command_model->items, iter->user_data);
+ if (G_UNLIKELY (idx < 0))
return NULL;
- return gtk_tree_path_new_from_indices (index, -1);
+ return gtk_tree_path_new_from_indices (idx, -1);
}
Modified: libexo/trunk/exo-desktop-item-edit/exo-die-desktop-model.c
===================================================================
--- libexo/trunk/exo-desktop-item-edit/exo-die-desktop-model.c 2009-07-10 15:21:04 UTC (rev 30249)
+++ libexo/trunk/exo-desktop-item-edit/exo-die-desktop-model.c 2009-07-10 16:56:33 UTC (rev 30250)
@@ -288,17 +288,17 @@
GtkTreeIter *iter)
{
ExoDieDesktopModel *desktop_model = EXO_DIE_DESKTOP_MODEL (tree_model);
- gint index;
+ gint idx;
g_return_val_if_fail (EXO_DIE_IS_DESKTOP_MODEL (desktop_model), NULL);
g_return_val_if_fail (iter->stamp == desktop_model->stamp, NULL);
/* determine the index of the iter */
- index = g_slist_position (desktop_model->items, iter->user_data);
- if (G_UNLIKELY (index < 0))
+ idx = g_slist_position (desktop_model->items, iter->user_data);
+ if (G_UNLIKELY (idx < 0))
return NULL;
- return gtk_tree_path_new_from_indices (index, -1);
+ return gtk_tree_path_new_from_indices (idx, -1);
}
Modified: libexo/trunk/exo-desktop-item-edit/main.c
===================================================================
--- libexo/trunk/exo-desktop-item-edit/main.c 2009-07-10 15:21:04 UTC (rev 30249)
+++ libexo/trunk/exo-desktop-item-edit/main.c 2009-07-10 16:56:33 UTC (rev 30250)
@@ -44,8 +44,11 @@
#include <gdk/gdkx.h>
#endif
+/* string with fallback spoort */
+#define STR_FB(string,fallback) ((string != NULL && *string != '\0') ? string : fallback)
+
/* --- constants --- */
static const gchar *CREATE_TITLES[] = { N_ ("Create Launcher"), N_ ("Create Link") };
static const gchar *EDIT_TITLES[] = { N_ ("Edit Launcher"), N_ ("Edit Link") };
@@ -56,12 +59,12 @@
/* --- globals --- */
static gboolean opt_create_new = FALSE;
static gboolean opt_version = FALSE;
-static gchar *opt_type = "Application";
-static gchar *opt_name = "";
-static gchar *opt_comment = "";
-static gchar *opt_command = "";
-static gchar *opt_url = "";
-static gchar *opt_icon = "";
+static gchar *opt_type = NULL;
+static gchar *opt_name = NULL;
+static gchar *opt_comment = NULL;
+static gchar *opt_command = NULL;
+static gchar *opt_url = NULL;
+static gchar *opt_icon = NULL;
static gint opt_xid = 0;
@@ -100,7 +103,7 @@
GKeyFile *key_file;
GError *error = NULL;
gchar *filename;
- gchar *basename;
+ gchar *currentname;
gchar *dirname;
gchar *value;
gchar *s;
@@ -122,7 +125,7 @@
g_thread_init (NULL);
/* initialize Gtk+ */
- if (!gtk_init_with_args (&argc, &argv, _("[FILE|FOLDER]"), option_entries, GETTEXT_PACKAGE, &error))
+ if (!gtk_init_with_args (&argc, &argv, _("[FILE|FOLDER]"), option_entries, (gchar *)GETTEXT_PACKAGE, &error))
{
/* determine the error message */
if (G_UNLIKELY (error != NULL))
@@ -135,7 +138,7 @@
{
/* no error message, the GUI initialization failed */
const gchar *display_name = gdk_get_display_arg_name ();
- s = g_strdup_printf ("%s: %s", _("Failed to open display"), (display_name != NULL) ? display_name : " ");
+ s = g_strdup_printf ("%s: %s", _("Failed to open display"), STR_FB (display_name, " "));
}
/* tell the user about it */
@@ -178,21 +181,21 @@
/* generic stuff */
g_key_file_set_value (key_file, "Desktop Entry", "Version", "1.0");
g_key_file_set_value (key_file, "Desktop Entry", "Encoding", "UTF-8");
- g_key_file_set_value (key_file, "Desktop Entry", "Type", opt_type);
- g_key_file_set_value (key_file, "Desktop Entry", "Name", opt_name);
- g_key_file_set_value (key_file, "Desktop Entry", "Comment", opt_comment);
+ g_key_file_set_value (key_file, "Desktop Entry", "Type", STR_FB (opt_type, "Application"));
+ g_key_file_set_value (key_file, "Desktop Entry", "Name", STR_FB (opt_name, ""));
+ g_key_file_set_value (key_file, "Desktop Entry", "Comment", STR_FB (opt_comment, ""));
/* type specific stuff */
if (exo_str_is_equal (opt_type, "Link"))
{
- g_key_file_set_value (key_file, "Desktop Entry", "Icon", (*opt_icon != '\0') ? opt_icon : "gnome-fs-bookmark");
- g_key_file_set_value (key_file, "Desktop Entry", "URL", opt_url);
+ g_key_file_set_value (key_file, "Desktop Entry", "Icon", STR_FB (opt_icon, "gnome-fs-bookmark"));
+ g_key_file_set_value (key_file, "Desktop Entry", "URL", STR_FB (opt_url, ""));
}
else
{
g_key_file_set_value (key_file, "Desktop Entry", "Categories", "Application;");
- g_key_file_set_value (key_file, "Desktop Entry", "Exec", opt_command);
- g_key_file_set_value (key_file, "Desktop Entry", "Icon", opt_icon);
+ g_key_file_set_value (key_file, "Desktop Entry", "Exec", STR_FB (opt_command, ""));
+ g_key_file_set_value (key_file, "Desktop Entry", "Icon", STR_FB (opt_icon, ""));
}
}
else
@@ -383,10 +386,10 @@
else if (g_path_is_absolute (filename))
{
dirname = g_path_get_dirname (filename);
- basename = g_path_get_basename (filename);
+ currentname = g_path_get_basename (filename);
gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (chooser), dirname);
- gtk_file_chooser_set_current_name (GTK_FILE_CHOOSER (chooser), basename);
- g_free (basename);
+ gtk_file_chooser_set_current_name (GTK_FILE_CHOOSER (chooser), currentname);
+ g_free (currentname);
g_free (dirname);
}
Modified: libexo/trunk/exo-helper/Makefile.am
===================================================================
--- libexo/trunk/exo-helper/Makefile.am 2009-07-10 15:21:04 UTC (rev 30249)
+++ libexo/trunk/exo-helper/Makefile.am 2009-07-10 16:56:33 UTC (rev 30250)
@@ -98,7 +98,7 @@
exo-helper-enum-types.c: $(exo_helper_headers) Makefile
( cd $(srcdir) && glib-mkenums \
- --fhead "#undef GTK_DISABLE_DEPRECATED\n#define GTK_ENABLE_BROKEN\n#include <exo-helper/exo-helper.h>\n" \
+ --fhead "#undef GTK_DISABLE_DEPRECATED\n#define GTK_ENABLE_BROKEN\n#include <exo-helper/exo-helper.h>\n\n#include \"exo-helper-enum-types.h\"" \
--fprod "\n/* enumerations from \"@filename@\" */" \
--vhead "GType\n at enum_name@_get_type (void)\n{\n\tstatic GType type = 0;\n\tif (type == 0) {\n\tstatic const G at Type@Value values[] = {"\
--vprod "\t{ @VALUENAME@, \"@VALUENAME@\", \"@valuenick@\" }," \
Modified: libexo/trunk/exo-helper/exo-helper-chooser.c
===================================================================
--- libexo/trunk/exo-helper/exo-helper-chooser.c 2009-07-10 15:21:04 UTC (rev 30249)
+++ libexo/trunk/exo-helper/exo-helper-chooser.c 2009-07-10 16:56:33 UTC (rev 30250)
@@ -833,7 +833,7 @@
GtkWidget*
exo_helper_chooser_new (ExoHelperCategory category)
{
- g_return_val_if_fail (category >= 0 && category < EXO_HELPER_N_CATEGORIES, NULL);
+ g_return_val_if_fail (category < EXO_HELPER_N_CATEGORIES, NULL);
return g_object_new (EXO_TYPE_HELPER_CHOOSER, "category", category, NULL);
}
@@ -869,7 +869,7 @@
ExoHelperCategory category)
{
g_return_if_fail (EXO_IS_HELPER_CHOOSER (chooser));
- g_return_if_fail (category >= 0 && category < EXO_HELPER_N_CATEGORIES);
+ g_return_if_fail (category < EXO_HELPER_N_CATEGORIES);
/* apply the new category */
chooser->category = category;
Modified: libexo/trunk/exo-helper/exo-helper-launcher-dialog.c
===================================================================
--- libexo/trunk/exo-helper/exo-helper-launcher-dialog.c 2009-07-10 15:21:04 UTC (rev 30249)
+++ libexo/trunk/exo-helper/exo-helper-launcher-dialog.c 2009-07-10 16:56:33 UTC (rev 30250)
@@ -244,7 +244,7 @@
GtkWidget*
exo_helper_launcher_dialog_new (ExoHelperCategory category)
{
- g_return_val_if_fail (category >= 0 && category < EXO_HELPER_N_CATEGORIES, NULL);
+ g_return_val_if_fail (category < EXO_HELPER_N_CATEGORIES, NULL);
return g_object_new (EXO_TYPE_HELPER_LAUNCHER_DIALOG, "category", category, NULL);
}
@@ -293,7 +293,7 @@
g_assert (EXO_HELPER_N_CATEGORIES == G_N_ELEMENTS (MESSAGES));
g_return_if_fail (EXO_IS_HELPER_LAUNCHER_DIALOG (launcher_dialog));
- g_return_if_fail (category >= 0 && category < EXO_HELPER_N_CATEGORIES);
+ g_return_if_fail (category < EXO_HELPER_N_CATEGORIES);
/* setup the new label text */
gtk_label_set_text (GTK_LABEL (launcher_dialog->label), gettext (MESSAGES[category]));
Modified: libexo/trunk/exo-helper/exo-helper-utils.c
===================================================================
--- libexo/trunk/exo-helper/exo-helper-utils.c 2009-07-10 15:21:04 UTC (rev 30249)
+++ libexo/trunk/exo-helper/exo-helper-utils.c 2009-07-10 16:56:33 UTC (rev 30250)
@@ -81,7 +81,6 @@
gchar *string;
g_return_val_if_fail (category < EXO_HELPER_N_CATEGORIES, NULL);
- g_return_val_if_fail (category >= 0, NULL);
klass = g_type_class_ref (EXO_TYPE_HELPER_CATEGORY);
string = g_strdup (klass->values[category].value_nick);
Modified: libexo/trunk/exo-helper/exo-helper.c
===================================================================
--- libexo/trunk/exo-helper/exo-helper.c 2009-07-10 15:21:04 UTC (rev 30249)
+++ libexo/trunk/exo-helper/exo-helper.c 2009-07-10 16:56:33 UTC (rev 30250)
@@ -873,7 +873,7 @@
XfceRc *rc;
gchar **argv;
gchar *category_string;
- gchar *basename;
+ gchar *name;
gchar *cmdline;
gchar *file;
gchar spec[256];
@@ -910,10 +910,10 @@
if (g_shell_parse_argv (cmdline, NULL, &argv, NULL))
{
/* use the basename for Name and Icon */
- basename = g_path_get_basename (*argv);
- xfce_rc_write_entry (rc, "Icon", basename);
- xfce_rc_write_entry (rc, "Name", basename);
- g_free (basename);
+ name = g_path_get_basename (*argv);
+ xfce_rc_write_entry (rc, "Icon", name);
+ xfce_rc_write_entry (rc, "Name", name);
+ g_free (name);
/* use only the binary for the Commands */
xfce_rc_write_entry (rc, "X-XFCE-Commands", *argv);
Modified: libexo/trunk/exo-mount/main.c
===================================================================
--- libexo/trunk/exo-mount/main.c 2009-07-10 15:21:04 UTC (rev 30249)
+++ libexo/trunk/exo-mount/main.c 2009-07-10 16:56:33 UTC (rev 30250)
@@ -98,7 +98,7 @@
xfce_textdomain (GETTEXT_PACKAGE, PACKAGE_LOCALE_DIR, "UTF-8");
/* initialize GTK+ */
- if (!gtk_init_with_args (&argc, &argv, "Xfce mount", entries, GETTEXT_PACKAGE, &err))
+ if (!gtk_init_with_args (&argc, &argv, (gchar *) "Xfce mount", entries, (gchar *) GETTEXT_PACKAGE, &err))
{
/* check if we have an error message */
if (G_LIKELY (err == NULL))
Modified: libexo/trunk/exo-mount-notify/main.c
===================================================================
--- libexo/trunk/exo-mount-notify/main.c 2009-07-10 15:21:04 UTC (rev 30249)
+++ libexo/trunk/exo-mount-notify/main.c 2009-07-10 16:56:33 UTC (rev 30250)
@@ -145,7 +145,7 @@
xfce_textdomain (GETTEXT_PACKAGE, PACKAGE_LOCALE_DIR, "UTF-8");
/* initialize GTK+ */
- if (!gtk_init_with_args (&argc, &argv, "Xfce Mount Notify", entries, GETTEXT_PACKAGE, &err))
+ if (!gtk_init_with_args (&argc, &argv, (gchar *) "Xfce Mount Notify", entries, (gchar *) GETTEXT_PACKAGE, &err))
{
/* check if we have an error message */
if (G_LIKELY (err == NULL))
@@ -180,7 +180,7 @@
/* icon defaults to "gnome-dev-harddisk" */
if (G_UNLIKELY (opt_icon == NULL || *opt_icon == '\0'))
- opt_icon = "gnome-dev-harddisk";
+ opt_icon = (gchar *) "gnome-dev-harddisk";
/* make sure that a device name was specified */
if (G_UNLIKELY (opt_name == NULL || *opt_name == '\0'))
Modified: libexo/trunk/exo-support/xfce-heading.c
===================================================================
--- libexo/trunk/exo-support/xfce-heading.c 2009-07-10 15:21:04 UTC (rev 30249)
+++ libexo/trunk/exo-support/xfce-heading.c 2009-07-10 16:56:33 UTC (rev 30250)
@@ -53,8 +53,6 @@
-static void xfce_heading_class_init (XfceHeadingClass *klass);
-static void xfce_heading_init (XfceHeading *heading);
static void xfce_heading_finalize (GObject *object);
static void xfce_heading_get_property (GObject *object,
guint prop_id,
Modified: libexo/trunk/exo-support/xfce-titled-dialog.c
===================================================================
--- libexo/trunk/exo-support/xfce-titled-dialog.c 2009-07-10 15:21:04 UTC (rev 30249)
+++ libexo/trunk/exo-support/xfce-titled-dialog.c 2009-07-10 16:56:33 UTC (rev 30250)
@@ -46,8 +46,6 @@
-static void xfce_titled_dialog_class_init (XfceTitledDialogClass *klass);
-static void xfce_titled_dialog_init (XfceTitledDialog *titled_dialog);
static void xfce_titled_dialog_finalize (GObject *object);
static void xfce_titled_dialog_get_property (GObject *object,
guint prop_id,
Modified: libexo/trunk/python/exomodule.c
===================================================================
--- libexo/trunk/python/exomodule.c 2009-07-10 15:21:04 UTC (rev 30249)
+++ libexo/trunk/python/exomodule.c 2009-07-10 16:56:33 UTC (rev 30250)
@@ -27,7 +27,7 @@
#include "pyexo.h"
-
+G_MODULE_EXPORT void init_exo (void);
/* mark internal symbols with G_GNUC_INTERNAL */
void exo_add_constants (PyObject *module,
const gchar *strip_prefix) G_GNUC_INTERNAL;
@@ -109,7 +109,7 @@
-DL_EXPORT(void)
+G_MODULE_EXPORT void
init_exo (void)
{
PyObject *d;
Modified: libexo/trunk/python/pyexobinding.c
===================================================================
--- libexo/trunk/python/pyexobinding.c 2009-07-10 15:21:04 UTC (rev 30249)
+++ libexo/trunk/python/pyexobinding.c 2009-07-10 16:56:33 UTC (rev 30250)
@@ -211,7 +211,7 @@
PyObject *kwargs)
{
- static gchar *kwlist[] = { "src_object", "src_property", "dst_object", "dst_property", "transform_func", NULL };
+ const gchar *kwlist[] = { "src_object", "src_property", "dst_object", "dst_property", "transform_func", NULL };
const gchar *src_property;
const gchar *dst_property;
PyObject *transform_func = Py_None;
@@ -222,7 +222,7 @@
gchar *message;
/* parse the constructor arguments */
- if (!PyArg_ParseTupleAndKeywords (args, kwargs, "OsOs|O:Binding.__init__", kwlist,
+ if (!PyArg_ParseTupleAndKeywords (args, kwargs, "OsOs|O:Binding.__init__", (gchar **) kwlist,
&src_object, &src_property, &dst_object, &dst_property,
&transform_func))
{
@@ -419,7 +419,7 @@
PyObject *args,
PyObject *kwargs)
{
- static gchar *kwlist[] = { "src_object", "src_property", "dst_object", "dst_property", "transform_func", "reverse_transform_func", NULL };
+ const gchar *kwlist[] = { "src_object", "src_property", "dst_object", "dst_property", "transform_func", "reverse_transform_func", NULL };
const gchar *src_property;
const gchar *dst_property;
PyObject *rtransform_func = Py_None;
@@ -431,7 +431,7 @@
gchar *message;
/* parse the constructor arguments */
- if (!PyArg_ParseTupleAndKeywords (args, kwargs, "OsOs|OO:MutualBinding.__init__", kwlist,
+ if (!PyArg_ParseTupleAndKeywords (args, kwargs, "OsOs|OO:MutualBinding.__init__", (gchar **) kwlist,
&src_object, &src_property, &dst_object, &dst_property,
&transform_func, &rtransform_func))
{
More information about the Xfce4-commits
mailing list