kopia lustrzana https://gitlab.com/sane-project/frontends
Merge branch 'delete-warning' into 'gtk3'
Fix all warnings See merge request Ordissimo/frontends!10merge-requests/6/head
commit
ed2a17b980
|
@ -237,6 +237,8 @@ gtk3_curve_class_init (Gtk3CurveClass* klass)
|
|||
|
||||
DEBUG_INFO("class_init [S]\n");
|
||||
|
||||
gtk_gadget_class_intern_init (klass);
|
||||
|
||||
widget_class = GTK_WIDGET_CLASS (klass);
|
||||
|
||||
widget_class->realize = gtk3_curve_realize;
|
||||
|
|
|
@ -574,7 +574,7 @@ static void
|
|||
option_menu_callback (GtkWidget * widget, gpointer data)
|
||||
{
|
||||
GSGDialogElement *elem = data;
|
||||
GSGMenuItem *menu_item;
|
||||
// GSGMenuItem *menu_item;
|
||||
const SANE_Option_Descriptor *opt;
|
||||
GSGDialog *dialog = elem->dialog;
|
||||
int opt_num;
|
||||
|
@ -886,7 +886,7 @@ panel_build (GSGDialog * dialog)
|
|||
const SANE_Option_Descriptor *opt;
|
||||
SANE_Handle dev = dialog->dev;
|
||||
double dval, dmin, dmax, dquant;
|
||||
char *buf, str[16], title[256];
|
||||
char *buf, str[16], title[256] = { 0 };
|
||||
GSGDialogElement *elem;
|
||||
SANE_Word quant, val;
|
||||
SANE_Status status;
|
||||
|
@ -975,7 +975,7 @@ panel_build (GSGDialog * dialog)
|
|||
elem->dialog = dialog;
|
||||
|
||||
if (opt->unit == SANE_UNIT_NONE)
|
||||
strncpy (title, opt->title, sizeof (title));
|
||||
strncpy (title, opt->title, sizeof (opt->title));
|
||||
else
|
||||
snprintf (title, sizeof (title),
|
||||
"%s [%s]", opt->title, unit_string (opt->unit));
|
||||
|
|
|
@ -907,9 +907,6 @@ scan_start (Preview * p)
|
|||
SANE_Status status;
|
||||
char buf[256];
|
||||
int fd;
|
||||
#ifdef HAVE_SYS_TIME_H
|
||||
struct timeval start, current;
|
||||
#endif
|
||||
|
||||
p->scanning = TRUE;
|
||||
gtk_widget_set_sensitive (p->cancel, TRUE);
|
||||
|
@ -1251,7 +1248,6 @@ preview_new (GSGDialog * dialog)
|
|||
{
|
||||
static int first_time = 1;
|
||||
GtkWidget *table, *frame;
|
||||
GCallback signal_func;
|
||||
GtkBox *vbox;
|
||||
Preview *p;
|
||||
|
||||
|
@ -1330,15 +1326,7 @@ preview_new (GSGDialog * dialog)
|
|||
|
||||
gtk3_ruler_add_track_widget (GTK3_RULER (p->hruler), p->window);
|
||||
gtk3_ruler_add_track_widget (GTK3_RULER (p->vruler), p->window);
|
||||
/*
|
||||
signal_func = G_CALLBACK (gimp_gtk3_ruler_motion);
|
||||
g_signal_connect (G_OBJECT (p->window), "motion_notify_event",
|
||||
signal_func, G_OBJECT (p->hruler));
|
||||
|
||||
signal_func = G_CALLBACK (gimp_gtk3_ruler_motion);
|
||||
g_signal_connect (G_OBJECT (p->window), "motion_notify_event",
|
||||
signal_func, G_OBJECT (p->vruler));
|
||||
*/
|
||||
p->viewport = gtk_frame_new ( 0);
|
||||
gtk_frame_set_shadow_type (GTK_FRAME (p->viewport), GTK_SHADOW_IN);
|
||||
gtk_container_add (GTK_CONTAINER (p->viewport), p->window);
|
||||
|
|
|
@ -640,7 +640,7 @@ preview_window_destroyed (GtkWidget * widget, gpointer call_data)
|
|||
static void
|
||||
scan_preview (GtkWidget * widget, gpointer call_data)
|
||||
{
|
||||
GtkWidget *dlg = call_data;
|
||||
// GtkWidget *dlg = call_data;
|
||||
DBG (DBG_debug, "scan_preview\n");
|
||||
if (!scan_win.preview)
|
||||
{
|
||||
|
|
Ładowanie…
Reference in New Issue