Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
sebastiankrzyszkowiak
megapixels
Commits
36193243
Unverified
Commit
36193243
authored
Feb 21, 2021
by
Martijn Braam
Browse files
Fix qr segfault and support gemini urls
parent
a9d01640
Changes
2
Hide whitespace changes
Inline
Side-by-side
main.c
View file @
36193243
...
...
@@ -445,7 +445,10 @@ on_zbar_code_tapped(GtkWidget *widget, const MPZBarCode *code)
GtkWidget
*
dialog
;
GtkDialogFlags
flags
=
GTK_DIALOG_MODAL
|
GTK_DIALOG_DESTROY_WITH_PARENT
;
bool
data_is_url
=
strncmp
(
code
->
data
,
"http://"
,
7
)
==
0
||
strncmp
(
code
->
data
,
"https://"
,
8
)
==
0
;
||
strncmp
(
code
->
data
,
"https://"
,
8
)
==
0
||
strncmp
(
code
->
data
,
"gemini://"
,
9
)
==
0
;
char
*
data
=
strdup
(
code
->
data
);
if
(
data_is_url
)
{
dialog
=
gtk_message_dialog_new
(
...
...
@@ -484,7 +487,7 @@ on_zbar_code_tapped(GtkWidget *widget, const MPZBarCode *code)
GError
*
error
=
NULL
;
switch
(
result
)
{
case
GTK_RESPONSE_YES
:
if
(
!
g_app_info_launch_default_for_uri
(
code
->
data
,
if
(
!
g_app_info_launch_default_for_uri
(
data
,
NULL
,
&
error
))
{
g_printerr
(
"Could not launch browser: %s
\n
"
,
error
->
message
);
...
...
@@ -492,9 +495,11 @@ on_zbar_code_tapped(GtkWidget *widget, const MPZBarCode *code)
case
GTK_RESPONSE_ACCEPT
:
gtk_clipboard_set_text
(
gtk_clipboard_get
(
GDK_SELECTION_PRIMARY
),
code
->
data
,
-
1
);
data
,
-
1
);
case
GTK_RESPONSE_CANCEL
:
break
;
default:
g_printerr
(
"Wrong dialog result: %d
\n
"
,
result
);
}
gtk_widget_destroy
(
dialog
);
}
...
...
zbar_pipeline.c
View file @
36193243
...
...
@@ -102,8 +102,9 @@ process_symbol(const zbar_symbol_t *symbol)
const
char
*
data
=
zbar_symbol_get_data
(
symbol
);
unsigned
int
data_size
=
zbar_symbol_get_data_length
(
symbol
);
code
.
data
=
strndup
(
data
,
data_size
);
code
.
type
=
zbar_get_symbol_name
(
type
);
code
.
data
=
strndup
(
data
,
data_size
+
1
);
code
.
data
[
data_size
]
=
0
;
return
code
;
}
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment