Commit 1919bc07df7be18414991f9bfb33dedac9b9fb20 - xapp

various: Fix some previously missed build warnings. Some of these could have resulted in crashes. Michael Webster 3 years ago

5 changed file(s) with 25 addition(s) and 15 deletion(s). Raw diff Collapse all Expand all

-3

libxapp/favorite-vfs-file-enumerator.c less more

44	44
45	45	while (priv->current_pos != NULL && info == NULL)
46	46	{
47		GFile *file;
48	47	gchar *uri;
49	48
50	49	uri = path_to_fav_uri ((const gchar *) priv->current_pos->data);

56	55	}
57	56	else
58	57	{
	58	GFile *file;
	59
59	60	file = g_file_new_for_uri (uri);
60
61	61	info = g_file_query_info (file,
62	62	priv->attributes,
63	63	priv->flags,
64	64	cancellable,
65	65	error);
	66
	67	g_object_unref (file);
66	68	}
67	69
68	70	g_free (uri);
69		g_object_unref (file);
70	71	}
71	72
72	73	if (priv->current_pos)

-2

libxapp/favorite-vfs-file.c less more

368	368	FavoriteVfsFilePrivate *priv = favorite_vfs_file_get_instance_private (FAVORITE_VFS_FILE (file));
369	369	GFileInfo *info;
370	370	GIcon *icon;
	371
	372	info = NULL;
371	373
372	374	if (priv->info != NULL)
373	375	{

526	528	g_file_attribute_matcher_unref (matcher);
527	529	}
528	530
529		return info;
	531	*error = g_error_new (G_IO_ERROR, G_IO_ERROR_FAILED, "Can't retrieve info for favorite file");
	532	return info; // NULL
530	533	}
531	534
532	535	GFileInfo *

731	734	break;
732	735	}
733	736	default:
734		break;
	737	g_warn_if_reached ();
	738	g_strfreev (old_metadata);
	739	return;
735	740	}
736	741
737	742	exists = FALSE;

-4

libxapp/xapp-icon-chooser-dialog.c less more

177	177	static void on_cancel_button_clicked (GtkButton *button,
178	178	gpointer user_data);
179	179
180		static gboolean on_default_button_clicked (GtkButton *button,
	180	static void on_default_button_clicked (GtkButton *button,
181	181	gpointer user_data);
182	182
183	183	static gboolean on_search_bar_key_pressed (GtkWidget *widget,

2025	2025	return FALSE;
2026	2026	}
2027	2027
2028		static gboolean
	2028	static void
2029	2029	on_default_button_clicked (GtkButton *button,
2030	2030	gpointer user_data)
2031	2031	{

2034	2034	priv = xapp_icon_chooser_dialog_get_instance_private (user_data);
2035	2035
2036	2036	gtk_entry_set_text (GTK_ENTRY (priv->search_bar), priv->default_icon);
2037
2038		}
	2037	}

-6

libxapp/xapp-status-icon.c less more

220	220	fy = y - self->priv->icon_size;
221	221	*rect_anchor = GDK_GRAVITY_SOUTH_WEST;
222	222	*menu_anchor = GDK_GRAVITY_NORTH_WEST;
223		break;
224		case GTK_POS_BOTTOM:
225		fx = x;
226		fy = y;
227		*rect_anchor = GDK_GRAVITY_NORTH_WEST;
228		*menu_anchor = GDK_GRAVITY_SOUTH_WEST;
229	223	break;
230	224	case GTK_POS_LEFT:
231	225	fx = x - self->priv->icon_size;

238	232	fy = y;
239	233	*rect_anchor = GDK_GRAVITY_NORTH_WEST;
240	234	*menu_anchor = GDK_GRAVITY_NORTH_EAST;
	235	break;
	236	case GTK_POS_BOTTOM:
	237	default:
	238	fx = x;
	239	fy = y;
	240	*rect_anchor = GDK_GRAVITY_NORTH_WEST;
	241	*menu_anchor = GDK_GRAVITY_SOUTH_WEST;
241	242	break;
242	243	}
243	244

630	631	button,
631	632	_time,
632	633	orientation);
	634
	635	return GDK_EVENT_PROPAGATE;
633	636	}
634	637
635	638	static void

-0

xapp-sn-watcher/sn-item.c less more