Skip to content

Commit

Permalink
Build fixes (mostly dead code)
Browse files Browse the repository at this point in the history 
Some of the errors were in Vala-generated code, but I didn't see the
original vala files...
  • Loading branch information
@raboof
raboof committed Nov 23, 2013
1 parent ffc912d commit f9c0239
Show file tree
Hide file tree
Showing 10 changed files with 13 additions and 37 deletions.
4 changes: 2 additions & 2 deletions applets/expander/applet.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
#include <libawn/libawn.h>
#include <dbus/dbus-glib.h>

extern "C"
AwnApplet* awn_applet_factory_initp(gchar* name, gchar* uid, gint panel_id)
extern "C" AwnApplet* awn_applet_factory_initp(gchar* name, gchar* uid, gint panel_id);
extern "C" AwnApplet* awn_applet_factory_initp(gchar* name, gchar* uid, gint panel_id)
{
DBusGProxy* proxy;
GError* error = NULL;
Expand Down
4 changes: 2 additions & 2 deletions applets/separator/applet.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
#include <libawn/libawn.h>
#include <dbus/dbus-glib.h>

extern "C"
AwnApplet* awn_applet_factory_initp(gchar* name, gchar* uid, gint panel_id)
extern "C" AwnApplet* awn_applet_factory_initp(gchar* name, gchar* uid, gint panel_id);
extern "C" AwnApplet* awn_applet_factory_initp(gchar* name, gchar* uid, gint panel_id)
{
DBusGProxy* proxy;
GError* error = NULL;
Expand Down
4 changes: 2 additions & 2 deletions applets/taskmanager/applet.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@
#include "task-manager.h"
#include "task-manager-api-wrapper.h"

extern "C" AwnApplet*
awn_applet_factory_initp(gchar* name, gchar* uid, gint panel_id)
extern "C" AwnApplet* awn_applet_factory_initp(gchar* name, gchar* uid, gint panel_id);
extern "C" AwnApplet* awn_applet_factory_initp(gchar* name, gchar* uid, gint panel_id)
{
AwnApplet* applet;
DBusGConnection* connection;
Expand Down
3 changes: 0 additions & 3 deletions libawn/awn-applet.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -137,10 +137,7 @@ static void
on_prop_changed(DBusGProxy* proxy, const gchar* prop_name,
GValue* value, AwnApplet* applet)
{
AwnAppletPrivate* priv;
g_return_if_fail(AWN_IS_APPLET(applet));
priv = applet->priv;

g_object_set_property(G_OBJECT(applet), prop_name, value);
}

Expand Down
6 changes: 0 additions & 6 deletions libawn/awn-overlay-themed-icon.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -132,9 +132,6 @@ awn_overlay_themed_icon_set_property(GObject* object, guint property_id,
static void
awn_overlay_themed_icon_dispose(GObject* object)
{
AwnOverlayThemedIconPrivate* priv;
priv = AWN_OVERLAY_THEMED_ICON_GET_PRIVATE(object);

G_OBJECT_CLASS(awn_overlay_themed_icon_parent_class)->dispose(object);
}

Expand Down Expand Up @@ -175,9 +172,6 @@ _awn_overlay_themed_icon_theme_change(AwnOverlayThemedIcon* overlay)
static void
awn_overlay_themed_icon_constructed(GObject* object)
{
AwnOverlayThemedIconPrivate* priv;
priv = AWN_OVERLAY_THEMED_ICON_GET_PRIVATE(object);

if (G_OBJECT_CLASS(awn_overlay_themed_icon_parent_class)->constructed) {
G_OBJECT_CLASS(awn_overlay_themed_icon_parent_class)->constructed(object);
}
Expand Down
2 changes: 0 additions & 2 deletions src/awn-applet-manager.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -111,12 +111,10 @@ static void free_list(GSList** list);
static void
awn_applet_manager_constructed(GObject* object)
{
AwnAppletManager* manager;
AwnAppletManagerPrivate* priv;
GValueArray* empty_array;

priv = AWN_APPLET_MANAGER_GET_PRIVATE(object);
manager = AWN_APPLET_MANAGER(object);

/* Hook everything up to the config client */

Expand Down
3 changes: 0 additions & 3 deletions src/awn-background-lucido.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -922,7 +922,6 @@ awn_background_lucido_get_shape_mask(AwnBackground* bg,
gint temp;
gint x = area->x, y = area->y;
gint width = area->width, height = area->height;
gint x_start_limit = x;
gboolean expand = FALSE;
g_object_get(bg->panel, "expand", &expand, NULL);

Expand All @@ -940,7 +939,6 @@ awn_background_lucido_get_shape_mask(AwnBackground* bg,
temp = width;
width = height;
height = temp;
x_start_limit = y;
break;
case GTK_POS_LEFT:
height += y;
Expand All @@ -949,7 +947,6 @@ awn_background_lucido_get_shape_mask(AwnBackground* bg,
temp = width;
width = height;
height = temp;
x_start_limit = y;
break;
case GTK_POS_TOP:
width += x;
Expand Down
4 changes: 1 addition & 3 deletions src/awn-monitor.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -372,9 +372,7 @@ awn_monitor_class_init(AwnMonitorClass* klass)
static void
awn_monitor_init(AwnMonitor* monitor)
{
AwnMonitorPrivate* priv;

priv = monitor->priv = AWN_MONITOR_GET_PRIVATE(monitor);
monitor->priv = AWN_MONITOR_GET_PRIVATE(monitor);
}

AwnMonitor*
Expand Down
11 changes: 1 addition & 10 deletions src/awn-panel-dispatcher.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1420,7 +1420,6 @@ static DBusHandlerResult _dbus_awn_panel_dbus_interface_inhibit_autohide(AwnPane
{
DBusMessageIter iter;
GError* error;
char* sender = NULL;
gchar* app_name = NULL;
const char* _tmp43_;
gchar* reason = NULL;
Expand Down Expand Up @@ -1846,7 +1845,6 @@ static DBusHandlerResult _dbus_awn_panel_dbus_interface_set_glow(AwnPanelDBusInt
{
DBusMessageIter iter;
GError* error;
char* sender = NULL;
gboolean activate = FALSE;
dbus_bool_t _tmp49_;
DBusMessage* reply;
Expand Down Expand Up @@ -2110,7 +2108,7 @@ static void _dbus_awn_panel_dbus_interface_property_changed(GObject* _sender, co
} else if (G_VALUE_TYPE(value) == G_TYPE_STRV) {
const gchar** _tmp61_;
DBusMessageIter _tmp62_;
int _tmp63_;
unsigned int _tmp63_;
dbus_message_iter_open_container(&_iter, DBUS_TYPE_VARIANT, "as", &_tmp52_);
_tmp61_ = g_value_get_boxed(value);
dbus_message_iter_open_container(&_tmp52_, DBUS_TYPE_ARRAY, "s", &_tmp62_);
Expand Down Expand Up @@ -2191,7 +2189,6 @@ static void _dbus_handle_awn_panel_dbus_interface_destroy_applet(AwnPanelDBusInt
DBusMessageIter iter;
gchar* uid = NULL;
const char* _tmp0_;
DBusMessage* reply;
if (strcmp(dbus_message_get_signature(message), "s")) {
return;
}
Expand All @@ -2207,7 +2204,6 @@ static void _dbus_handle_awn_panel_dbus_interface_destroy_applet(AwnPanelDBusInt
static void _dbus_handle_awn_panel_dbus_interface_destroy_notify(AwnPanelDBusInterface* self, DBusConnection* connection, DBusMessage* message)
{
DBusMessageIter iter;
DBusMessage* reply;
if (strcmp(dbus_message_get_signature(message), "")) {
return;
}
Expand All @@ -2224,7 +2220,6 @@ static void _dbus_handle_awn_panel_dbus_interface_property_changed(AwnPanelDBusI
GValue value = {0};
GValue _tmp2_ = {0};
DBusMessageIter _tmp3_;
DBusMessage* reply;
if (strcmp(dbus_message_get_signature(message), "sv")) {
return;
}
Expand Down Expand Up @@ -4127,13 +4122,11 @@ static gchar** awn_panel_dispatcher_real_get_inhibitors(AwnPanelDBusInterface* b
gchar** _tmp1_ = NULL;
gchar** reasons;
gint reasons_length1;
gint _reasons_size_;
gchar** _tmp2_;
self = (AwnPanelDispatcher*) base;
_tmp1_ = _tmp0_ = awn_panel_get_inhibitors(self->priv->_panel);
reasons = _tmp1_;
reasons_length1 = _vala_array_length(_tmp0_);
_reasons_size_ = _vala_array_length(_tmp0_);
_tmp2_ = reasons;
if (result_length1) {
*result_length1 = reasons_length1;
Expand Down Expand Up @@ -4406,8 +4399,6 @@ static void awn_panel_dispatcher_instance_init(AwnPanelDispatcher* self)

static void awn_panel_dispatcher_finalize(GObject* obj)
{
AwnPanelDispatcher* self;
self = AWN_PANEL_DISPATCHER(obj);
G_OBJECT_CLASS(awn_panel_dispatcher_parent_class)->finalize(obj);
}

Expand Down
9 changes: 5 additions & 4 deletions src/awn-panel.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -357,10 +357,12 @@ static void awn_panel_set_strut(AwnPanel* panel);

static void awn_panel_remove_strut(AwnPanel* panel);

#if !GTK_CHECK_VERSION(2, 19, 5)
static gboolean awn_panel_dnd_check(gpointer data);

static gboolean awn_panel_set_drag_proxy(AwnPanel* panel,
gboolean check_mouse_pos);
#endif

static void dbus_inhibitor_lost(AwnDBusWatcher* watcher,
gchar* name,
Expand All @@ -370,6 +372,7 @@ static void dbus_inhibitor_lost(AwnDBusWatcher* watcher,
/*
* GOBJECT CODE
*/
#if !GTK_CHECK_VERSION(2, 19, 5)
static gboolean
awn_panel_set_drag_proxy(AwnPanel* panel, gboolean check_mouse_pos)
{
Expand Down Expand Up @@ -488,7 +491,6 @@ awn_panel_set_drag_proxy(AwnPanel* panel, gboolean check_mouse_pos)
return priv->dnd_proxy_win != NULL;
}

#if !GTK_CHECK_VERSION(2, 19, 5)
static gboolean
awn_panel_drag_motion(GtkWidget* widget, GdkDragContext* context,
gint x, gint y, guint time_)
Expand Down Expand Up @@ -1698,6 +1700,7 @@ poll_mouse_position(gpointer data)
return FALSE;
}

#if !GTK_CHECK_VERSION(2, 19, 5)
static gboolean
awn_panel_dnd_check(gpointer data)
{
Expand All @@ -1713,6 +1716,7 @@ awn_panel_dnd_check(gpointer data)
}
return proxy_set;
}
#endif

static void
awn_panel_dispose(GObject* object)
Expand Down Expand Up @@ -3571,10 +3575,7 @@ awn_panel_delete_applet(AwnPanel* panel,
gchar* uid,
GError** error)
{
AwnPanelPrivate* priv;

g_return_val_if_fail(AWN_IS_PANEL(panel), TRUE);
priv = panel->priv;

return TRUE;
}
Expand Down

3 comments on commit f9c0239

@RokeJulianLockhart
Copy link

@RokeJulianLockhart RokeJulianLockhart commented on f9c0239 Jul 4, 2022 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@raboof, have these improvements been upstreamed? I'm having difficulty compiling the upstream repository. (If not, do you mind making a pull-request?)

@raboof
Copy link
Owner Author

@raboof raboof commented on f9c0239 Jul 5, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry, I'm no longer interested in this project and busy with other things - you're welcome to take this commit and propose it upstream yourself, though!

@RokeJulianLockhart
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

...@raboof, do you know how to do that? I'm not much of a wiz-kid at git.

Please sign in to comment.