Skip to content

Commit

Permalink
remmina: code style cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
@awakecoding
awakecoding committed Jan 22, 2012
1 parent 480f6bc commit 15bde38
Show file tree
Hide file tree
Showing 27 changed files with 912 additions and 894 deletions.
6 changes: 3 additions & 3 deletions remmina-plugins/nx/nx_session.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@ static void remmina_nx_session_set_application_error(RemminaNXSession *nx, const
{
va_list args;

if (nx->error) g_free (nx->error);
if (nx->error) g_free(nx->error);
va_start (args, fmt);
nx->error = g_strdup_vprintf (fmt, args);
va_end (args);
Expand Down Expand Up @@ -525,7 +525,7 @@ static void remmina_nx_session_send_command(RemminaNXSession *nx, const gchar *c
va_start (args, cmdfmt);
cmd = g_strdup_vprintf (cmdfmt, args);
channel_write (nx->channel, cmd, strlen (cmd));
g_free (cmd);
g_free(cmd);

ssh_set_fd_towrite (nx->session);
channel_write (nx->channel, "\n", 1);
Expand Down Expand Up @@ -666,7 +666,7 @@ void remmina_nx_session_add_parameter(RemminaNXSession *nx, const gchar *name, c

va_start (args, valuefmt);
value = g_strdup_vprintf (valuefmt, args);
g_hash_table_insert (nx->session_parameters, g_strdup (name), value);
g_hash_table_insert(nx->session_parameters, g_strdup (name), value);
}

static gboolean remmina_nx_session_send_session_command(RemminaNXSession *nx, const gchar *cmd_type, gint response)
Expand Down
2 changes: 1 addition & 1 deletion remmina-plugins/rdp/rdp_plugin.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -675,7 +675,7 @@ static gboolean remmina_rdp_main(RemminaProtocolWidget* gp)
rfi->settings->directory = xstrdup(remmina_plugin_service->file_get_string(remminafile, "execpath"));
}

s = g_strdup_printf ("rdp_quality_%i", remmina_plugin_service->file_get_int(remminafile, "quality", DEFAULT_QUALITY_0));
s = g_strdup_printf("rdp_quality_%i", remmina_plugin_service->file_get_int(remminafile, "quality", DEFAULT_QUALITY_0));
value = remmina_plugin_service->pref_get_value(s);
g_free(s);

Expand Down
5 changes: 2 additions & 3 deletions remmina-plugins/telepathy/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,7 @@ set_target_properties(remmina-plugin-telepathy PROPERTIES PREFIX "")

find_required_package(GTK3)

include_directories(${REMMINA_COMMON_INCLUDE_DIRS})
target_link_libraries(remmina-plugin-telepathy ${REMMINA_COMMON_LIBRARIES})
include_directories(${REMMINA_COMMON_INCLUDE_DIRS} ${TELEPATHY_INCLUDE_DIRS})
target_link_libraries(remmina-plugin-telepathy ${REMMINA_COMMON_LIBRARIES} ${TELEPATHY_LIBRARIES})

install(TARGETS remmina-plugin-telepathy DESTINATION ${REMMINA_PLUGINDIR})

4 changes: 2 additions & 2 deletions remmina-plugins/telepathy/telepathy_handler.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -86,9 +86,9 @@ G_DEFINE_TYPE_WITH_CODE (RemminaTpHandler, remmina_tp_handler, G_TYPE_OBJECT,
g_object_unref(bus);
g_print("tp_dbus_daemon_request_name: %s", error->message);
return FALSE;
} dbus_g_connection_register_g_object (
} dbus_g_connection_register_G_OBJECT(
tp_proxy_get_dbus_connection (TP_PROXY (bus)),
REMMINA_TP_OBJECT_PATH, G_OBJECT (handler));
REMMINA_TP_OBJECT_PATH, G_OBJECT(handler));
g_object_unref(bus);
g_print("remmina_tp_handler_register: bus_name " REMMINA_TP_BUS_NAME
" object_path " REMMINA_TP_OBJECT_PATH "\n");
Expand Down
18 changes: 9 additions & 9 deletions remmina-plugins/vnc/vnc_plugin.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -839,7 +839,7 @@ remmina_plugin_vnc_rfb_credential (rfbClient *cl, int credentialType)
gchar *s1, *s2;

gp = (RemminaProtocolWidget*) (rfbClientGetClientData (cl, NULL));
gpdata = (RemminaPluginVncData*) g_object_get_data (G_OBJECT (gp), "plugin-data");
gpdata = (RemminaPluginVncData*) g_object_get_data (G_OBJECT(gp), "plugin-data");
gpdata->auth_called = TRUE;
remminafile = remmina_plugin_service->protocol_plugin_get_file (gp);

Expand All @@ -861,8 +861,8 @@ remmina_plugin_vnc_rfb_credential (rfbClient *cl, int credentialType)
}
else
{
g_free (s1);
g_free (s2);
g_free(s1);
g_free(s2);

THREADS_ENTER
ret = remmina_plugin_service->protocol_plugin_init_authuserpwd (gp, FALSE);
Expand All @@ -875,7 +875,7 @@ remmina_plugin_vnc_rfb_credential (rfbClient *cl, int credentialType)
}
else
{
g_free (cred);
g_free(cred);
cred = NULL;
gpdata->connected = FALSE;
}
Expand Down Expand Up @@ -906,15 +906,15 @@ remmina_plugin_vnc_rfb_credential (rfbClient *cl, int credentialType)
}
else
{
g_free (cred);
g_free(cred);
cred = NULL;
gpdata->connected = FALSE;
}
}
break;

default:
g_free (cred);
g_free(cred);
cred = NULL;
break;
}
Expand Down Expand Up @@ -990,7 +990,7 @@ static void remmina_plugin_vnc_rfb_output(const char *format, ...)
{
g_vsnprintf (vnc_error, MAX_ERROR_LENGTH, _(f), args);
}
g_free (f);
g_free(f);
va_end(args);

remmina_plugin_service->log_printf ("[VNC]%s\n", vnc_error);
Expand Down Expand Up @@ -1226,7 +1226,7 @@ static gboolean remmina_plugin_vnc_main(RemminaProtocolWidget *gp)
remmina_plugin_service->get_server_port (remmina_plugin_service->file_get_string (remminafile, "proxy"), 5900,
&s, &cl->serverPort);
cl->serverHost = strdup (s);
g_free (s);
g_free(s);
#endif
}

Expand Down Expand Up @@ -1605,7 +1605,7 @@ static gboolean remmina_plugin_vnc_open_connection(RemminaProtocolWidget *gp)
if (pthread_create (&gpdata->thread, NULL, remmina_plugin_vnc_main_thread, gp))
{
/* I don't think this will ever happen... */
g_print ("Failed to initialize pthread. Falling back to non-thread mode...\n");
g_print("Failed to initialize pthread. Falling back to non-thread mode...\n");
g_timeout_add (0, (GSourceFunc) remmina_plugin_vnc_main, gp);
gpdata->thread = 0;
}
Expand Down
14 changes: 7 additions & 7 deletions remmina/src/remmina_applet_menu.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,25 +43,25 @@ typedef struct _RemminaAppletMenu
{
GtkMenu menu;

RemminaAppletMenuPriv *priv;
RemminaAppletMenuPriv* priv;
} RemminaAppletMenu;

typedef struct _RemminaAppletMenuClass
{
GtkMenuClass parent_class;

void (*launch_item)(RemminaAppletMenu *menu);
void (*edit_item)(RemminaAppletMenu *menu);
void (*launch_item)(RemminaAppletMenu* menu);
void (*edit_item)(RemminaAppletMenu* menu);
} RemminaAppletMenuClass;

GType remmina_applet_menu_get_type(void)
G_GNUC_CONST;

void remmina_applet_menu_register_item(RemminaAppletMenu *menu, RemminaAppletMenuItem *menuitem);
void remmina_applet_menu_add_item(RemminaAppletMenu *menu, RemminaAppletMenuItem *menuitem);
void remmina_applet_menu_register_item(RemminaAppletMenu* menu, RemminaAppletMenuItem* menuitem);
void remmina_applet_menu_add_item(RemminaAppletMenu* menu, RemminaAppletMenuItem* menuitem);
GtkWidget* remmina_applet_menu_new(void);
void remmina_applet_menu_set_hide_count(RemminaAppletMenu *menu, gboolean hide_count);
void remmina_applet_menu_populate(RemminaAppletMenu *menu);
void remmina_applet_menu_set_hide_count(RemminaAppletMenu* menu, gboolean hide_count);
void remmina_applet_menu_populate(RemminaAppletMenu* menu);

G_END_DECLS

Expand Down
6 changes: 3 additions & 3 deletions remmina/src/remmina_applet_menu_item.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -100,10 +100,10 @@ GtkWidget* remmina_applet_menu_item_new(RemminaAppletMenuItemType item_type, ...
va_end(ap);

/* Create the label */
widget = gtk_label_new (item->name);
widget = gtk_label_new(item->name);
gtk_widget_show(widget);
gtk_misc_set_alignment(GTK_MISC (widget), 0.0, 0.5);
gtk_container_add (GTK_CONTAINER (item), widget);
gtk_misc_set_alignment(GTK_MISC(widget), 0.0, 0.5);
gtk_container_add(GTK_CONTAINER(item), widget);

/* Create the image */
if (item_type == REMMINA_APPLET_MENU_ITEM_FILE || item_type == REMMINA_APPLET_MENU_ITEM_DISCOVERED)
Expand Down
Loading

0 comments on commit 15bde38

Please sign in to comment.