Skip to content

Commit

Permalink
More cleanups
Browse files Browse the repository at this point in the history
  • Loading branch information
@p12tic
p12tic committed Nov 27, 2013
1 parent 0cedf9f commit fa2d36e
Show file tree
Hide file tree
Showing 14 changed files with 49 additions and 211 deletions.
60 changes: 13 additions & 47 deletions applets/taskmanager/dock-manager-api.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1120,7 +1120,6 @@ static char** dock_manager_dbus_interface_dbus_proxy_get_items_by_pid(DockManage
DBusError _dbus_error;
DBusGConnection* _connection;
DBusMessageIter _iter;
dbus_int32_t _tmp20_;
char** _result;
int _result_length1;
char** _tmp21_;
Expand Down Expand Up @@ -1252,23 +1251,20 @@ static char* dock_manager_dbus_interface_dbus_proxy_awn_register_proxy_item(Dock
{
DBusError _dbus_error;
DBusGConnection* _connection;
DBusMessage* message, *reply;
DBusMessageIter _iter;
const char* _tmp31_;
const char* _tmp32_;
char* _result;
const char* _tmp33_;
if (((DockManagerDBusInterfaceDBusProxy*) self)->disposed) {
g_set_error(error, DBUS_GERROR, DBUS_GERROR_DISCONNECTED, "%s", "Connection is closed");
return NULL;
}
message = dbus_message_new_method_call(dbus_g_proxy_get_bus_name((DBusGProxy*) self), dbus_g_proxy_get_path((DBusGProxy*) self), "net.launchpad.DockManager", "AwnRegisterProxyItem");
DBusMessage* message = dbus_message_new_method_call(dbus_g_proxy_get_bus_name((DBusGProxy*) self), dbus_g_proxy_get_path((DBusGProxy*) self), "net.launchpad.DockManager", "AwnRegisterProxyItem");
dbus_message_iter_init_append(message, &_iter);
awn::vala_dbus_iter_append_string(&_iter, desktop_file);
awn::vala_dbus_iter_append_string(&_iter, uri);
g_object_get(self, "connection", &_connection, NULL);
dbus_error_init(&_dbus_error);
reply = dbus_connection_send_with_reply_and_block(dbus_g_connection_get_connection(_connection), message, -1, &_dbus_error);
DBusMessage* reply = dbus_connection_send_with_reply_and_block(dbus_g_connection_get_connection(_connection), message, -1, &_dbus_error);
dbus_g_connection_unref(_connection);
dbus_message_unref(message);
if (dbus_error_is_set(&_dbus_error)) {
Expand Down Expand Up @@ -1435,7 +1431,6 @@ static DBusHandlerResult _dbus_dock_item_dbus_interface_property_get_all(DockIte
DBusMessageIter iter, reply_iter, subiter, entry_iter, value_iter;
char* interface_name;
const char* _tmp4_;
const char* property_name;
if (strcmp(dbus_message_get_signature(message), "s")) {
return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
}
Expand Down Expand Up @@ -1496,7 +1491,6 @@ static DBusHandlerResult _dbus_dock_item_dbus_interface_add_menu_item(DockItemDB
DBusMessageIter _tmp8_;
DBusMessageIter _tmp9_;
gint result;
dbus_int32_t _tmp28_;
error = NULL;
if (strcmp(dbus_message_get_signature(message), "a{sv}")) {
return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
Expand Down Expand Up @@ -1946,8 +1940,6 @@ static gchar* dock_item_dbus_interface_dbus_proxy_get_uri(DockItemDBusInterface*
DBusError _dbus_error;
DBusGConnection* _connection;
DBusMessageIter _iter, _subiter;
const char* _tmp82_;
const char* _tmp83_;
gchar* _result;
const char* _tmp84_;
if (((DockItemDBusInterfaceDBusProxy*) self)->disposed) {
Expand Down Expand Up @@ -2041,52 +2033,26 @@ TaskManagerDispatcher* task_manager_dispatcher_new(TaskManager* manager)

static char** task_manager_dispatcher_list_to_object_path_array(GSList* list, int* result_length1)
{
char** result = NULL;
guint _tmp0_;
char** _tmp1_ = NULL;
char** _result_;
gint _result__length1;
gint __result__size_;
char** _tmp8_;
_tmp0_ = g_slist_length(list);
_tmp1_ = g_new0(char*, _tmp0_ + 1);
_result_ = _tmp1_;
_result__length1 = _tmp0_;
__result__size_ = _tmp0_;
char** result = g_new0(char*, _tmp0_ + 1);
int _result__length1 = _tmp0_;
int i = 0;
{
GSList* icon_collection;
GSList* icon_it;
icon_collection = list;
for (icon_it = icon_collection; icon_it != NULL; icon_it = icon_it->next) {
TaskIcon* icon;
icon = (TaskIcon*) icon_it->data;
{
TaskIconDispatcher* dispatcher = NULL;
GObject* _tmp2_ = NULL;
GObject* _tmp3_;
gint _tmp4_;
const gchar* _tmp5_ = NULL;
char* _tmp6_ = NULL;
char* _tmp7_;
_tmp2_ = task_icon_get_dbus_dispatcher(icon);
_tmp3_ = _tmp2_;
dispatcher = IS_TASK_ICON_DISPATCHER(_tmp3_) ? ((TaskIconDispatcher*) _tmp3_) : NULL;
_tmp4_ = i;
i = _tmp4_ + 1;
_tmp5_ = task_icon_dispatcher_get_object_path(dispatcher);
_tmp6_ = g_strdup(_tmp5_);
_tmp7_ = _tmp6_;
_g_free0(_result_[_tmp4_]);
_result_[_tmp4_] = _tmp7_;
}
GSList* icon_collection = list;
for (GSList* icon_it = icon_collection; icon_it != NULL; icon_it = icon_it->next) {
TaskIcon* icon = (TaskIcon*) icon_it->data;
GObject* tmp = task_icon_get_dbus_dispatcher(icon);
TaskIconDispatcher* dispatcher = IS_TASK_ICON_DISPATCHER(tmp) ? ((TaskIconDispatcher*) tmp) : NULL;
const char* _tmp5_ = task_icon_dispatcher_get_object_path(dispatcher);
_g_free0(result[i]);
result[i] = g_strdup(_tmp5_);
i++;
}
}
_tmp8_ = _result_;
if (result_length1) {
*result_length1 = _result__length1;
}
result = _tmp8_;
return result;
}

Expand Down
26 changes: 0 additions & 26 deletions applets/taskmanager/task-icon-build-context-menus.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -499,15 +499,11 @@ _pin_window_cb(GtkMenuItem* menuitem, WnckWindow* win)
static void
_minimize_all_cb(GtkMenuItem* menuitem, TaskIcon* icon)
{
TaskIconPrivate* priv = NULL;

g_return_if_fail(TASK_IS_ICON(icon));

GSList* items = task_icon_get_items(icon);
GSList* iter;

priv = icon->priv;

for (iter = items; iter; iter = iter->next) {
if (TASK_IS_LAUNCHER(iter->data)) {
continue;
Expand All @@ -525,17 +521,13 @@ _minimize_all_cb(GtkMenuItem* menuitem, TaskIcon* icon)
static void
_unminimize_all_cb(GtkMenuItem* menuitem, TaskIcon* icon)
{
TaskIconPrivate* priv = NULL;

g_return_if_fail(TASK_IS_ICON(icon));

GSList* items = task_icon_get_items(icon);
GSList* iter;
GdkEventButton* event = (GdkEventButton*)gtk_get_current_event();
g_return_if_fail(event);

priv = icon->priv;

for (iter = items; iter; iter = iter->next) {
if (TASK_IS_LAUNCHER(iter->data)) {
continue;
Expand All @@ -553,16 +545,13 @@ _unminimize_all_cb(GtkMenuItem* menuitem, TaskIcon* icon)
static void
_maximize_all_cb(GtkMenuItem* menuitem, TaskIcon* icon)
{
TaskIconPrivate* priv = NULL;
GdkEventButton* event = (GdkEventButton*)gtk_get_current_event();

g_return_if_fail(TASK_IS_ICON(icon));

GSList* items = task_icon_get_items(icon);
GSList* iter;

priv = icon->priv;

for (iter = items; iter; iter = iter->next) {
if (TASK_IS_LAUNCHER(iter->data)) {
continue;
Expand All @@ -581,16 +570,13 @@ _maximize_all_cb(GtkMenuItem* menuitem, TaskIcon* icon)
static void
_unmaximize_all_cb(GtkMenuItem* menuitem, TaskIcon* icon)
{
TaskIconPrivate* priv = NULL;
GdkEventButton* event = (GdkEventButton*)gtk_get_current_event();

g_return_if_fail(TASK_IS_ICON(icon));

GSList* items = task_icon_get_items(icon);
GSList* iter;

priv = icon->priv;

for (iter = items; iter; iter = iter->next) {
if (TASK_IS_LAUNCHER(iter->data)) {
continue;
Expand Down Expand Up @@ -757,13 +743,10 @@ task_icon_get_menu_item_close_all(TaskIcon* icon)
static GtkWidget*
task_icon_get_minimize_all(TaskIcon* icon)
{
TaskIconPrivate* priv = NULL;
GSList* items = task_icon_get_items(icon);
GSList* iter;
GtkWidget* menuitem = NULL;

priv = icon->priv;

if (task_icon_count_tasklist_windows(icon) <= 1) {
return NULL;
}
Expand All @@ -788,13 +771,10 @@ task_icon_get_minimize_all(TaskIcon* icon)
static GtkWidget*
task_icon_get_unminimize_all(TaskIcon* icon)
{
TaskIconPrivate* priv = NULL;
GSList* items = task_icon_get_items(icon);
GSList* iter;
GtkWidget* menuitem = NULL;

priv = icon->priv;

if (task_icon_count_tasklist_windows(icon) <= 1) {
return NULL;
}
Expand All @@ -819,13 +799,10 @@ task_icon_get_unminimize_all(TaskIcon* icon)
static GtkWidget*
task_icon_get_maximize_all(TaskIcon* icon)
{
TaskIconPrivate* priv = NULL;
GSList* items = task_icon_get_items(icon);
GSList* iter;
GtkWidget* menuitem = NULL;

priv = icon->priv;

if (task_icon_count_tasklist_windows(icon) <= 1) {
return NULL;
}
Expand All @@ -850,13 +827,10 @@ task_icon_get_maximize_all(TaskIcon* icon)
static GtkWidget*
task_icon_get_unmaximize_all(TaskIcon* icon)
{
TaskIconPrivate* priv = NULL;
GSList* items = task_icon_get_items(icon);
GSList* iter;
GtkWidget* menuitem = NULL;

priv = icon->priv;

if (task_icon_count_tasklist_windows(icon) <= 1) {
return NULL;
}
Expand Down
16 changes: 2 additions & 14 deletions applets/taskmanager/task-icon.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2842,36 +2842,24 @@ task_icon_dialog_unfocus(GtkWidget* widget,
const gchar*
task_icon_get_custom_name(TaskIcon* icon)
{
TaskIconPrivate* priv;

g_return_val_if_fail(TASK_IS_ICON(icon), FALSE);

priv = icon->priv;

return priv->custom_name;
return icon->priv->custom_name;
}

GtkWidget*
task_icon_get_dialog(TaskIcon* icon)
{
TaskIconPrivate* priv;

g_return_val_if_fail(TASK_IS_ICON(icon), FALSE);

priv = icon->priv;

return priv->dialog;
return icon->priv->dialog;
}

static void
task_icon_set_draggable_state(TaskIcon* icon, gboolean draggable)
{
TaskIconPrivate* priv;
#ifdef DEBUG
g_debug("%s", __func__);
#endif
g_return_if_fail(TASK_IS_ICON(icon));
priv = icon->priv;

if (draggable) {
gtk_drag_source_set(GTK_WIDGET(icon),
Expand Down
10 changes: 2 additions & 8 deletions applets/taskmanager/task-item.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -295,16 +295,10 @@ task_item_class_init(TaskItemClass* klass)
g_type_class_add_private(obj_class, sizeof(TaskItemPrivate));
}

static void
task_item_init(TaskItem* item)
static void task_item_init(TaskItem* item)
{
TaskItemPrivate* priv;
TaskItemClass* klass;

klass = TASK_ITEM_GET_CLASS(item);

/* get and save private struct */
priv = item->priv = TASK_ITEM_GET_PRIVATE(item);
item->priv = TASK_ITEM_GET_PRIVATE(item);
}


Expand Down
Loading

0 comments on commit fa2d36e

Please sign in to comment.