Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Plugins
pidgin-otr
Commits
8caae1fc
Commit
8caae1fc
authored
May 28, 2012
by
Rob Smits
Browse files
gtk-dialog.c:
otr-plugin.c: Some cleanup.
parent
ab3dc375
Changes
2
Hide whitespace changes
Inline
Side-by-side
gtk-dialog.c
View file @
8caae1fc
...
...
@@ -1779,7 +1779,7 @@ static void socialist_millionaires(GtkWidget *widget, gpointer data)
{
ConvOrContext
*
convctx
=
data
;
PurpleConversation
*
conv
;
ConnContext
*
context
;
ConnContext
*
context
=
NULL
;
if
(
convctx
->
convctx_type
==
convctx_conv
)
{
conv
=
convctx
->
conv
;
...
...
@@ -1804,7 +1804,7 @@ static void menu_whatsthis(GtkWidget *widget, gpointer data)
static
void
menu_end_private_conversation
(
GtkWidget
*
widget
,
gpointer
data
)
{
PurpleConversation
*
conv
;
ConnContext
*
context
;
ConnContext
*
context
=
NULL
;
ConvOrContext
*
convctx
=
data
;
if
(
convctx
->
convctx_type
==
convctx_conv
)
{
...
...
@@ -2263,13 +2263,12 @@ static void select_meta_ctx(GtkWidget *widget, gpointer data) {
OTRL_INSTAG_RECENT_RECEIVED
,
0
);
if
(
context
!=
recent_context
)
{
gchar
*
buf
=
g_strdup_printf
(
_
(
"Warning: The selected outgoing "
"OTR session %u
(%x
) is not the most recently active "
"one %u
(%x
). Your buddy may not receive your messages."
"OTR session
(
%u) is not the most recently active "
"one
(
%u). Your buddy may not receive your messages."
" Use the icon menu above to select a different "
"outgoing session."
),
get_context_instance_to_index
(
conv
,
context
),
context
->
their_instance
,
get_context_instance_to_index
(
conv
,
recent_context
),
recent_context
->
their_instance
);
"outgoing session."
),
get_context_instance_to_index
(
conv
,
context
),
get_context_instance_to_index
(
conv
,
recent_context
));
otrg_gtk_dialog_display_otr_message
(
context
->
accountname
,
context
->
protocol
,
context
->
username
,
buf
,
0
);
g_free
(
buf
);
...
...
@@ -2307,13 +2306,11 @@ static void select_menu_ctx(GtkWidget *widget, gpointer data) {
if
(
context
!=
recent_context
)
{
gchar
*
buf
=
g_strdup_printf
(
_
(
"Warning: The selected outgoing OTR "
"session %u
(%x
) is not the most recently active one %u
(%x
). "
"session
(
%u) is not the most recently active one
(
%u). "
"Your buddy may not receive your messages. Use the icon menu "
"above to select a different outgoing session."
),
get_context_instance_to_index
(
conv
,
context
),
context
->
their_instance
,
get_context_instance_to_index
(
conv
,
recent_context
),
recent_context
->
their_instance
);
get_context_instance_to_index
(
conv
,
recent_context
));
otrg_gtk_dialog_display_otr_message
(
context
->
accountname
,
context
->
protocol
,
context
->
username
,
buf
,
0
);
g_free
(
buf
);
...
...
@@ -2373,7 +2370,6 @@ static void otr_add_buddy_instances_top_menu(PidginConversation *gtkconv, GList
GtkWidget
*
menu_image
;
GtkWidget
*
tooltip_menu
;
gchar
*
tooltip_text
;
PurpleAccount
*
account
;
otrl_instag_t
*
instance
;
gboolean
selection_exists
=
0
;
ConnContext
*
context
=
instances
->
data
;
...
...
@@ -2382,7 +2378,6 @@ static void otr_add_buddy_instances_top_menu(PidginConversation *gtkconv, GList
PurpleConversation
*
conv
=
NULL
;
ConvOrContext
convctx
;
GList
*
menu_list
;
guint
num_active_instances
=
g_list_length
(
instances
);
menu
=
gtk_menu_new
();
...
...
@@ -2432,8 +2427,7 @@ static void otr_add_buddy_instances_top_menu(PidginConversation *gtkconv, GList
instance_i
=
get_context_instance_to_index
(
conv
,
curr_context
);
g_snprintf
(
text
,
35
,
_
(
"Session %u (%x)"
),
instance_i
,
curr_context
->
their_instance
);
g_snprintf
(
text
,
35
,
_
(
"Session %u"
),
instance_i
);
instance_menu_item
=
gtk_image_menu_item_new_with_label
(
text
);
instance_submenu
=
gtk_menu_new
();
...
...
@@ -2527,11 +2521,10 @@ static void otr_add_buddy_top_menu(PidginConversation *gtkconv, ConvOrContext
GtkWidget
*
menu
;
GtkWidget
*
menu_image
;
TrustLevel
level
;
ConnContext
*
context
;
ConnContext
*
context
=
NULL
;
GList
*
menu_list
;
GtkWidget
*
tooltip_menu
;
gchar
*
tooltip_text
;
PurpleAccount
*
account
;
GtkWidget
*
select_ctx
=
NULL
;
if
(
convctx
->
convctx_type
==
convctx_ctx
)
{
...
...
@@ -2609,7 +2602,6 @@ static void otr_add_buddy_top_menus(PurpleConversation *conv) {
/* First determine how many contexts are associated with each conv */
for
(
list_iter
=
g_list_last
(
full_buddy_list
);
list_iter
!=
NULL
;
list_iter
=
list_iter
->
prev
)
{
int
numContexts
=
0
;
PurpleAccount
*
account
;
char
*
username
;
const
char
*
accountname
,
*
proto
;
...
...
@@ -2762,8 +2754,6 @@ static void otr_check_conv_status_change( PurpleConversation *conv) {
TrustLevel
current_level
=
TRUST_NOT_PRIVATE
;
ConnContext
*
context
=
otrg_plugin_conv_to_context
(
conv
,
OTRL_INSTAG_RECENT
,
0
);
otrl_instag_t
last_received_instance
;
gboolean
have_received
=
0
;
int
*
previous_level
;
char
*
buf
;
...
...
@@ -2826,7 +2816,6 @@ static void conversation_destroyed(PurpleConversation *conv, void *data)
"otr-menu"
);
PidginConversation
*
gtkconv
;
PidginWindow
*
win
;
GList
*
iter
;
GHashTable
*
conv_or_ctx_map
;
GHashTable
*
conv_to_idx_map
;
gint
*
max_instance_idx
;
...
...
otr-plugin.c
View file @
8caae1fc
...
...
@@ -238,7 +238,6 @@ static void create_privkey_cb(void *opdata, const char *accountname,
void
otrg_plugin_create_instag
(
const
char
*
accountname
,
const
char
*
protocol
)
{
OtrgDialogWaitHandle
waithandle
;
FILE
*
instagf
;
gchar
*
instagfile
=
g_build_filename
(
purple_user_dir
(),
INSTAGFNAME
,
NULL
);
...
...
@@ -915,7 +914,6 @@ ConnContext* otrg_plugin_conv_to_selected_context(PurpleConversation *conv,
int
force_create
)
{
otrl_instag_t
selected_instance
;
ConnContext
*
result
=
NULL
;
selected_instance
=
otrg_plugin_conv_to_selected_instag
(
conv
,
OTRL_INSTAG_BEST
);
...
...
Write
Preview
Markdown
is supported
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